summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apt-pkg/acquire.cc8
-rw-r--r--apt-pkg/contrib/fileutl.cc4
-rw-r--r--apt-pkg/contrib/fileutl.h2
-rw-r--r--apt-pkg/deb/dpkgpm.cc4
-rw-r--r--apt-pkg/indexcopy.cc2
-rw-r--r--apt-pkg/init.cc6
-rw-r--r--apt-pkg/init.h4
-rwxr-xr-xcmdline/apt-key16
-rw-r--r--configure.in2
-rw-r--r--debian/apt.cron.daily12
-rw-r--r--debian/apt.postinst5
-rw-r--r--debian/changelog1780
-rw-r--r--debian/control6
-rwxr-xr-xdebian/rules2
-rw-r--r--doc/examples/sources.list12
-rw-r--r--doc/po/es.po918
-rw-r--r--doc/po/fr.po66
-rw-r--r--doc/po/ja.po2649
-rw-r--r--ftparchive/apt-ftparchive.cc7
-rw-r--r--ftparchive/writer.cc15
-rw-r--r--methods/bzip2.cc9
-rw-r--r--methods/gzip.cc9
-rw-r--r--po/ca.po310
-rw-r--r--po/da.po1273
-rw-r--r--po/nb.po1008
-rw-r--r--share/apt-auth-failure.note11
-rw-r--r--share/ubuntu-archive.gpgbin0 -> 1724 bytes
-rw-r--r--test/integration/framework1
28 files changed, 4206 insertions, 3935 deletions
diff --git a/apt-pkg/acquire.cc b/apt-pkg/acquire.cc
index 6ec557397..9478cdfb4 100644
--- a/apt-pkg/acquire.cc
+++ b/apt-pkg/acquire.cc
@@ -74,12 +74,12 @@ bool pkgAcquire::Setup(pkgAcquireStatus *Progress, string const &Lock)
string const archivesDir = _config->FindDir("Dir::Cache::Archives");
string const partialArchivesDir = archivesDir + "partial/";
- if (CheckDirectory(_config->FindDir("Dir::State"), partialListDir) == false &&
- CheckDirectory(listDir, partialListDir) == false)
+ if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::State"), partialListDir) == false &&
+ CreateAPTDirectoryIfNeeded(listDir, partialListDir) == false)
return _error->Errno("Acquire", _("List directory %spartial is missing."), listDir.c_str());
- if (CheckDirectory(_config->FindDir("Dir::Cache"), partialArchivesDir) == false &&
- CheckDirectory(archivesDir, partialArchivesDir) == false)
+ if (CreateAPTDirectoryIfNeeded(_config->FindDir("Dir::Cache"), partialArchivesDir) == false &&
+ CreateAPTDirectoryIfNeeded(archivesDir, partialArchivesDir) == false)
return _error->Errno("Acquire", _("Archives directory %spartial is missing."), archivesDir.c_str());
if (Lock.empty() == true || _config->FindB("Debug::NoLocking", false) == true)
diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc
index 94d994e8b..eabaadf90 100644
--- a/apt-pkg/contrib/fileutl.cc
+++ b/apt-pkg/contrib/fileutl.cc
@@ -251,11 +251,11 @@ bool CreateDirectory(string const &Parent, string const &Path)
return true;
}
/*}}}*/
-// CheckDirectory - ensure that the given directory exists /*{{{*/
+// CreateAPTDirectoryIfNeeded - ensure that the given directory exists /*{{{*/
// ---------------------------------------------------------------------
/* a small wrapper around CreateDirectory to check if it exists and to
remove the trailing "/apt/" from the parent directory if needed */
-bool CheckDirectory(string const &Parent, string const &Path)
+bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path)
{
if (DirectoryExists(Path) == true)
return true;
diff --git a/apt-pkg/contrib/fileutl.h b/apt-pkg/contrib/fileutl.h
index f79c9032f..419506273 100644
--- a/apt-pkg/contrib/fileutl.h
+++ b/apt-pkg/contrib/fileutl.h
@@ -101,7 +101,7 @@ bool CreateDirectory(string const &Parent, string const &Path);
* /apt/ will be removed before CreateDirectory call.
* \param Path which should exist after (successful) call
*/
-bool CheckDirectory(string const &Parent, string const &Path);
+bool CreateAPTDirectoryIfNeeded(string const &Parent, string const &Path);
std::vector<string> GetListOfFilesInDir(string const &Dir, string const &Ext,
bool const &SortList, bool const &AllowNoExt=false);
diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc
index d3c432ce1..0d4a52c2f 100644
--- a/apt-pkg/deb/dpkgpm.cc
+++ b/apt-pkg/deb/dpkgpm.cc
@@ -641,7 +641,7 @@ void pkgDPkgPM::WriteHistoryTag(string const &tag, string value)
bool pkgDPkgPM::OpenLog()
{
string const logdir = _config->FindDir("Dir::Log");
- if(CheckDirectory(logdir, logdir) == false)
+ if(CreateAPTDirectoryIfNeeded(logdir, logdir) == false)
// FIXME: use a better string after freeze
return _error->Error(_("Directory '%s' missing"), logdir.c_str());
@@ -1264,7 +1264,7 @@ void pkgDPkgPM::WriteApportReport(const char *pkgpath, const char *errormsg)
string::size_type pos;
FILE *report;
- if (_config->FindB("Dpkg::ApportFailureReport", false) == false)
+ if (_config->FindB("Dpkg::ApportFailureReport", true) == false)
{
std::clog << "configured to not write apport reports" << std::endl;
return;
diff --git a/apt-pkg/indexcopy.cc b/apt-pkg/indexcopy.cc
index 3156778d4..f88d51fc5 100644
--- a/apt-pkg/indexcopy.cc
+++ b/apt-pkg/indexcopy.cc
@@ -666,7 +666,7 @@ bool SigVerify::RunGPGV(std::string const &File, std::string const &FileGPG,
{
string const gpgvpath = _config->Find("Dir::Bin::gpg", "/usr/bin/gpgv");
// FIXME: remove support for deprecated APT::GPGV setting
- string const trustedFile = _config->FindFile("Dir::Etc::Trusted");
+ string const trustedFile = _config->Find("APT::GPGV::TrustedKeyring", _config->FindFile("Dir::Etc::Trusted"));
string const trustedPath = _config->FindDir("Dir::Etc::TrustedParts");
bool const Debug = _config->FindB("Debug::Acquire::gpgv", false);
diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc
index 846b27313..e031cbb94 100644
--- a/apt-pkg/init.cc
+++ b/apt-pkg/init.cc
@@ -70,8 +70,7 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Etc::parts","apt.conf.d");
Cnf.Set("Dir::Etc::preferences","preferences");
Cnf.Set("Dir::Etc::preferencesparts","preferences.d");
- string const deprecated = _config->Find("APT::GPGV::TrustedKeyring");
- Cnf.Set("Dir::Etc::trusted", deprecated.empty() ? "trusted.gpg" : deprecated);
+ Cnf.Set("Dir::Etc::trusted", "trusted.gpg");
Cnf.Set("Dir::Etc::trustedparts","trusted.gpg.d");
Cnf.Set("Dir::Bin::methods","/usr/lib/apt/methods");
Cnf.Set("Dir::Media::MountPath","/media/apt");
@@ -85,6 +84,9 @@ bool pkgInitConfig(Configuration &Cnf)
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.disabled$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.bak$");
Cnf.Set("Dir::Ignore-Files-Silently::", "\\.dpkg-[a-z]+$");
+ // ubuntu specific
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.distUpgrade$");
+ Cnf.Set("Dir::Ignore-Files-Silently::", "\\.save$");
// Translation
Cnf.Set("APT::Acquire::Translation", "environment");
diff --git a/apt-pkg/init.h b/apt-pkg/init.h
index 6e7340dfe..6d3ef953c 100644
--- a/apt-pkg/init.h
+++ b/apt-pkg/init.h
@@ -21,9 +21,9 @@
// reverse-dependencies of libapt-pkg against the new SONAME.
// Non-ABI-Breaks should only increase RELEASE number.
// See also buildlib/libversion.mak
-#define APT_PKG_MAJOR 4
+#define APT_PKG_MAJOR 4
#define APT_PKG_MINOR 10
-#define APT_PKG_RELEASE 0
+#define APT_PKG_RELEASE 1
extern const char *pkgVersion;
extern const char *pkgLibVersion;
diff --git a/cmdline/apt-key b/cmdline/apt-key
index 27731ef7d..3514effad 100755
--- a/cmdline/apt-key
+++ b/cmdline/apt-key
@@ -8,13 +8,13 @@ unset GREP_OPTIONS
GPG_CMD="gpg --ignore-time-conflict --no-options --no-default-keyring --secret-keyring /etc/apt/secring.gpg --trustdb-name /etc/apt/trustdb.gpg"
GPG="$GPG_CMD"
-MASTER_KEYRING=""
-ARCHIVE_KEYRING_URI=""
-#MASTER_KEYRING=/usr/share/keyrings/debian-master-keyring.gpg
-#ARCHIVE_KEYRING_URI=http://ftp.debian.org/debian/debian-archive-keyring.gpg
-ARCHIVE_KEYRING=/usr/share/keyrings/debian-archive-keyring.gpg
-REMOVED_KEYS=/usr/share/keyrings/debian-archive-removed-keys.gpg
+# ubuntu keyrings
+MASTER_KEYRING=/usr/share/keyrings/ubuntu-master-keyring.gpg
+ARCHIVE_KEYRING=/usr/share/keyrings/ubuntu-archive-keyring.gpg
+REMOVED_KEYS=/usr/share/keyrings/ubuntu-archive-removed-keys.gpg
+ARCHIVE_KEYRING_URI=http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg
+
add_keys_with_verify_against_master_keyring() {
ADD_KEYRING=$1
@@ -85,7 +85,7 @@ net_update() {
update() {
if [ ! -f $ARCHIVE_KEYRING ]; then
echo >&2 "ERROR: Can't find the archive-keyring"
- echo >&2 "Is the debian-archive-keyring package installed?"
+ echo >&2 "Is the ubuntu-keyring package installed?"
exit 1
fi
@@ -147,11 +147,13 @@ else
#echo "generate list"
TRUSTEDFILE="/etc/apt/trusted.gpg"
eval $(apt-config shell TRUSTEDFILE Apt::GPGV::TrustedKeyring)
+ eval $(apt-config shell TRUSTEDFILE Dir::Etc::Trusted/f)
if [ -r "$TRUSTEDFILE" ]; then
GPG="$GPG --keyring $TRUSTEDFILE"
fi
GPG="$GPG --primary-keyring $TRUSTEDFILE"
TRUSTEDPARTS="/etc/apt/trusted.gpg.d"
+ eval $(apt-config shell TRUSTEDPARTS Dir::Etc::TrustedParts/d)
if [ -d "$TRUSTEDPARTS" ]; then
#echo "parts active"
for trusted in $(run-parts --list $TRUSTEDPARTS --regex '^.*\.gpg$'); do
diff --git a/configure.in b/configure.in
index 151885d66..b2880c99c 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib)
AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in)
dnl -- SET THIS TO THE RELEASE VERSION --
-AC_DEFINE_UNQUOTED(VERSION,"0.8.1")
+AC_DEFINE_UNQUOTED(VERSION,"0.8.2")
PACKAGE="apt"
AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE")
AC_SUBST(PACKAGE)
diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily
index 8c0e4c416..bee0a8f01 100644
--- a/debian/apt.cron.daily
+++ b/debian/apt.cron.daily
@@ -434,6 +434,13 @@ random_sleep
UPDATED=0
UPDATE_STAMP=/var/lib/apt/periodic/update-stamp
if check_stamp $UPDATE_STAMP $UpdateInterval; then
+ # check for a new archive signing key (against the master keyring)
+ if eval apt-key net-update $XSTDERR; then
+ debug_echo "apt-key net-update (success)"
+ else
+ debug_echo "apt-key net-update (failure)"
+ fi
+ # run apt-get update
if eval apt-get $XAPTOPT -y update $XSTDERR; then
debug_echo "download updated metadata (success)."
if which dbus-send >/dev/null && pidof dbus-daemon >/dev/null; then
@@ -447,6 +454,11 @@ if check_stamp $UPDATE_STAMP $UpdateInterval; then
fi
update_stamp $UPDATE_STAMP
UPDATED=1
+ # now run apt-xapian-index if it is installed to ensure the index
+ # is up-to-date
+ if [ -x /usr/sbin/update-apt-xapian-index ]; then
+ nice ionice -c3 update-apt-xapian-index -q
+ fi
else
debug_echo "download updated metadata (error)"
fi
diff --git a/debian/apt.postinst b/debian/apt.postinst
index cc0d8b1fe..2ebcfb19b 100644
--- a/debian/apt.postinst
+++ b/debian/apt.postinst
@@ -15,7 +15,10 @@ set -e
case "$1" in
configure)
- apt-key update
+ if ! test -f /etc/apt/trusted.gpg; then
+ cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg
+ fi
+ apt-key update || true
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff --git a/debian/changelog b/debian/changelog
index f1976f516..64d37ba96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,18 +1,69 @@
-apt (0.8.2) unstable; urgency=low
+apt (0.8.3ubuntu2) UNRELEASEDmaverick; urgency=low
- * apt-pkg/indexcopy.cc:
- - only use trusted.gpg.d directory if it exists
- - do not replace /dev/null when running in APT::CDROM::NoAct
- mode (LP: #612666), thanks to Colin Watson
+ * ftparchive/writer.cc:
+ - write out {Files,Checksum-Sha1,Checksum-Sha256} only if
+ available LP: #633967. Thanks to Colin Watson
* apt-pkg/contrib/cdromutl.cc:
- if apt-cdrom is used on writable media (like usb-sticks), do
not use the root directory to identify the medium (as all
changes there change the ident id). Use the .disk directory
instead
- -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 20:21:43 +0200
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Sep 2010 15:30:19 +0200
+
+apt (0.8.3ubuntu1) maverick; urgency=low
-apt (0.8.1) UNRELEASED; urgency=low
+ * merged fixes from debian-sid
+ * debian/rules:
+ - put ubuntu-archive.gpg back into the package (LP: #620576)
+ * apt-pkg/init.cc:
+ - ignore ".distUpgrade" and ".save" files in sources.list.d
+ (LP: #631770)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Sep 2010 09:27:24 +0200
+
+apt (0.8.3) unstable; urgency=low
+
+ [ Manpages translations ]
+ * Japanese (KURASAWA Nozomu). Closes: #595862
+
+ [ Michael Vogt ]
+ * apt-pkg/indexcopy.cc:
+ - only use trusted.gpg.d directory if it exists
+ - do not replace /dev/null when running in APT::CDROM::NoAct
+ mode (LP: #612666), thanks to Colin Watson
+
+ [ David Kalnischkies ]
+ * ftparchive/apt-ftparchive.cc:
+ - ensure that BinDirectory as well as Tree settings get
+ the correct default FileMode setting (Closes: #595922)
+
+ -- Michael Vogt <mvo@debian.org> Tue, 07 Sep 2010 15:28:41 +0200
+
+apt (0.8.2) unstable; urgency=low
+
+ [ Manpages translations ]
+ * Spanish (Omar Campagne). Closes: #595557
+
+ [ David Kalnischkies ]
+ * apt-pkg/versionmatch.cc:
+ - do not accept 'Pin: origin "' (missing closing ") as a valid
+ way to pin a local archive: either "" or none…
+ * apt-pkg/deb/dpkgpm.cc:
+ - create Dir::Log if needed to support /var/log as tmpfs or similar,
+ inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
+ * apt-pkg/indexcopy.cc:
+ - support really still the APT::GPGV::TrustedKeyring setting,
+ as it breaks d-i badly otherwise (Closes: #595428)
+ * cmdline/apt-key:
+ - support also Dir::Etc::Trusted so that apt-key works in the same
+ way as the library part which works with the trusted files
+ * methods/{gzip,bzip2}.cc:
+ - empty files can never be valid archives (Closes: #595691)
+
+ -- Michael Vogt <mvo@debian.org> Mon, 06 Sep 2010 18:10:06 +0200
+
+apt (0.8.1) unstable; urgency=low
[ Programs translations ]
* Thai (Theppitak Karoonboonyanan). Closes: #592695
@@ -26,6 +77,9 @@ apt (0.8.1) UNRELEASED; urgency=low
* Bulgarian (Damyan Ivanov). Closes: #594627
* Portuguese (Miguel Figueiredo). Closes: #594668
* Korean (Changwoo Ryu). Closes: #594809
+ * Norwegian Bokmål (Hans Nordhaug). Closes: #595182
+ * Danish (Joe Hansen). Closes: #595176
+ * Catalan (Agustí Grau). Closes: #595234
[ Christian Perrier ]
* Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
@@ -54,11 +108,71 @@ apt (0.8.1) UNRELEASED; urgency=low
- let the pin origin actually work as advertised in the manpage
which means "" are optional and pinning a local archive does
work - even if it is a non-flat archive (Closes: #594435)
- * apt-pkg/deb/dpkgpm.cc:
- - create Dir::Log if needed to support /var/log as tmpfs or similar,
- inspired by Thomas Bechtold, thanks! (Closes: #523919, LP: #220239)
- -- David Kalnischkies <kalnischkies@gmail.com> Thu, 02 Sep 2010 12:41:32 +0200
+ -- Michael Vogt <mvo@debian.org> Fri, 03 Sep 2010 18:36:11 +0200
+
+apt (0.8.0ubuntu3) maverick; urgency=low
+
+ * merged fixes from the debian-sid bzr branch:
+
+ [ Programs translations ]
+ * Simplified Chinese (Aron Xu). Closes: #594458
+ * Bulgarian (Damyan Ivanov). Closes: #594627
+ * Portuguese (Miguel Figueiredo). Closes: #594668
+ * Korean (Changwoo Ryu). Closes: #594809
+
+ [ Manpages translations ]
+ * Portuguese (Américo Monteiro)
+
+ [ David Kalnischkies ]
+ * cmdline/apt-cache.cc:
+ - remove useless GetInitialize method
+ * cmdline/apt-get.cc:
+ - remove direct calls of ReadMainList and use the wrapper instead
+ to protect us from useless re-reads and two-times notice display
+ - remove death code by removing unused GetInitialize
+ * apt-pkg/depcache.cc:
+ - now that apt-get purge works on 'rc' packages let the MarkDelete
+ pass this purge forward to the non-pseudo package for pseudos
+ * apt-pkg/contrib/fileutl.cc:
+ - apply SilentlyIgnore also on files without an extension
+ * apt-pkg/contrib/configuration.cc:
+ - fix autoremove by using correct config-option name and
+ don't make faulty assumptions in error handling (Closes: #594689)
+ * apt-pkg/versionmatch.cc:
+ - let the pin origin actually work as advertised in the manpage
+ which means "" are optional and pinning a local archive does
+ work - even if it is a non-flat archive (Closes: #594435)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 03 Sep 2010 17:05:53 +0200
+
+apt (0.8.0ubuntu2) maverick; urgency=low
+
+ * merged fixes from the debian-sid bzr branch:
+
+ [ Programs translations ]
+ * Thai (Theppitak Karoonboonyanan). Closes: #592695
+ * Russian (Yuri Kozlov). Closes: #594232
+ * Slovak (Ivan Masár). Closes: #594255
+ * Swedish (Daniel Nylander). Closes: #594241
+ * Japanese (Kenshi Muto, Osamu Aoki). Closes: #594265
+ * Italian (Milo Casagrande). Closes: #594238
+ * Asturian (maacub). Closes: #594303
+
+ [ Christian Perrier ]
+ * Fix spelling error in cmdline/apt-get.cc. Thanks to Osamu Aoki
+ Closes: #594211
+
+ [ David Kalnischkies ]
+ * show in madison command again also source packages (LP: #614589)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Aug 2010 18:56:23 +0200
+
+apt (0.8.0ubuntu1) maverick; urgency=low
+
+ * merged from debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 24 Aug 2010 21:39:06 +0200
apt (0.8.0) unstable; urgency=low
@@ -102,6 +216,20 @@ apt (0.8.0~pre2) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 23 Aug 2010 19:09:08 +0200
+apt (0.8.0~pre1ubuntu2) maverick; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - enable apport reports again (got lost in the previous merge),
+ thanks to Matt Zimmerman
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 23 Aug 2010 13:53:09 +0200
+
+apt (0.8.0~pre1ubuntu1) maverick; urgency=low
+
+ * merged fixes from debian/experimental
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 13 Aug 2010 17:49:40 +0200
+
apt (0.8.0~pre1) experimental; urgency=low
[ Programs translations ]
@@ -144,6 +272,56 @@ apt (0.8.0~pre1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 13 Aug 2010 17:00:49 +0200
+apt (0.7.26~exp12ubuntu4) maverick; urgency=low
+
+ [ Julian Andres Klode ]
+ * apt-pkg/contrib/fileutl.cc:
+ - Add WriteAtomic mode.
+ - Revert WriteEmpty to old behavior (LP: #613211)
+ * apt-pkg, methods:
+ - Convert users of WriteEmpty to WriteAtomic.
+ * apt-pkg/depcache.cc:
+ - Only try upgrade for Breaks if there is a newer version, otherwise
+ handle it as Conflicts (by removing it) (helps for #591882).
+
+ [ Michael Vogt ]
+ * debian/control:
+ - Add recommends on gnupg to apt, apt-key uses it.
+ (changed from debian)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 11 Aug 2010 12:01:30 +0200
+
+apt (0.7.26~exp12ubuntu3) maverick; urgency=low
+
+ [ Colin Watson ]
+ * apt-pkg/cdrom.cc:
+ - fix off-by-one error in DropBinaryArch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 21:04:18 +0200
+
+apt (0.7.26~exp12ubuntu2) maverick; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if ubuntu-keyring is not installed
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 02 Aug 2010 11:47:59 +0200
+
+apt (0.7.26~exp12ubuntu1) maverick; urgency=low
+
+ * ABI break upload
+ * merged from debian/experimental, remaining changes:
+ - use ubuntu keyring and ubuntu archive keyring in apt-key
+ - run update-apt-xapian-index in apt.cron
+ - support apt-key net-update and verify keys against master-keyring
+ - run apt-key net-update in cron.daily
+ - different example sources.list
+ * debian/apt.postinst
+ - drop set_apt_proxy_from_gconf(), no longer needed in maverick
+ * apt-pkg/pkgcache.cc:
+ - re-evaluate the architectures cache when the cache is (re)opened
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 30 Jul 2010 19:32:15 +0200
+
apt (0.7.26~exp12) experimental; urgency=low
[ Michael Vogt ]
@@ -758,6 +936,152 @@ apt (0.7.26~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100
+apt (0.7.25.3ubuntu10) maverick; urgency=low
+
+ [ Michael Vogt ]
+ * debian/apt.conf.ubuntu:
+ - no longer install (empty) apt.conf.d/01ubuntu
+ * apt-pkg/deb/dpkgpm.cc:
+ - make the apt/term.log output unbuffered (thanks to Matt Zimmerman)
+ - fix FTBFS (LP: #600155)
+
+ [ Matthias G. ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Fix segmentation fault when /var/log/apt ist missing. LP: #535509
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Jul 2010 09:37:03 +0200
+
+apt (0.7.25.3ubuntu9) lucid-proposed; urgency=low
+
+ * debian/apt.postinst:
+ - do not fail if getent returns nothing useful (LP: #579647)
+ thanks to Jean-Baptiste Lallement
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 14 May 2010 09:40:50 +0200
+
+apt (0.7.25.3ubuntu8) lucid-proposed; urgency=low
+
+ [ Loïc Minier ]
+ * Use https:// in Vcs-Bzr URL.
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/debrecords.cc:
+ - fix max tag buffer size (LP: #545336, closes: #578959)
+ * apt-pkg/indexfile.cc:
+ - If no "_" is found in the language code, try to find a "."
+ This is required for languages like Esperanto that have no
+ county associated with them (LP: #560956)
+ Thanks to "Aisano" for the fix
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 May 2010 10:33:46 +0200
+
+apt (0.7.25.3ubuntu7) lucid; urgency=low
+
+ Cherry pick fixes from the lp:~mvo/apt/mvo branch:
+
+ [ Evan Dandrea ]
+ * Remember hosts with general failures for
+ https://wiki.ubuntu.com/NetworklessInstallationFixes (LP: #556831).
+
+ [ Michael Vogt ]
+ * improve debug output for Debug::pkgPackageManager
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Apr 2010 20:30:03 +0200
+
+apt (0.7.25.3ubuntu6) lucid; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix crash when pkg.VersionList() is empty (LP: #556056)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 08 Apr 2010 21:13:25 +0200
+
+apt (0.7.25.3ubuntu5) lucid; urgency=low
+
+ [ David Kalnischkies ]
+ * cmdline/apt-get.cc:
+ - try version match in FindSrc first exact than fuzzy (LP: #551178)
+
+ [ Jean-Baptiste Lallement ]
+ * apt-pkg/contrib/strutl.cc:
+ - always escape '%' (LP: #130289) (Closes: #500560)
+ - unescape '%' sequence only if followed by 2 hex digit
+ - username/password are urlencoded in proxy string (RFC 3986)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 31 Mar 2010 21:59:42 +0200
+
+apt (0.7.25.3ubuntu4) lucid; urgency=low
+
+ [ David Kalnischkies ]
+ * apt-pkg/deb/debversion.cc:
+ - consider absent of debian revision equivalent to 0 (Closes: #573592)
+ LP: #540228
+ * cmdline/apt-get.cc, apt-pkg/cdrom.cc:
+ - fix memory leaks in error conditions in DoSource()
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix error message construction in OpenLog()
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 Mar 2010 16:57:49 +0100
+
+apt (0.7.25.3ubuntu3) lucid; urgency=low
+
+ * apt-pkg/indexfile.cc:
+ - remove "cs" from languages that need the full langcode when
+ downloading translations (thanks to Steve Langasek)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Mar 2010 09:42:39 +0100
+
+apt (0.7.25.3ubuntu2) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * abicheck/
+ - add new abitest tester using the ABI Compliance Checker from
+ http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker
+ * debian/apt.conf.autoremove:
+ - add "oldlibs" to the APT::Never-MarkAuto-Sections as its used
+ for transitional packages
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix backgrounding when dpkg runs (closes: #486222)
+ * cmdline/apt-mark:
+ - show error on incorrect aguments (LP: #517917), thanks to
+ Torsten Spindler
+ * cmdline/apt-get.cc:
+ - if apt-get source foo=version or foo/distro can not be found,
+ error out (LP: #502641)
+ * apt-pkg/indexfile.cc:
+ - deal correctly with three letter langcodes (LP: #391409)
+ * debian/apt.cron.daily:
+ - do not look into admin users gconf anymore for the http proxy
+ the user now needs to use the "Apply system-wide" UI in the
+ gnome-control-center to set it
+ * debian/apt.postinst:
+ - add set_apt_proxy_from_gconf() and run that once on upgrade if
+ there is no proxy configured already system-wide (LP: #432631)
+ From that point on gnome-control-center will have to warn if
+ the user makes changes to the proxy settings and does not apply
+ them system wide
+
+ [ Robert Collins ]
+ * Change the package index Info methods to allow apt-cache policy to be
+ useful when using several different archives on the same host.
+ (Closes: #329814, LP: #22354)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 12 Mar 2010 23:10:52 +0100
+
+apt (0.7.25.3ubuntu1) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * merged with the debian-sid branch
+ * methods/http.cc:
+ - add Acquire::http::ProxyAutoDetect configuration that
+ can be used to call a external helper to figure out the
+ proxy configuration and return it to apt via stdout
+ (this is a step towards WPAD and zeroconf/avahi support)
+
+ [ Ivan Masár ]
+ * Slovak translation update. Closes: #568294
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 17 Feb 2010 23:33:32 +0100
+
apt (0.7.25.3) unstable; urgency=low
[ Christian Perrier ]
@@ -878,6 +1202,39 @@ apt (0.7.25.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Sat, 09 Jan 2010 21:52:36 +0100
+apt (0.7.25ubuntu4) lucid; urgency=low
+
+ * cmdline/apt-cdrom.cc:
+ - make Acquire::cdrom::AutoDetect default, this can be
+ turned off with "--no-auto-detect"
+ * methods/http.cc:
+ - add cache-control headers even if no cache is given to allow
+ adding options for intercepting proxies
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 02 Feb 2010 16:58:59 -0800
+
+apt (0.7.25ubuntu3) lucid; urgency=low
+
+ * cmdline/apt-get.cc:
+ - don't mark as manually if in download only (Closes: #468180)
+
+ -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100
+
+apt (0.7.25ubuntu2) lucid; urgency=low
+
+ * Change history branch so that it does not break the
+ apt ABI for the pkgPackageManager interface
+ (can be reverted on the next ABI break)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Dec 2009 10:14:16 +0100
+
+apt (0.7.25ubuntu1) lucid; urgency=low
+
+ * Merged from the mvo branch
+ * merged from the lp:~mvo/apt/history branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Dec 2009 09:44:08 +0100
+
apt (0.7.25) unstable; urgency=low
[ Christian Perrier ]
@@ -1021,6 +1378,29 @@ apt (0.7.25) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 15 Dec 2009 09:21:55 +0100
+apt (0.7.24ubuntu1) lucid; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - include df -l output in the apport log as well (thanks to
+ tjaalton)
+ * apt-pkg/packagemanager.cc:
+ - add output about pre-depends configuring when debug::pkgPackageManager
+ is used
+ * methods/https.cc:
+ - fix incorrect use of CURLOPT_TIMEOUT, closes: #497983, LP: #354972
+ thanks to Brian Thomason for the patch
+ * merge lp:~mvo/apt/netrc branch, this adds support for a
+ /etc/apt/auth.conf that can be used to store username/passwords
+ in a "netrc" style file (with the extension that it supports "/"
+ in a machine definition). Based on the maemo git branch.
+
+ [ Brian Murray ]
+ * apt-pkg/depcache.cc, apt-pkg/indexcopy.cc:
+ - typo fix (LP: #462328)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Dec 2009 09:27:26 +0100
+
apt (0.7.24) unstable; urgency=low
[ Nicolas François ]
@@ -1090,6 +1470,59 @@ apt (0.7.24) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 25 Sep 2009 19:57:25 +0200
+apt (0.7.23.1ubuntu2) karmic; urgency=low
+
+ [ Michael Vogt ]
+ * debian/control:
+ - fix Vcr-Bzr header
+
+ [ Kees Cook ]
+ * debian/apt.cron.daily:
+ - fix quotes for use with "eval", thanks to Lars Ljung (LP: #449535).
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Oct 2009 19:05:19 +0200
+
+apt (0.7.23.1ubuntu1) karmic; urgency=low
+
+ [ Matt Zimmerman ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - Suppress apport reports on dpkg short reads (these I/O errors are not
+ generally indicative of a bug in the packaging)
+
+ [ Loïc Minier ]
+ * cmdline/apt-key:
+ - Emit a warning if removed keys keyring is missing and skip associated
+ checks (LP: #218971)
+
+ [ Brian Murray ]
+ * cmdline/apt-get.cc:
+ - typo fix (LP: #370094)
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - when tcgetattr() returns non-zero skip all pty magic
+ (thanks to Simon Richter, closes: #509866)
+ * apt-inst/contrib/arfile.cc:
+ - show propper error message for Invalid archive members
+ * apt-pkg/acquire-worker.cc:
+ - show error details of failed methods
+ * apt-pkg/contrib/fileutl.cc:
+ - if a process aborts with signal, show signal number
+ * methods/http.cc:
+ - ignore SIGPIPE, we deal with EPIPE from write in
+ HttpMethod::ServerDie() (LP: #385144)
+ * debian/apt.cron.daily:
+ - if the timestamp is too far in the future, delete it
+ (LP: #135262)
+
+ [ Merge ]
+ * merged from debian, reverted the libdlopen-udev branch
+ because its too late in the release process for this now
+ * not merged the proxy behaviour change from 0.7.23 (that will
+ be part of lucid)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 23 Sep 2009 18:15:10 +0200
+
apt (0.7.23.1) unstable; urgency=low
[ Michael Vogt ]
@@ -1319,6 +1752,34 @@ apt (0.7.22) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 29 Jul 2009 19:16:22 +0200
+apt (0.7.21ubuntu1) karmic; urgency=low
+
+ * merged from the debian-sid bzr branch
+
+ [ Christian Perrier ]
+ * Documentation translations:
+ - Fix a typo in apt-get(8) French translation. Closes: #525043
+ Thanks to Guillaume Delacour for spotting it.
+ * Translations:
+ - fr.po
+ - sk.po. Closes: #525857
+ - ru.po. Closes: #526816
+ - eu.po. Closes: #528985
+ - zh_CN.po. Closes: #531390
+ - fr.po
+ - it.po. Closes: #531758
+ - ca.po. Closes: #531921
+ * Added translations
+ - ast.po (Asturian by Marcos Alvareez Costales).
+ Closes: #529007, #529730
+
+ [ Michael Vogt ]
+ * apt-pkg/acquire.cc:
+ - make the (internal) max pipeline depth of the acquire queue
+ configurable via Acquire::Max-Pipeline-Depth
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Jun 2009 15:49:07 +0200
+
apt (0.7.21) unstable; urgency=low
[ Christian Perrier ]
@@ -1362,6 +1823,125 @@ apt (0.7.21) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 14 Apr 2009 14:12:51 +0200
+apt (0.7.20.2ubuntu7) karmic; urgency=low
+
+ * fix problematic use of tolower() when calculating the version
+ hash by using locale independant tolower_ascii() function.
+ Thanks to M. Vefa Bicakci (LP: #80248)
+ * build fixes for g++-4.4
+ * include dmesg output in apport package failures
+ * include apt ordering into apport package failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 24 Apr 2009 10:14:01 +0200
+
+apt (0.7.20.2ubuntu6) jaunty; urgency=low
+
+ [ Jamie Strandboge ]
+ * apt.cron.daily: catch invalid dates due to DST time changes
+ in the stamp files (LP: #354793)
+
+ [ Michael Vogt ]
+ * methods/gpgv.cc:
+ - properly check for expired and revoked keys (closes: #433091)
+ LP: #356012
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Apr 2009 22:39:50 +0200
+
+apt (0.7.20.2ubuntu5) jaunty; urgency=low
+
+ [ Colin Watson ]
+ * cmdline/acqprogress.cc:
+ - Call pkgAcquireStatus::Pulse even if quiet, so that we still get
+ dlstatus messages on the status-fd (LP: #290234).
+
+ [ Michael Vogt ]
+ * debian/apt.cron.daily:
+ - do not clutter cron mail with bogus gconftool messages
+ (LP: #223502)
+ - merge fix for cache locking from debian (closes: #459344)
+ - run update-apt-xapian-index (with ionice) to ensure that
+ the index is up-to-date when synaptic is run (LP: #288797)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 30 Mar 2009 13:22:28 +0200
+
+apt (0.7.20.2ubuntu4) jaunty; urgency=low
+
+ * ftparchive/cachedb.cc:
+ - when apt-ftparchive clean is used, compact the database
+ at the end (thanks to cprov)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Mar 2009 13:43:59 +0100
+
+apt (0.7.20.2ubuntu3) jaunty; urgency=low
+
+ * methods/mirror.cc:
+ - when download the mirror file and the server is down,
+ return a propper error message (LP: #278635)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 19 Mar 2009 15:42:15 +0100
+
+apt (0.7.20.2ubuntu2) jaunty; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - revert termios patch (LP: #338514)
+ * cmdline/apt-get.cc
+ - fix "apt-get source pkg" if there is a binary package and
+ a source package of the same name but from different
+ packages (LP: #330103)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Mar 2009 16:33:28 +0100
+
+apt (0.7.20.2ubuntu1) jaunty; urgency=low
+
+ [ Christian Perrier ]
+ * Translations:
+ - bg.po. Closes: #513211
+ - zh_TW.po. Closes: #513311
+ - nb.po. Closes: #513843
+
+ [ Michael Vogt ]
+ * merged from the debian-sid branch
+ * [ABI break] merge support for http redirects, thanks to
+ Jeff Licquia and Anthony Towns
+ * [ABI break] use int for the package IDs (thanks to Steve Cotton)
+ * apt-pkg/contrib/strutl.cc:
+ - fix TimeToStr i18n (LP: #289807)
+ * debian/apt.conf.autoremove:
+ - readd "linux-image" (and friends) to the auto-remove
+ blacklist
+ * fix some i18n issues (thanks to Gabor Kelemen)
+ LP: #263089
+ * apt-pkg/deb/dpkgpm.cc:
+ - filter "ENOMEM" errors when creating apport reports
+ * cmdline/apt-get.cc:
+ - fix "apt-get source pkg=ver" if binary name != source name
+ (LP: #202219)
+ * apt-pkg/indexrecords.cc:
+ - fix some i18n issues
+ * apt-pkg/contrib/strutl.h:
+ - add new strprintf() function to make i18n strings easier
+ * apt-pkg/dev/debsystem.cc:
+ - add missing apti18n.h header
+ * cmdline/apt-get.cc:
+ - default to "false" for the "APT::Get::Build-Dep-Automatic"
+ option (follow debian here)
+ * apt-pkg/pkgcache.cc:
+ - do not run "dpkg --configure pkg" if pkg is in trigger-awaited
+ state (LP: #322955)
+ * methods/https.cc:
+ - add Acquire::https::AllowRedirect support
+ - do not unlink files in partial/ (thanks to robbiew)
+
+ [ Dereck Wonnacott ]
+ * Clarify the --help for 'purge' (LP: #243948)
+
+ [ Ian Weisser ]
+ * /apt-pkg/deb/debsystem.cc:
+ - add 'sudo' to the error message to "run 'dpkg --configure -a'"
+ (LP: #52697)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 09 Feb 2009 14:21:05 +0100
+
apt (0.7.20.2) unstable; urgency=medium
[ Eugene V. Lyubimkin ]
@@ -1430,6 +2010,12 @@ apt (0.7.20) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 05 Jan 2009 08:59:20 +0100
+apt (0.7.19ubuntu1) jaunty; urgency=low
+
+ * merge from debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 24 Nov 2008 10:52:20 +0100
+
apt (0.7.19) unstable; urgency=low
[ Eugene V. Lyubimkin ]
@@ -1728,6 +2314,90 @@ apt (0.7.15~exp1) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 16 Sep 2008 21:27:03 +0200
+apt (0.7.14ubuntu7) jaunty; urgency=low
+
+ * cmdline/apt-cache.cc:
+ - remove the gettext from a string that consists entirely
+ of variables (LP: #56792)
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix potential hang when in a backgroud process group
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Oct 2008 21:09:12 +0100
+
+apt (0.7.14ubuntu6) intrepid; urgency=low
+
+ * debian/apt.conf.autoremove:
+ - remove "linux-image" (and friends) from the auto-remove
+ blacklist. we have the kernel fallback infrastructure now
+ in intrepid (thanks to BenC)
+ * apt-pkg/indexcopy.cc:
+ - support having CDs with no Packages file (just a Packages.gz)
+ by not forcing a verification on non-existing files
+ (LP: #255545)
+ * apt-pkg/deb/dpkgpm.cc:
+ - improve the filtering for duplicated apport reports (thanks
+ to seb128 for pointing that problem out)
+ - do not report disk full errors from dpkg via apport
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 07 Aug 2008 16:28:05 +0200
+
+apt (0.7.14ubuntu5) intrepid; urgency=low
+
+ * fix various -Wall warnings
+ * make "apt-get build-dep" installed packages marked automatic
+ by default. This can be changed by setting the value of
+ APT::Get::Build-Dep-Automatic to false (thanks to Aaron
+ Haviland, closes: #44874, LP: #248268)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 06 Aug 2008 14:00:51 +0200
+
+apt (0.7.14ubuntu4) intrepid; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix uninitialized variable that caused no apport reports
+ to be written sometimes (thanks to Matt Zimmerman)
+ * merge patch that enforces stricter https server certificate
+ checking (thanks to Arnaud Ebalard, closes: #485960)
+ * allow per-mirror specific https settings
+ (thanks to Arnaud Ebalard, closes: #485965)
+ * add doc/examples/apt-https-method-example.cof
+ (thanks to Arnaud Ebalard, closes: #485964)
+ * add DPkg::NoTriggers option so that applications that call
+ apt/aptitude (like the installer) defer trigger processing
+ (thanks to Joey Hess)
+ * document --install-recommends and --no-install-recommends
+ (thanks to Dereck Wonnacott, LP: #126180)
+
+ [ Dereck Wonnacott ]
+ * apt-ftparchive might write corrupt Release files (LP: #46439)
+ * Apply --important option to apt-cache depends (LP: #16947)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 05 Aug 2008 10:10:49 +0200
+
+apt (0.7.14ubuntu3) intrepid; urgency=low
+
+ [ Otavio Salvador ]
+ * Apply patch to avoid truncating of arbitrary files. Thanks to Bryan
+ Donlan <bdonlan@fushizen.net> for the patch. Closes: #482476
+ * Avoid using dbus if dbus-daemon isn't running. Closes: #438803
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.cc:
+ - improve apt progress reporting, display trigger actions
+ * apt-pkg/depcache.cc:
+ - when checking for new important deps, skip critical ones
+ (LP: #236360)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 03 Jun 2008 17:27:07 +0200
+
+apt (0.7.14ubuntu2) intrepid; urgency=low
+
+ * debian/control:
+ - fix FTBFS by adding missing intltool dependency
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 09 May 2008 13:50:22 +0200
+
apt (0.7.14) unstable; urgency=low
[ Christian Perrier ]
@@ -1954,6 +2624,268 @@ apt (0.7.10) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 07 Jan 2008 21:40:47 +0100
+apt (0.7.9ubuntu17) hardy-proposed; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - fix signaure removal on transient network failures LP: #220627
+ (thanks to Scott James Remnant)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 22 Apr 2008 16:32:49 +0200
+
+apt (0.7.9ubuntu16) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - only check against master-keys in net-update to not break
+ custom CDs (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 08 Apr 2008 14:17:14 +0200
+
+apt (0.7.9ubuntu15) hardy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - do two passes when installing tasks, first ignoring dependencies,
+ then resolving them and run the problemResolver at the end
+ so that it can correct any missing dependencies. This should
+ fix livecd building for kubuntu (thanks to Jonathan Riddell
+ for reporting the problem)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Mar 2008 23:25:45 +0100
+
+apt (0.7.9ubuntu14) hardy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix incorrect help output for -f (LP: #57487)
+ - run the problemResolver after a task was installed
+ so that it can correct any missing dependencies
+ * typo fixes (LP: #107960)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Mar 2008 21:46:07 +0100
+
+apt (0.7.9ubuntu13) hardy; urgency=low
+
+ [ Lionel Porcheron ]
+ * debian/apt.cron.daily:
+ - only call gconftool if gcontool is installed (LP: #194281)
+
+ [ Michael Vogt ]
+ * doc/apt_preferences.5.xml:
+ - fix typo (LP: #150900)
+ * doc/example/sources.list:
+ - updated for hardy (LP: #195879)
+ * debian/apt.cron.daily:
+ - sleep random amount of time (default within 0-30min) before
+ starting the upate to hit the mirrors less hard
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 04 Mar 2008 15:35:09 +0100
+
+apt (0.7.9ubuntu12) hardy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use admin user proxy settings
+ * cmdline/apt-get.cc:
+ - fix task installation (thanks to Colin Watson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Feb 2008 15:07:44 +0100
+
+apt (0.7.9ubuntu11) hardy; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - add APT::Update::Post-Invoke-Success script slot
+ (LP: #188127)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Jan 2008 12:06:12 +0100
+
+apt (0.7.9ubuntu10) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - add "net-update" command that fetches the
+ ubuntu-archive-keyring.gpg and add keys from it that are
+ signed by the ubuntu-master-keyring.gpg
+ (apt-archive-key-signatures spec)
+ * debian/apt.cron.daily:
+ - add apt-key net-update to the nightly cron job
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Feb 2008 15:50:28 +0100
+
+apt (0.7.9ubuntu9) hardy; urgency=low
+
+ * fix FTBFS due to incorrect intltool build-depends
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 16:04:37 +0100
+
+apt (0.7.9ubuntu8) hardy; urgency=low
+
+ * share/apt-auth-failure.note:
+ - show update-notifier note if the nightly update fails with a
+ authentication failure (apt-authentication-reliability spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 11 Feb 2008 14:04:56 +0100
+
+apt (0.7.9ubuntu7) hardy; urgency=low
+
+ * methods/connect.cc:
+ - remember hosts with Resolve failures or connect Timeouts
+ see https://wiki.ubuntu.com/NetworklessInstallationFixes
+ * cmdlines/apt-key:
+ - fix bug in the new apt-key update code that imports only
+ keys signed with the master key (thanks to cjwatson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 08 Feb 2008 11:38:35 +0100
+
+apt (0.7.9ubuntu6) hardy; urgency=low
+
+ * cmdline/apt-key:
+ - add support for a master-keyring that contains signing keys
+ that can be used to sign the archive signing keys. This should
+ make key-rollover easier.
+ * apt-pkg/deb/dpkgpm.cc:
+ - merged patch from Kees Cook to fix anoying upper-case display
+ on amd64 in sbuild
+ * apt-pkg/algorithms.cc:
+ - add APT::Update::Post-Invoke-Success script slot
+ - Make the breaks handling use the kill list. This means, that a
+ Breaks: Pkg (<< version) may put Pkg onto the remove list.
+ * apt-pkg/deb/dpkgpm.cc:
+ - add APT::Apport::MaxReports to limit the maximum number
+ of reports generated in a single run (default to 3)
+ * apt-pkg/deb/debmetaindex.cc:
+ - add missing "Release" file uri when apt-get update --print-uris
+ is run
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 04 Feb 2008 14:28:02 +0100
+
+apt (0.7.9ubuntu5) hardy; urgency=low
+
+ * Merged apt-authentication-reliabilty branch. This means
+ that apt will refuse to update and use the old lists if
+ the authentication of a repository that used to be
+ authenticated fails. See
+ https://wiki.ubuntu.com/AptAuthenticationReliability
+ for more details.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 16 Jan 2008 10:36:10 +0100
+
+apt (0.7.9ubuntu4) hardy; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - Since APT::Get::List-Cleanup and APT::List-Cleanup both default to
+ true, the effect of the compatibility code was to require both of them
+ to be set to false in order to disable list cleanup; this broke the
+ installer. Instead, disable list cleanup if either of them is set to
+ false.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 09 Jan 2008 22:34:37 +0000
+
+apt (0.7.9ubuntu3) hardy; urgency=low
+
+ * merged the apt--DoListUpdate branch, this provides a common interface
+ for "apt-get update" like operations for the frontends and also provides
+ hooks to run stuff in APT::Update::{Pre,Post}-Invoke
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 07 Jan 2008 19:02:11 +0100
+
+apt (0.7.9ubuntu2) hardy; urgency=low
+
+ [ Otavio Salvador ]
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix building
+ with newest dpkg-shlibdeps changing the packaging building order and a
+ patch from Robert Millan <rmh@aybabtu.com> to fix parallel building,
+ closes: #452862.
+ * Applied patch from Alexander Winston <alexander.winston@comcast.net>
+ to use 'min' as symbol for minute, closes: #219034.
+ * Applied patch from Amos Waterland <apw@us.ibm.com> to allow apt to
+ work properly in initramfs, closes: #448316.
+ * Applied patch from Robert Millan <rmh@aybabtu.com> to make apt-key and
+ apt-get to ignore time conflicts, closes: #451328.
+ * Applied patch from Peter Eisentraut <peter_e@gmx.net> to fix a
+ grammatical error ("manual installed" -> "manually installed"),
+ closes: #438136.
+ * Fix cron.daily job to not call fail if apt isn't installed, closes:
+ #443286.
+
+ [ Daniel Burrows ]
+ * apt-pkg/contrib/configuration.cc:
+ - if RootDir is set, then FindFile and FindDir will return paths
+ relative to the directory stored in RootDir, closes: #456457.
+
+ [ Christian Perrier ]
+ * Fix wording for "After unpacking...". Thans to Michael Gilbert
+ for the patch. Closes: #260825
+
+ [ Program translations ]
+ - Vietnamese updated. Closes: #453774
+ - Japanese updated. Closes: #456909
+ - French updated.
+
+ [ Michael Vogt ]
+ * apt-pkg/packagemanager.{cc,h}:
+ - propergate the Immediate flag to make hitting the
+ "E: Internal Error, Could not perform immediate configuration (2)"
+ harder. (LP: #179247)
+ * debian/apt.conf.daily:
+ - print warning if the cache can not be locked (closes: #454561),
+ thanks to Bastian Kleineidam
+ * debian/control:
+ - build against libdb-dev (instead of libdb4.4-dev)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 03 Jan 2008 11:31:45 +0100
+
+apt (0.7.9ubuntu1) hardy; urgency=low
+
+ * merged from http://bzr.debian.org/apt/apt/debian-sid/, remaining
+ changes:
+ - mirror download method (pending merge with debian)
+ - no pdiff download by default (unsuitable for ubuntu)
+ - no recommends-by-default yet
+ - add "Original-Maintainer" field to tagfile
+ - show warning on apt-get source if the package is maintained
+ in a VCS (pedinging merge with debian)
+ - use ubuntu-archive keyring instead of debians one
+ - support metapackages section for autoremoval
+ - debian maintainer field change
+ - send ubuntu string in user-agent
+
+ * Changes from the debian-sid bzr branch (but not uploaded to debian
+ yet):
+
+ [ Otavio Salvador ]
+ * Applied patch from Mike O'Connor <stew@vireo.org> to add a manpage to
+ apt-mark, closes: #430207.
+ * Applied patch from Andrei Popescu <andreimpopescu@gmail.com> to add a
+ note about some frontends in apt.8 manpage, closes: #438545.
+ * Applied patch from Aurelien Jarno <aurel32@debian.org> to avoid CPU
+ getting crazy when /dev/null is redirected to stdin (which breaks
+ buildds), closes: #452858.
+
+ [ Program translations ]
+ - Basque updated. Closes: #453088
+
+ [ Michael Vogt ]
+ * debian/rules
+ - fix https install location
+ * methods/gpgv.cc:
+ - remove cruft code that caused timestamp/I-M-S issues
+ * ftparchive/contents.cc:
+ - fix error output
+ * methods/mirror.{cc,h}:
+ - only update mirror list on IndexFile updates
+ * apt-pkg/acquire-item.{cc,h}:
+ - make the authentication download code more robust against
+ servers/proxies with broken If-Range implementations
+ * debian/control:
+ - build against libdb-dev (instead of libdb4.4-dev)
+ * merged the apt--DoListUpdate branch, this provides a common interface
+ for "apt-get update" like operations for the frontends and also provides
+ hooks to run stuff in APT::Update::{Pre,Post}-Invoke
+
+ [ Chris Cheney ]
+ * ftparchive/contents.cc:
+ - support lzma data members
+ * ftparchive/multicompress.cc:
+ - support lzma output
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 13 Dec 2007 14:46:27 +0100
+
apt (0.7.9) unstable; urgency=low
[ Christian Perrier ]
@@ -2079,6 +3011,193 @@ apt (0.7.7) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Tue, 23 Oct 2007 14:58:03 +0200
+apt (0.7.6ubuntu14.1) gutsy-proposed; urgency=low
+
+ [ Michael Vogt ]
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - give up timeslice on EIO error in read from master terminal
+ * debian/apt.cron.daily:
+ - only run the cron job if apt-get check succeeds (LP: #131719)
+
+ [ Martin Emrich ]
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - rewrite dpkgpm.cc to use pselect() instead of select()
+ to block signals during select() (LP: #134858)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Sat, 20 Oct 2007 07:51:12 +0200
+
+apt (0.7.6ubuntu14) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix resource leak (LP: #148806)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 15 Oct 2007 20:57:44 +0200
+
+apt (0.7.6ubuntu13) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix crash in WriteApportReport (LP: #144537)
+ * apt-pkg/acquire-item.cc
+ - fix disappearing local Packages.gz file (LP: #131166)
+ * methods/https.cc:
+ - fix off-by-one error I-M-S handling
+ - cleanup after I-M-S hit
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 09 Oct 2007 01:48:26 +0200
+
+apt (0.7.6ubuntu12) gutsy; urgency=low
+
+ [ Michael Vogt ]
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file
+ (thanks to Laurent Bigonville, LP: #140019)
+ * apt-pkg/deb/debmetaindex.cc: comparison with string literal results
+ in unspecified behaviour;
+ * Reset curl options and timestamp between downloaded files. Thanks to
+ Ryan Murray <rmurray@debian.org> for the patch
+
+ [Paul Sladen]
+ * Have 'cron.daily/apt' send D-Bus doesn't exist error messages
+ to the bit bucket. Thanks to 'dasdda'. (LP: #115397)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 03 Oct 2007 02:17:45 +0200
+
+apt (0.7.6ubuntu11) gutsy; urgency=low
+
+ * apt-pkg/contrib/mmap.cc:
+ - don't fail if msync() returns > 0 (LP: #144001)
+
+ -- Colin Watson <cjwatson@ubuntu.com> Sat, 22 Sep 2007 21:39:29 +0100
+
+apt (0.7.6ubuntu10) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix parse error when dpkg sends unexpected data
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Sep 2007 17:25:09 +0100
+
+apt (0.7.6ubuntu9) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix progress reporting precent calculation (LP: #137798)
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ (LP: #136767)
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes LP: #125733
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled (LP: #139448)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 11 Sep 2007 20:55:00 +0200
+
+apt (0.7.6ubuntu8) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - fix bug in dpkg log writing when a signal is caught during
+ select() (LP: #134858)
+ - write end marker in the log as well
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 05 Sep 2007 15:03:46 +0200
+
+apt (0.7.6ubuntu7) gutsy; urgency=low
+
+ * reupload to fix FTBFS
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 16 Aug 2007 19:44:20 +0200
+
+apt (0.7.6ubuntu6) gutsy; urgency=low
+
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Ian Jackson <iwj@ubuntu.com> Wed, 15 Aug 2007 20:44:37 +0100
+
+apt (0.7.6ubuntu5) UNRELEASED; urgency=low
+
+ * apt-pkg/acquire-item.cc:
+ - fix file removal on local repo i-m-s hit (LP: #131166)
+ * tests/local-repo:
+ - added regression test for this bug
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 09 Aug 2007 12:34:07 +0200
+
+apt (0.7.6ubuntu4) gutsy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - remove YnPrompt when a XS-Vcs- tag is found, improve the
+ notice (LP: #129575)
+ * methods/copy.cc:
+ - take hashes here too
+ * apt-pkg/acquire-worker.cc:
+ - only pass on computed hash if we recived one from the method
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 08 Aug 2007 19:30:29 +0200
+
+apt (0.7.6ubuntu3) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - fix packagename extraction when writting apport reports
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size (LP: #125640)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 07 Aug 2007 09:52:00 +0200
+
+apt (0.7.6ubuntu2) gutsy; urgency=low
+
+ * doc/examples/sources.list:
+ - change example source to gutsy
+ * apt-pkg/deb/dpkgpm.cc:
+ - do not break if no /dev/pts is available
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 06 Aug 2007 15:17:57 +0200
+
+apt (0.7.6ubuntu1) gutsy; urgency=low
+
+ [ Michael Vogt ]
+ * apt-inst/contrib/extracttar.cc:
+ - fix fd leak for zero size files (thanks to Bill Broadley for
+ reporting this bug)
+ * apt-pkg/acquire-item.cc:
+ - remove zero size files on I-M-S hit
+ * methods/https.cc:
+ - only send LastModified if we actually have a file
+ - send range request with if-range
+ - delete failed downloads
+ (thanks to Thom May for his help here)
+ - delete zero size I-M-S hits
+ * apt-pkg/deb/dpkgpm.{cc,h}:
+ - merged dpkg-log branch, this lets you specify a
+ Dir::Log::Terminal file to log dpkg output to
+ (ABI break)
+ - when writting apport reports, attach the dpkg
+ terminal log too
+ * merged apt--sha256 branch to fully support the new
+ sha256 checksums in the Packages and Release files
+ (ABI break)
+ * apt-pkg/pkgcachegen.cc:
+ - increase default mmap size
+ * tests/local-repo:
+ - added local repository testcase
+ * make apt build with g++ 4.3
+ * fix missing SetExecClose() call when the status-fd is used
+ * debian/apt.cron.daily:
+ - move unattended-upgrade before apt-get autoclean
+ * fix "purge" commandline argument, closes: #133421
+ (thanks to Julien Danjou for the patch)
+ * cmdline/apt-get.cc:
+ - do not change the auto-installed information if a package
+ is reinstalled
+ * cmdline/apt-mark:
+ - Fix chmoding after have renamed the extended-states file (LP: #140019)
+ (thanks to Laurent Bigonville)
+
+ [ Ian Jackson ]
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 02 Aug 2007 11:55:54 +0200
+
apt (0.7.6) unstable; urgency=low
* Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong
@@ -2106,6 +3225,14 @@ apt (0.7.5) unstable; urgency=low
-- Otavio Salvador <otavio@ossystems.com.br> Wed, 25 Jul 2007 20:16:46 -0300
+apt (0.7.4ubuntu1) gutsy; urgency=low
+
+ * debian/apt.conf.ubuntu, apt.conf.autoremove:
+ - Change metapackages to {restricted,universe,multiverse}/metapackages
+ in Install-Recommends-Sections and Never-MarkAuto-Sections
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 26 Jul 2007 10:42:29 +0200
+
apt (0.7.4) unstable; urgency=low
[ Michael Vogt ]
@@ -2166,6 +3293,90 @@ apt (0.7.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Sun, 01 Jul 2007 12:31:29 +0200
+apt (0.7.2ubuntu7) gutsy; urgency=low
+
+ * fix build-dependencies
+ * fixes in the auto-mark code (thanks to Daniel
+ Burrows)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 9 Jul 2007 19:02:54 +0200
+
+apt (0.7.2ubuntu6) gutsy; urgency=low
+
+ [ Michael Vogt]
+ * cmdline/apt-get.cc:
+ - make the XS-Vcs-$foo warning more copy'n'paste
+ friendly (thanks to Matt Zimmerman)
+ - ignore the Vcs-Browser tag (Fixes LP: #121770)
+ * debian/apt.conf.autoremove:
+ - added "linux-ubuntu-modules" to APT::NeverAutoRemove
+
+ [ Sarah Hobbs ]
+ * Change metapackages to *metapackages in Install-Recommends-Section
+ and Never-MarkAuto-Section of debian/apt.conf.autoremove, so that
+ the Recommends of metapackages in universe and multiverse will get
+ installed.
+ * Also make this change in doc/examples/configure-index.
+ * Added a Build Dependancies of automake, docbook-xsl, xsltproc, xmlto,
+ docbook to fix FTBFS.
+ * Added in previous changelog entries, as those who uploaded did not
+ actually commit to Bzr.
+
+ -- Sarah Hobbs <hobbsee@ubuntu.com> Mon, 09 Jul 2007 01:15:57 +1000
+
+apt (0.7.2ubuntu5) gutsy; urgency=low
+
+ * Rerun autoconf to fix the FTBFS.
+
+ -- Michael Bienia <geser@ubuntu.com> Fri, 06 Jul 2007 19:17:33 +0200
+
+apt (0.7.2ubuntu4) gutsy; urgency=low
+
+ * Rebuild for the libcurl4 -> libcurl3 transition mess.
+
+ -- Steve Kowalik <stevenk@ubuntu.com> Fri, 6 Jul 2007 12:44:05 +1000
+
+apt (0.7.2ubuntu3) gutsy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix InstallTask code when a pkgRecord ends
+ with a single '\n' (thanks to Soren Hansen for reporting)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 27 Jun 2007 13:33:38 +0200
+
+apt (0.7.2ubuntu2) gutsy; urgency=low
+
+ * fixed compile errors with g++ 4.3 (thanks to
+ Daniel Burrows, closes: #429378)
+ * fix FTFBFS by changing build-depends to
+ libcurl4-gnutls-dev (closes: #428363)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Jun 2007 13:47:03 +0200
+
+apt (0.7.2ubuntu1) gutsy; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc:
+ - apport integration added, this means that a apport
+ report is written on dpkg failures
+ * cmdline/apt-get.cc:
+ - merged http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/
+ this will warn when Vcs- headers are found on apt-get source
+ (Fixes LP:#115959)
+ * merged from debian/unstable, remaining changes:
+ - maintainer field changed
+ - merged the apt--mirror branch
+ http://people.ubuntu.com/~mvo/bzr/apt/apt--mirror/
+ - apport reporting on package install/upgrade/remove failure
+ - support for "Originial-Maintainer" field
+ - merged apt--xs-vcs-bzr branch
+ (http://people.ubuntu.com/~mvo/bzr/apt/xs-vcs-bzr/)
+ - use ubuntu archive keyring by default
+ - debian/apt.conf.autoremove
+ + install recommands for section "metapackages"
+ + do not mark direct dependencies of "metapackages" as autoremoved
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 14 Jun 2007 10:38:36 +0200
+
apt (0.7.2-0.1) unstable; urgency=low
* Non-maintainer upload.
@@ -2288,6 +3499,116 @@ apt (0.7.0) experimental; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 12 Jan 2007 20:48:07 +0100
+apt (0.6.46.4ubuntu10) feisty; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - added "APT::Never-MarkAuto-Section" and consider dependencies
+ of packages in this section manual (LP#59893)
+ - ensure proper permissions in the extended_state file (LP#67037)
+ * debian/apt.conf.ubuntu:
+ - added APT::Never-MarkAuto-Section "metapackages" (LP#59893)
+ * cmdline/apt-get.cc:
+ - "apt-get install foo" on a already installed package foo will
+ clean the automatic installed flag (LP#72007)
+ - do not show packages already marked for removal as auto-installed
+ (LP#64493)
+ - applied patch to (optionally) hide the auto-remove information
+ (thanks to Frode M. Døving) (LP#69148)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 14 Mar 2007 13:32:32 +0100
+
+apt (0.6.46.4ubuntu9) feisty; urgency=low
+
+ * debian/control:
+ - set XS-Vcs-Bzr header
+ - Set Ubuntu maintainer address
+ * apt-pkg/cdrom.cc:
+ - only unmount if APT::CDROM::NoMount is false
+ - only umount if it was mounted by the method before
+ * cmdline/apt-get.cc:
+ - fix version output in autoremove list (LP#68941)
+ * apt-pkg/packagemanager.cc:
+ - do not spin 100% cpu in FixMissing() (LP#84476)
+ * apt-pkg/indexfile.cc:
+ - fix problem overwriting APT::Acquire::Translation
+ * doc/examples/configure-index:
+ - document APT::Acquire::Translation
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Mar 2007 15:24:39 +0100
+
+apt (0.6.46.4ubuntu8) feisty; urgency=low
+
+ * fix segfault in the pkgRecords destructor
+ * Bump ABI version
+ * debian/control:
+ - make the libcurl3-gnutls-dev versionized (LP#86614)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 26 Feb 2007 14:26:33 +0100
+
+apt (0.6.46.4ubuntu7) feisty; urgency=low
+
+ * Merged the apt--mirror branch. This means that a new 'mirror'
+ method is available that will allow dynamic mirror updates.
+ The sources.list entry looks something like this:
+ "deb mirror://mirrors.lp.net/get_mirror feisty main restricted"
+
+ It also supports error reporting to a configurable url for mirror
+ problems/failures.
+ * Bump ABI version
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Feb 2007 11:38:06 +0100
+
+apt (0.6.46.4ubuntu6) feisty; urgency=low
+
+ * methods/http.cc:
+ - send apt version in User-Agent
+ * apt-pkg/deb/debrecords.cc:
+ - fix SHA1Hash() return value
+ * apt-pkg/algorithms.cc:
+ - fix resolver bug on removal triggered by weak-dependencies
+ with or-groups
+ - fix segfault (lp: #76530)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Dec 2006 11:04:36 +0100
+
+apt (0.6.46.4ubuntu5) feisty; urgency=low
+
+ * added apt-transport-https package to provide a optional
+ https transport (apt-https spec)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Dec 2006 16:23:43 +0100
+
+apt (0.6.46.4ubuntu4) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc:
+ - only increase the score of installed applications if they
+ are not obsolete
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 19:39:05 +0100
+
+apt (0.6.46.4ubuntu3) feisty; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - use clog for all debugging
+ * apt-pkg/depcache.cc:
+ - never mark Required package for autoremoval (lp: #75882)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 18 Dec 2006 11:56:05 +0100
+
+apt (0.6.46.4ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+ (thanks to Ian Jackson)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 23:07:24 +0100
+
+apt (0.6.46.4ubuntu1) feisty; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Dec 2006 12:13:14 +0100
+
apt (0.6.46.4-0.1) unstable; urgency=emergency
* NMU
@@ -2317,6 +3638,26 @@ apt (0.6.46.4) unstable; urgency=high
-- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100
+apt (0.6.46.3ubuntu2) feisty; urgency=low
+
+ * apt-pkg/algorithms.cc: add missing call to MarkKeep
+ so that dist-upgrade isn't broken by unsatisfiable Breaks.
+
+ -- Ian Jackson <iwj@ubuntu.com> Thu, 7 Dec 2006 15:46:52 +0000
+
+apt (0.6.46.3ubuntu1) feisty; urgency=low
+
+ * doc/apt-get.8.xml:
+ - documented autoremove, thanks to Vladimír Lapá%Gč%@ek
+ (lp: #62919)
+ * fix broken i18n in the dpkg progress reporting, thanks to
+ Frans Pop and Steinar Gunderson. (closes: #389261)
+ * po/en_GB.po:
+ - typo (lp: #61270)
+ * add apt-secure.8 to "See also" section
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 23 Nov 2006 07:24:12 +0100
+
apt (0.6.46.3-0.2) unstable; urgency=high
* Non-maintainer upload with permission of Michael Vogt.
@@ -2429,6 +3770,173 @@ apt (0.6.46) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 21 Sep 2006 10:25:03 +0200
+apt (0.6.45ubuntu14) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the TryInstallTask() code to make sure that all package
+ there are marked manual install (lp: #61684)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 28 Sep 2006 00:34:20 +0200
+
+apt (0.6.45ubuntu13) edgy; urgency=low
+
+ * no-changes upload to make apt rebuild against latest g++ and
+ fix synaptic FTBFS (see bug: #62461 for details)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 26 Sep 2006 22:33:10 +0200
+
+apt (0.6.45ubuntu12) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix in the sweep() code, set garbage flag for packages scheduled
+ for removal too
+ - do not change the autoFlag in MarkKeep(), this can lead to suprising
+ side effects
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 21 Sep 2006 00:58:24 +0200
+
+apt (0.6.45ubuntu11) edgy; urgency=low
+
+ * removed "installtask" and change it so that tasknames can be given
+ with "apt-get install taskname^"
+ * improve the writeStateFile() code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 20 Sep 2006 14:14:24 +0200
+
+apt (0.6.45ubuntu10) edgy; urgency=low
+
+ * methods/http.cc:
+ - check more careful for incorrect proxy settings (closes: #378868)
+ * methods/gzip.cc:
+ - don't hang when /var is full (closes: #341537), thanks to
+ Luis Rodrigo Gallardo Cruz for the patch
+ * doc/examples/sources.list:
+ - removed non-us.debian.org from the example (closes: #380030,#316196)
+ * Merged from Christian Perrier bzr branch:
+ * ro.po: Updated to 514t. Closes: #388402
+ * dz.po: Updated to 514t. Closes: #388184
+ * it.po: Fixed typos. Closes: #387812
+ * ku.po: New kurdish translation. Closes: #387766
+ * sk.po: Updated to 514t. Closes: #386851
+ * ja.po: Updated to 514t. Closes: #386537
+ * gl.po: Updated to 514t. Closes: #386397
+ * fr.po: Updated to 516t.
+ * fi.po: Updated to 512t. Closes: #382702
+ * share/archive-archive.gpg:
+ - removed the outdated amd64 and debian-2004 keys
+ * apt-pkg/tagfile.cc:
+ - applied patch from Jeroen van Wolffelaar to make the tags
+ caseinsensitive (closes: #384182)
+ - reverted MMap use in the tagfile because it does not work
+ across pipes (closes: #383487)
+ * added "installtask" command
+ * added new ubuntu specific rewrite rule for "Original-Maintainer"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 19 Sep 2006 15:07:51 +0200
+
+apt (0.6.45ubuntu9) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - if --no-remove is given, do not run the AutoRemove code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 13 Sep 2006 11:54:20 +0200
+
+apt (0.6.45ubuntu8) edgy; urgency=low
+
+ * apt-pkg/algorithm.cc:
+ - fix pkgProblemResolver.InstallProtect() to preserve the auto-install
+ information (lp: #59457)
+ * cmdline/apt-get.cc:
+ - fix typo in autoremove information (lp: #59420)
+ * install apt-mark to modify the automatically install information for
+ packages
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 8 Sep 2006 20:07:22 +0200
+
+apt (0.6.45ubuntu7) edgy; urgency=low
+
+ * apt-pkg/depcache.cc:
+ - fix a bug in the install-recommends-section code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 18:22:38 +0200
+
+apt (0.6.45ubuntu6) edgy; urgency=low
+
+ [Michael Vogt]
+ * cmdline/apt-get.cc:
+ - always show auto-removable packages and give a hint how to remove
+ them
+ * debian/apt.conf.ubuntu:
+ - exlucde linux-image and linux-restricted-modules from ever being
+ auto-removed
+ - added "metapackages" as the section we want to install recommends
+ by default
+ * apt-pkg/depcache.cc:
+ - added support to turn install-recommends selectively on/off by
+ section
+ [Ian Jackson]
+ * Tests pass without code changes! Except that we need this:
+ * Bump cache file major version to force rebuild so that Breaks
+ dependencies are included.
+ * Don't depend on or suggest any particular dpkg or dpkg-dev versions;
+ --auto-deconfigure is very very old and dpkg-dev's Breaks support
+ is more or less orthogonal.
+ * Initial draft of `Breaks' implementation. Appears to compile,
+ but as yet *completely untested*.
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 7 Sep 2006 11:50:52 +0200
+
+apt (0.6.45ubuntu5) edgy; urgency=low
+
+ * apt-pkg/pkgcachegen.cc:
+ - increase the APT::Cache-Limit to deal with the increased demand due
+ to the translated descriptions
+ * apt-pkg/deb/dpkgpm.cc:
+ - pass "--auto-deconfigure" to dpkg on install to support the
+ new "breaks" in dpkg
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 15 Aug 2006 12:06:26 +0200
+
+apt (0.6.45ubuntu4) edgy; urgency=low
+
+ * cmdline/apt-get.cc:
+ - fix in the new --fix-polciy code
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Aug 2006 21:08:11 +0200
+
+apt (0.6.45ubuntu3) edgy; urgency=low
+
+ * ABI break
+ * merged latest apt--install-recommends (closes: #559000)
+ * added "--fix-policy" option to can be used as "--fix-broken" and
+ will install missing weak depends (recommends, and/or suggests
+ depending on the settings)
+ * merged the apt--ddtp branch
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 11 Aug 2006 12:53:23 +0200
+
+apt (0.6.45ubuntu2) edgy; urgency=low
+
+ * debian/control:
+ - switched to libdb4.4 for building (closes: #381019)
+ * cmdline/apt-get.cc:
+ - show only the recommends/suggests for the candidate-version, not for all
+ versions of the package (closes: #257054)
+ - properly handle recommends/suggests or-groups when printing the list of
+ suggested/recommends packages (closes: #311619)
+ * merged "apt--install-recommends" branch:
+ - added "{no-}install-recommends" commandline option
+ - added APT::Install-{Recommends,Suggests} option
+ - currently Install-Recommends defaults to "False"
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 9 Aug 2006 23:38:46 +0200
+
+apt (0.6.45ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 1 Aug 2006 15:43:22 +0200
+
apt (0.6.45) unstable; urgency=low
* apt-pkg/contrib/sha256.cc:
@@ -2474,6 +3982,37 @@ apt (0.6.45) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200
+apt (0.6.44.2ubuntu4) edgy; urgency=low
+
+ * Make apt-get dselect-upgrade happy again
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200
+
+apt (0.6.44.2ubuntu3) edgy; urgency=low
+
+ * Close extended_states file after writing it.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100
+
+apt (0.6.44.2ubuntu2) edgy; urgency=low
+
+ * create a empty extended_states file if none exists already
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200
+
+apt (0.6.44.2ubuntu1) edgy; urgency=low
+
+ * merged with debian/unstable
+ * merged the "auto-mark" branch to support aptitude like
+ marking of automatically installed dependencies and added
+ "apt-get remove --auto-remove" to remove unused auto-installed
+ packages again
+ * changed library version from 3.11 to 3.50 to make it clearly
+ different from the debian version (we are ABI incompatible because
+ of the auto-mark patch)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200
+
apt (0.6.44.2exp1) experimental; urgency=low
* added support for i18n of the package descriptions
@@ -2562,6 +4101,26 @@ apt (0.6.44) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200
+apt (0.6.43.3ubuntu3) dapper; urgency=low
+
+ * methods/http.cc:
+ - fix the user-agent string
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 26 May 2006 18:09:32 +0200
+
+apt (0.6.43.3ubuntu2) dapper; urgency=low
+
+ * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 18 Apr 2006 13:24:40 +0200
+
+apt (0.6.43.3ubuntu1) dapper; urgency=low
+
+ * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in
+ the status-fd (ubuntu #28954)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200
+
apt (0.6.43.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-186:
@@ -2594,6 +4153,38 @@ apt (0.6.43.3) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100
+apt (0.6.43.2ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182:
+ * ca.po: Completed to 512t. Closes: #351592
+ * eu.po: Completed to 512t. Closes: #350483
+ * ja.po: Completed to 512t. Closes: #349806
+ * pl.po: Completed to 512t. Closes: #349514
+ * sk.po: Completed to 512t. Closes: #349474
+ * gl.po: Completed to 512 strings Closes: #349407
+ * vi.po: Completed to 512 strings
+ * sv.po: Completed to 512 strings Closes: #349210
+ * ru.po: Completed to 512 strings Closes: #349154
+ * da.po: Completed to 512 strings Closes: #349084
+ * fr.po: Completed to 512 strings
+ * LINGUAS: Add Welsh
+ * *.po: Updated from sources (512 strings)
+ * vi.po: Completed to 511 strings Closes: #348968
+ * apt-pkg/deb/deblistparser.cc:
+ - don't explode on a DepCompareOp in a Provides line, but warn about
+ it and ignore it otherwise (thanks to James Troup for reporting it)
+ * cmdline/apt-get.cc:
+ - don't lock the lists directory in DoInstall, breaks --print-uri
+ (thanks to James Troup for reporting it)
+ * debian/apt.dirs: create /etc/apt/sources.list.d
+ * make apt-cache madison work without deb-src entries (#352583)
+ * cmdline/apt-get.cc: only run the list-cleaner if a update was
+ successfull
+ * apt-get update errors are only warnings nowdays
+ * be more careful with the signature file on network failures
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100
+
apt (0.6.43.2) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-166:
@@ -2617,6 +4208,24 @@ apt (0.6.43.2) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Thu, 19 Jan 2006 00:06:33 +0100
+apt (0.6.43.1ubuntu1) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159:
+ - en_GB.po, de.po: fix spaces errors in "Ign " translations
+ Closes: #347258
+ - makefile: make update-po a pre-requisite of clean target so
+ that POT and PO files are always up-to-date
+ - sv.po: Completed to 511t. Closes: #346450
+ - sk.po: Completed to 511t. Closes: #346369
+ - fr.po: Completed to 511t
+ - *.po: Updated from sources (511 strings)
+ * add patch to fix http download corruption problem (thanks to
+ Petr Vandrovec, closes: #280844, #290694)
+ * added APT::Periodic::Unattended-Upgrade (requires the package
+ "unattended-upgrade")
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 10 Jan 2006 17:09:31 +0100
+
apt (0.6.43.1) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-148:
@@ -2640,6 +4249,19 @@ apt (0.6.43.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100
+apt (0.6.43ubuntu2) dapper; urgency=low
+
+ * merged some missing bits that wheren't merged by baz in the previous
+ upload (*grumble*)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100
+
+apt (0.6.43ubuntu1) dapper; urgency=low
+
+ * merged with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100
+
apt (0.6.43) unstable; urgency=medium
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-132:
@@ -2660,6 +4282,22 @@ apt (0.6.43) unstable; urgency=medium
-- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100
+apt (0.6.42.3ubuntu2) dapper; urgency=low
+
+ * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131:
+ * zh_CN.po: Completed to 507 strings(Closes: #338267)
+ * gl.po: Completed to 510 strings (Closes: #338356)
+ * added support for "/etc/apt/sources.list.d" directory
+ (closes: #66325)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100
+
+apt (0.6.42.3ubuntu1) dapper; urgency=low
+
+ * synced with debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100
+
apt (0.6.42.3) unstable; urgency=low
* Merge bubulle@debian.org--2005/apt--main--0 up to patch-129:
@@ -2766,6 +4404,80 @@ apt (0.6.41) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200
+apt (0.6.40.1ubuntu8) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62:
+ - fix for a bad memory/file leak in the mmap code (ubuntu #15603)
+ * po/de.po, po/fr.po:
+ - updated the translations
+ * po/makefile:
+ - create a single pot file in each domain dir to make rosetta happy
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200
+
+apt (0.6.40.1ubuntu7) breezy; urgency=low
+
+ * updated the pot/po files , no code changes
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 27 Sep 2005 18:38:16 +0200
+
+apt (0.6.40.1ubuntu6) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56:
+ - make it possible for apt to handle a failed MediaChange event and
+ fall back to other sources (ubuntu #13713)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200
+
+apt (0.6.40.1ubuntu5) breezy; urgency=low
+
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}.
+ This adds media-change reporting to the apt status-fd (ubuntu #15213)
+ * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55:
+ apt-pkg/cdrom.cc:
+ - unmount the cdrom when apt failed to locate any package files
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200
+
+apt (0.6.40.1ubuntu4) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - fix a embarrassing typo
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200
+
+apt (0.6.40.1ubuntu3) breezy; urgency=low
+
+ * debian/apt.cron.daily:
+ - use the ctime as well when figuring what packages need to
+ be removed. This fixes the problem that packages copied with
+ "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504)
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200
+
+apt (0.6.40.1ubuntu2) breezy; urgency=low
+
+ * improved the support for "error" and "conffile" reporting from
+ dpkg, added the format to README.progress-reporting
+ * added README.progress-reporting to the apt-doc package
+ * Do md5sum checking for file and cdrom method (closes: #319142)
+ * Change pkgPolicy::Pin from private to protected to let subclasses
+ access it too (closes: #321799)
+ * methods/connect.cc:
+ - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item
+ * apt-pkg/acquire-item.cc:
+ - fail early if a FailReason is TmpResolveFailure (avoids hangs during
+ the install when no network is available)
+ * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200
+
+apt (0.6.40.1ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200
+
apt (0.6.40.1) unstable; urgency=low
* bugfix in the parsing code for the apt<->dpkg communication. apt
@@ -2775,6 +4487,12 @@ apt (0.6.40.1) unstable; urgency=low
-- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200
+apt (0.6.40ubuntu1) breezy; urgency=low
+
+ * Synchronize with Debian
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700
+
apt (0.6.40) unstable; urgency=low
* Patch from Jordi Mallach to mark some additional strings for translation
@@ -2790,6 +4508,39 @@ apt (0.6.40) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Thu, 28 Jul 2005 11:57:32 -0700
+apt (0.6.39ubuntu4) breezy; urgency=low
+
+ * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this
+ before...)
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Wed, 29 Jun 2005 08:39:17 -0700
+
+apt (0.6.39ubuntu3) breezy; urgency=low
+
+ * Fix keyring locations for Ubuntu in apt-key too.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 14:45:36 +0100
+
+apt (0.6.39ubuntu2) breezy; urgency=low
+
+ * Install ubuntu-archive.gpg rather than debian-archive.gpg as
+ /etc/apt/trusted.gpg.
+
+ -- Colin Watson <cjwatson@ubuntu.com> Wed, 29 Jun 2005 11:53:34 +0100
+
+apt (0.6.39ubuntu1) breezy; urgency=low
+
+ * Michael Vogt
+ - Change debian/bugscript to use #!/bin/bash (Closes: #313402)
+ - Fix a incorrect example in the man-page (closes: #282918)
+ - Support architecture-specific extra overrides
+ (closes: #225947). Thanks to Anthony Towns for idea and
+ the patch, thanks to Colin Watson for testing it.
+ - better report network timeouts from the methods to the acuire code,
+ only timeout once per sources.list line
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Tue, 28 Jun 2005 11:52:24 -0700
+
apt (0.6.39) unstable; urgency=low
* Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6
@@ -2802,6 +4553,13 @@ apt (0.6.39) unstable; urgency=low
-- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700
+apt (0.6.38ubuntu1) breezy; urgency=low
+
+ * First release from Ubuntu branch
+ * Merge with --main--0, switch back to Ubuntu keyring
+
+ -- Matt Zimmerman <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700
+
apt (0.6.38) unstable; urgency=low
* Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround
diff --git a/debian/control b/debian/control
index f03b96f67..c1283f7d2 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
Source: apt
Section: admin
Priority: important
-Maintainer: APT Development Team <deity@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: APT Development Team <deity@lists.debian.org>
Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>,
Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>,
Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org>
@@ -12,9 +13,10 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
Package: apt
Architecture: any
-Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends}, gnupg
+Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: manpages-pl (<< 20060617-3~)
Provides: ${libapt-pkg:provides}
+Recommends: ubuntu-keyring, gpg
Conflicts: python-apt (<< 0.7.93.2~)
Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
Description: Advanced front-end for dpkg
diff --git a/debian/rules b/debian/rules
index 8bfcaf385..f6ffabd1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -214,7 +214,7 @@ apt: build build-doc debian/shlibs.local
cp debian/bugscript debian/$@/usr/share/bug/apt/script
cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt
-
+ cp share/ubuntu-archive.gpg debian/$@/usr/share/$@
cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove
# copy lintian override
diff --git a/doc/examples/sources.list b/doc/examples/sources.list
index ef729e203..cc0fd2b8d 100644
--- a/doc/examples/sources.list
+++ b/doc/examples/sources.list
@@ -1,9 +1,11 @@
# See sources.list(5) for more information, especialy
# Remember that you can only use http, ftp or file URIs
# CDROMs are managed through the apt-cdrom tool.
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://security.debian.org stable/updates main contrib non-free
+deb http://us.archive.ubuntu.com/ubuntu hardy main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu hardy main restricted
-# Uncomment if you want the apt-get source function to work
-#deb-src http://http.us.debian.org/debian stable main contrib non-free
-#deb-src http://security.debian.org stable/updates main contrib non-free
+deb http://security.ubuntu.com/ubuntu hardy-security main restricted
+deb-src http://security.ubuntu.com/ubuntu hardy-security main restricted
+
+deb http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted
+deb-src http://us.archive.ubuntu.com/ubuntu hardy-updates main restricted
diff --git a/doc/po/es.po b/doc/po/es.po
index cd945219f..3f07f8776 100644
--- a/doc/po/es.po
+++ b/doc/po/es.po
@@ -37,15 +37,15 @@ msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.25\n"
"POT-Creation-Date: 2010-07-30 12:46+0300\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"
+"PO-Revision-Date: 2010-08-25 03:25+0200\n"
+"Last-Translator: Omar Campagne <ocampagne@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.5.2\n"
+"X-Generator: Virtaal 0.6.1\n"
#. type: TH
#: apt.8:17
@@ -823,17 +823,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:264
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <varlistentry>\n"
-#| " <term><option>-c</option></term>\n"
-#| " <term><option>--config-file</option></term>\n"
-#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
-#| " The program will read the default configuration file and then this \n"
-#| " configuration file. See &apt-conf; for syntax information. \n"
-#| " </para>\n"
-#| " </listitem>\n"
-#| " </varlistentry>\n"
+#, no-wrap
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
@@ -850,9 +840,14 @@ msgstr ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
-" <listitem><para>Fichero de configuración: Especifica el fichero de configuración a usar. \n"
-" El programa leerá el fichero de configuración predeterminado y, después, este \n"
-" fichero de configuración. Consulte &apt-conf; para información sobre la sintaxis. \n"
+" <listitem><para>Fichero de configuración: Especifica el fichero de \n"
+" configuración a usar. \n"
+" El programa leerá el fichero de configuración predeterminado y, \n"
+" después, este fichero de configuración. Si necesita que ciertas \n"
+" opciones de configuración se definan antes que el análisis de los \n"
+" de los ficheros de configuración predeterminados, defina un fichero \n"
+" con la variable de entorno <envar>APT_CONFIG</envar>. \n"
+" Consulte &apt-conf; para información sobre la sintaxis.\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -1083,13 +1078,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:358
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY file-sourceslist \"\n"
-#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-#| " <listitem><para>Locations to fetch packages from.\n"
-#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-#| " </varlistentry>\n"
+#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
@@ -1097,21 +1086,16 @@ msgid ""
" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
-"<!ENTITY file-sourceslist \"\n"
-" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-" <listitem><para>Ubicaciones de dónde conseguir los paquetes.\n"
-" Opción de configuración: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>Registro de claves de las claves locales de confianza,\n"
+" las claves nuevas se añadirán aquí.\n"
+" Elemento de configuración: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
#. type: Plain text
#: apt.ent:365
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
-#| " <listitem><para>File fragments for locations to fetch packages from.\n"
-#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
-#| " </varlistentry>\n"
-#| "\">\n"
+#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
@@ -1120,21 +1104,17 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
-" <listitem><para>Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n"
-" Opción de configuración: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>Fragmentos de fichero de claves de confianza, se pueden\n"
+" añadir en este directorio registros de claves adicionales (por otros\n"
+" paquetes o el administrador.\n"
+" Elemento de configuración: <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
#. type: Plain text
#: apt.ent:373
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY file-sourceslist \"\n"
-#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-#| " <listitem><para>Locations to fetch packages from.\n"
-#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-#| " </varlistentry>\n"
+#, no-wrap
msgid ""
"<!ENTITY file-extended_states \"\n"
" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
@@ -1144,11 +1124,13 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-"<!ENTITY file-sourceslist \"\n"
-" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
-" <listitem><para>Ubicaciones de dónde conseguir los paquetes.\n"
-" Opción de configuración: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
-" </varlistentry>\n"
+"<!ENTITY file-extended_states \"\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+" <listitem><para>Lista de estado de paquetes automáticamente instalados.\n"
+" Elemento de configuración: <literal>Dir::State::extended_states</literal>.\n"
+" </para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
#. type: Plain text
#: apt.ent:377
@@ -1158,6 +1140,9 @@ msgid ""
" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
"<!ENTITY translation-title \"TRANSLATION\">\n"
msgstr ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"TRADUCCIÓN\">\n"
#. type: Plain text
#: apt.ent:386
@@ -1172,6 +1157,16 @@ msgid ""
" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
"\">\n"
msgstr ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
+"<!ENTITY translation-holder \"\n"
+" La traducción al español la realizaron Ismael Fanlo, Carlos Mestre,\n"
+" Rudy Godoy, Gustavo Saldumbide, Javier Fernández-Sanguino y Rubén\n"
+" Porras Campo entre los años 2003 y 2004. La traducción fue actualizada\n"
+" por Francisco Javier Cuadrado y Omar Campagne Polaino entre los años\n"
+" 2009 y 2010.\n"
+"\">\n"
#. type: Plain text
#: apt.ent:397
@@ -1188,6 +1183,16 @@ msgid ""
" translation is lagging behind the original content.\n"
"\">\n"
msgstr ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+" the generated manpage. This sentence is therefore here to tell the reader that this\n"
+" is not a mistake by the translator - obviously the target is that at least for stable\n"
+" releases this sentence is not needed. :) -->\n"
+"<!ENTITY translation-english \"\n"
+" Tenga en cuenta que este documento puede contener secciones sin\n"
+" traducir. Esto es intencionado para evitar perder contenido cuando\n"
+" la traducción no está actualizada con respecto al documento original.\n"
+"\">\n"
#. type: Plain text
#: apt.ent:400
@@ -1195,6 +1200,8 @@ msgid ""
"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
"ENTITY testing-codename \"squeeze\">"
msgstr ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
@@ -1911,67 +1918,46 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:312
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-pre-depends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:313
-#, fuzzy
-#| msgid "<option>--no-download</option>"
msgid "<option>--no-depends</option>"
-msgstr "<option>--no-download</option>"
+msgstr "<option>--no-depends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:314
-#, fuzzy
-#| msgid "<option>--install-recommends</option>"
msgid "<option>--no-recommends</option>"
-msgstr "<option>--install-recommends</option>"
+msgstr "<option>--no-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:315
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:316
-#, fuzzy
-#| msgid "<option>--no-mount</option>"
msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-mount</option>"
+msgstr "<option>--no-conflicts</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:317
-#, fuzzy
-#| msgid "<option>--no-act</option>"
msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-breaks</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:318
-#, fuzzy
-#| msgid "<option>--no-act</option>"
msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-replaces</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:319
-#, fuzzy
-#| msgid "<option>--no-act</option>"
msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-enhances</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:320
-#, fuzzy
-#| msgid ""
-#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
-#| "so that all packages mentioned are printed once. Configuration Item: "
-#| "<literal>APT::Cache::RecurseDepends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be twicked with these flags which will omit "
@@ -1979,9 +1965,12 @@ msgid ""
"Show<replaceable>DependencyType</replaceable></literal> e.g. <literal>APT::"
"Cache::ShowRecommends</literal>."
msgstr ""
-"Hace que <literal>depends</literal> y <literal>rdepends</literal> sean "
-"recursivos de modo que todos los paquetes mencionados se muestran sólo una "
-"vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>."
+"Por omisión, <literal>depends</literal> y <literal>rdepends</literal> "
+"muestran todas las dependencias. Este comportamiento se puede modificar con "
+"los siguientes parámetros, los cuales omitirán el tipo de dependencia "
+"especificado. Elemento de configuración: <literal>APT::Cache::"
+"Show<replaceable>Tipo-de Dependencia</replaceable></literal>. Por ejemplo, "
+"<literal>APT::Cache::ShowRecommends</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:326 apt-cdrom.8.xml:121 apt-get.8.xml:319
@@ -2232,13 +2221,6 @@ msgstr "add"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:66
-#, fuzzy
-#| msgid ""
-#| "<literal>add</literal> is used to add a new disc to the source list. It "
-#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
-#| "procceed to scan it and copy the index files. If the disc does not have a "
-#| "proper <filename>disk</filename> directory you will be prompted for a "
-#| "descriptive title."
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -2670,27 +2652,6 @@ msgstr "Herramienta para generar ficheros de índice"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#| "arg> <arg><option>-o <replaceable>config</"
-#| "replaceable>=<replaceable>string</replaceable></option></arg> "
-#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group "
-#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#| "replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -2714,22 +2675,23 @@ msgstr ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
+"arg> <arg><option>--arch <replaceable>arquitectura</replaceable></option></"
"arg> <arg><option>-o <replaceable>configuración</"
"replaceable>=<replaceable>cadena</replaceable></option></arg> <arg><option>-"
"c=<replaceable>fichero</replaceable></option></arg> <group choice=\"req\"> "
"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
-"replaceable></arg><arg><replaceable>alternativo</"
-"replaceable><arg><replaceable>prefijo-de-la-ruta</replaceable></arg></arg></"
-"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
-"replaceable></arg><arg><replaceable>alternativo</"
-"replaceable><arg><replaceable>prefijo-de-la-ruta</replaceable></arg></arg></"
-"arg> <arg>contents <arg choice=\"plain\"><replaceable>ruta</replaceable></"
-"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>ruta</"
-"replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-"\"><replaceable>fichero-de-configuración</replaceable></arg> <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>sección</replaceable></arg></arg> "
-"<arg>clean <arg choice=\"plain\"><replaceable>fichero-de-configuración</"
-"replaceable></arg></arg> </group>"
+"replaceable></arg><arg><replaceable>fichero-alternativo</"
+"replaceable><arg><replaceable>prefijo-ruta</replaceable></arg></arg></arg> "
+"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</"
+"replaceable></arg><arg><replaceable>fichero-alternativo</"
+"replaceable><arg><replaceable>prefijo-ruta</replaceable></arg></arg></arg> "
+"<arg>contents <arg choice=\"plain\"><replaceable>ruta</replaceable></arg></"
+"arg> <arg>release <arg choice=\"plain\"><replaceable>ruta</replaceable></"
+"arg></arg> <arg>generate <arg choice=\"plain\"><replaceable>fichero-"
+"configuración</replaceable></arg> <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>sección</replaceable></arg></arg> <arg>clean <arg choice="
+"\"plain\"><replaceable>fichero-configuración</replaceable></arg></arg> </"
+"group>"
#. type: Content of: <refentry><refsect1><para>
#: apt-ftparchive.1.xml:57
@@ -2875,16 +2837,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:119
-#, fuzzy
-#| msgid ""
-#| "Values for the additional metadata fields in the Release file are taken "
-#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
-#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
-#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
-#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-#| "<literal>Codename</literal>, <literal>Date</literal>, "
-#| "<literal>Architectures</literal>, <literal>Components</literal>, "
-#| "<literal>Description</literal>."
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2901,8 +2853,8 @@ msgstr ""
"literal>. Los campos permitidos son: <literal>Origin</literal>, "
"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</"
"literal>, <literal>Codename</literal>, <literal>Date</literal>, "
-"<literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal>."
+"<literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal> y <literal>Description</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:130
@@ -3132,23 +3084,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:229
-#, fuzzy
-#| msgid "Contents::Compress"
msgid "Translation::Compress"
-msgstr "Contents::Compress"
+msgstr "Translation::Compress"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:231
-#, fuzzy
-#| msgid ""
-#| "This is similar to <literal>Packages::Compress</literal> except that it "
-#| "controls the compression for the Contents files."
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Translation-en master file."
msgstr ""
"Esta opción es similar a <literal>Packages::Compress</literal> excepto que "
-"controla la compresión para los ficheros «Contents»."
+"controla la compresión para el fichero maestro Translation-en."
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:235
@@ -3183,10 +3129,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
-#, fuzzy
-#| msgid "Description"
msgid "LongDescription"
-msgstr "Descripción"
+msgstr "LongDescription"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
@@ -3194,6 +3138,9 @@ msgid ""
"Sets if long descriptions should be included in the Packages file or split "
"out into a master Translation-en file."
msgstr ""
+"Define si se deben incluir las descripciones largas en el fichero "
+"«Packages», o si se deben separar, guardándolo en el fichero «Translation-"
+"en»."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt-ftparchive.1.xml:257
@@ -3300,23 +3247,17 @@ msgstr "Sources"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:302
-#, fuzzy
-#| msgid ""
-#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
-#| "source/Sources</filename>"
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Define el fichero «Packages» de salida. El valor predeterminado es <filename>"
+"Define el fichero «Sources» de salida. El valor predeterminado es <filename>"
"$(DIST)/$(SECTION)/source/Sources</filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:306
-#, fuzzy
-#| msgid "Operation"
msgid "Translation"
-msgstr "Operación"
+msgstr "Translation"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:308
@@ -3325,6 +3266,10 @@ msgid ""
"should be not included in the Packages file. Defaults to <filename>$(DIST)/"
"$(SECTION)/i18n/Translation-en</filename>"
msgstr ""
+"Define el fichero maestro «Translation-en» que contiene las descripciones "
+"maestras en el caso de que no se deban incluir en el fichero «Packages». El "
+"valor predeterminado es <filename>$(DIST)/$(SECTION)/i18n/Translation-en</"
+"filename>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:313
@@ -3444,12 +3389,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:364
-#, fuzzy
-#| msgid ""
-#| "The <literal>Tree</literal> section takes a scope tag which sets the "
-#| "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
-#| "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a "
-#| "setting such as <filename>dists/woody</filename>."
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3459,7 +3398,7 @@ msgstr ""
"La sección <literal>Tree</literal> toma un ámbito de una etiqueta que define "
"la variable <literal>$(DIST)</literal> y la raíz del árbol (a la ruta se le "
"añade el prefijo <literal>ArchiveDir</literal>). Normalmente esto es un "
-"valor como <filename>dists/woody</filename>."
+"valor como <filename>dists/&stable-codename;</filename>."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:369
@@ -3474,34 +3413,28 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:375
-#, fuzzy, no-wrap
-#| msgid ""
-#| "for i in Sections do \n"
-#| " for j in Architectures do\n"
-#| " Generate for DIST=scope SECTION=i ARCH=j\n"
+#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
" "
msgstr ""
-"for i in Secciones do \n"
-" for j in Arquitecturas do\n"
+"for i in Sections do \n"
+" for j in Architectures do\n"
" Generar con DIST=scope SECTION=i ARCH=j\n"
+" "
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:372
-#, fuzzy
-#| msgid ""
-#| "When processing a <literal>Tree</literal> section <command>apt-"
-#| "ftparchive</command> performs an operation similar to:"
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
"\" id=\"0\"/>"
msgstr ""
"Cuando se procesa una sección <literal>Tree</literal> <command>apt-"
-"ftparchive</command> realiza una operación similar a la siguiente:"
+"ftparchive</command> realiza una operación similar a la siguiente: "
+"<placeholder type=\"programlisting\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:381
@@ -3855,36 +3788,27 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:574
-#, fuzzy
-#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
-msgstr "<option>-a</option>"
+msgstr "<option>--arch</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:575
-#, fuzzy
-#| msgid ""
-#| "If the command is either <literal>install</literal> or <literal>remove</"
-#| "literal>, then this option acts like running <literal>autoremove</"
-#| "literal> command, removing the unused dependency packages. Configuration "
-#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
"<literal>*_all.deb</literal> instead of all package files in the given "
"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>."
msgstr ""
-"Si la orden es <literal>install</literal> o <literal>remove</literal>, esta "
-"opción se ejecutará como <literal>autoremove</literal>, eliminando los "
-"paquetes que son dependencia de otro, pero que estén en desuso. Opción de "
-"configuración: <literal>APT::Get::AutomaticRemove</literal>."
+"Hace que las órdenes <literal>packages</literal> y <literal>contents</"
+"literal> sólo acepten aquellos paquetes que coinciden con <literal>*_arch."
+"deb</literal> o <literal>*_all.deb</literal>, en lugar de todos los ficheros "
+"de paquete en la ruta dada. Elemento de configuración: <literal>APT::"
+"FTPArchive::Architecture</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:581
-#, fuzzy
-#| msgid "<option>APT::FTPArchive::LongDescription</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
-msgstr "<option>APT::FTPArchive::LongDescription</option>"
+msgstr "<option>APT::FTPArchive::AlwaysStat</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:583
@@ -3899,6 +3823,16 @@ msgid ""
"theory nobody will have these problems and therefore all these extra checks "
"are useless."
msgstr ""
+"&apt-ftparchive; almacena tantos metadatos como sea posible en una base de "
+"datos de almacenamiento. Si los paquetes se recompilan o publican otra vez "
+"con la misma versión aparecerán problemas ya que se usarán los metadatos "
+"almacenados y ahora obsoletos tales como el tamaño o la suma de control. "
+"Esta situación se evitará si se activa esta opción ya que se comprobará si "
+"el fichero ha cambiado. Tenga en cuenta que esta opción está definida como "
+"«<literal>false</literal>» por omisión, ya que no se recomienda subir varias "
+"versiones o compilaciones de un paquete con el mismo número de versión, así "
+"que en teoría nadie debería tener problemas y por ello todas estas "
+"comprobaciones adicionales son innecesarias."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:593
@@ -3907,13 +3841,6 @@ msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:595
-#, fuzzy
-#| msgid ""
-#| "This configuration option defaults to \"<literal>true</literal>\" and "
-#| "should only be set to <literal>\"false\"</literal> if the Archive "
-#| "generated with &apt-ftparchive; also provides <filename>Translation</"
-#| "filename> files. Note that it is currently not possible to create these "
-#| "files with <command>apt-ftparchive</command>."
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -3925,8 +3852,8 @@ msgstr ""
"«<literal>true</literal>» y sólo se debería definir como «<literal>false</"
"literal>» si el archivo de paquetes generado con &apt-ftparchive; también "
"proporciona ficheros <filename>Translation</filename>. Tenga en cuenta que "
-"actualmente no es posible crear esos ficheros con <command>apt-ftparchive</"
-"command>."
+"el fichero maestro <filename>Translation-en</filename> sólo se puede crear "
+"con la orden «generate»."
#. type: Content of: <refentry><refsect1><title>
#: apt-ftparchive.1.xml:607 apt.conf.5.xml:1083 apt_preferences.5.xml:491
@@ -3981,41 +3908,6 @@ msgstr ""
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
-#| "choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
-#| "choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
-#| "choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> "
-#| "<group choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--"
-#| "help</arg> </group> </arg> </group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@ -4047,45 +3939,33 @@ msgstr ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>cadena-de-configuración</replaceable> </option> </"
"arg> <arg> <option>-c= <replaceable>fichero-de-configuración</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-"choice='plain'> <replaceable>nombre-de-la-versión-objetivo</replaceable> </"
-"arg> <arg choice='plain'> <replaceable>expresión-del-número-de-la-versión-"
-"objetivo</replaceable> </arg> <arg choice='plain'> <replaceable>nombre-en-"
-"código-de-la-versión-objetivo</replaceable> </arg> </group> </arg> <group "
-"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
+"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
+"<replaceable>nombre-de-la-versión-objetivo</replaceable> </arg> </arg> "
+"<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable> <arg> <group "
"choice='req'> <arg choice='plain'> =<replaceable>versión-del-paquete</"
"replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-de-la-versión-"
-"objetivo</replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-en-"
-"código-de-la-versión-objetivo</replaceable> </arg> </group> </arg> </arg> </"
-"arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
+"objetivo</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
+"choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>paquete</replaceable></arg></arg> <arg choice='plain'>purge "
"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></"
"arg></arg> <arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
"\"><replaceable>paquete</replaceable> <arg> <group choice='req'> <arg "
"choice='plain'> =<replaceable>versión-del-paquete</replaceable> </arg> <arg "
"choice='plain'> /<replaceable>nombre-de-la-versión-objetivo</replaceable> </"
-"arg> <arg choice='plain'> /<replaceable>nombre-en-código-de-la-versión-"
-"objetivo</replaceable> </arg> </group> </arg> </arg> </arg> <arg "
-"choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquete</replaceable></arg></arg> <arg choice='plain'>check</"
-"arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
-"<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
-"arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
-"choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </"
-"group>"
+"arg> </group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
+"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg></arg> <arg "
+"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
+"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
+"</group> </arg> </group>"
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:112
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library. Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic;, &gnome-apt; and &wajig;."
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -4096,7 +3976,7 @@ msgstr ""
"desde la línea de órdenes, y se puede considerar el sistema de «bajo nivel» "
"de otras herramientas de usuario que usan la biblioteca de APT. Existen "
"varias interfaces de «alto nivel», tales como &dselect;, &aptitude;, "
-"&synaptic;, &gnome-apt; y &wajig;."
+"&synaptic; y &wajig;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:121 apt-key.8.xml:124
@@ -4555,19 +4435,6 @@ msgstr "<option>--fix-broken</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:320
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. Any Package that are specified must "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations. "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4583,9 +4450,9 @@ msgid ""
msgstr ""
"Intenta arreglar un sistema con dependencias actualmente rotas. Si se usa "
"esta opción junto a «install»/«remove» se puede omitir cualquier paquete "
-"para permitir a APT deducir una posible solución. Cualquier paquete que se "
-"especifique debe corregir totalmente el problema. La opción, a veces, se "
-"necesita cuando se ejecuta apt por primera vez, APT no permite que existan "
+"para permitir a APT deducir una posible solución. Si se especifican "
+"problemas, deben corregir totalmente el problema. La opción, a veces, se "
+"necesita cuando se ejecuta APT por primera vez, APT no permite que existan "
"dependencias de paquetes rotas en un sistema. Es posible que la estructura "
"de dependencias de un sistema esté tan deteriorada que requiera una "
"intervención manual (generalmente puede ejecutar &dselect; o <command>dpkg --"
@@ -4862,29 +4729,21 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:433
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
msgid "<option>--only-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--only-upgrade</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:434
-#, 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>."
+"No instala paquetes nuevos. Cuando se usa junto a <literal>install</"
+"literal>, <literal>only-upgrade</literal> evita que se actualicen los "
+"paquetes listados en la línea de órdenes si no están ya instalados. Opción "
+"de configuración: <literal>APT::Get::Only-Upgrade</literal>."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:440
@@ -4941,13 +4800,6 @@ msgstr "<option>--purge</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:460
-#, fuzzy
-#| msgid ""
-#| "Use purge instead of remove for anything that would be removed. An "
-#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
-#| "to be purged. <option>remove --purge</option> is equivalent for "
-#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
-#| "Purge</literal>."
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. "
@@ -5225,19 +5077,16 @@ msgstr "Herramienta para gestionar las claves de APT"
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
-#, fuzzy
-#| msgid ""
-#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#| "option></arg>"
msgid ""
"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
-"<command>apt-key</command> <arg><replaceable>orden</replaceable>/</arg> <arg "
-"rep=\"repeat\"><option><replaceable>argumentos</replaceable></option></arg>"
+"<command>apt-key</command> <arg><option>--keyring <replaceable>nombre-de-"
+"fichero</replaceable></option></arg> <arg><replaceable>orden</replaceable></"
+"arg> <arg rep=\"repeat\"><option><replaceable>argumentis</replaceable></"
+"option></arg>"
#. type: Content of: <refentry><refsect1><para>
#: apt-key.8.xml:37
@@ -5353,13 +5202,13 @@ msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
+"Tenga en cuenta que las opciones se deben definir antes de las órdenes "
+"descritas en el sección anterior."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:142
-#, fuzzy
-#| msgid "add <replaceable>filename</replaceable>"
msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "add <replaceable>nombre-de-fichero</replaceable>"
+msgstr "--keyring <replaceable>nombre-de-fichero</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:143
@@ -5371,11 +5220,17 @@ msgid ""
"filename> is the primary keyring which means that e.g. new keys are added to "
"this one."
msgstr ""
+"Con esta opción es posible definir un fichero de registro de claves "
+"específico con el que la orden debería operar. El valor predeterminado es "
+"que la orden se ejecuta con el fichero <filename>trusted.gpg</filename> así "
+"como con los fragmentos en el directorio <filename>trusted.gpg.d</filename>, "
+"aunque <filename>trusted.gpg</filename> es el registro de claves principal, "
+"esto es, por ejemplo, que las claves nuevas se añaden a este fichero."
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-key.8.xml:156
msgid "&file-trustedgpg;"
-msgstr ""
+msgstr "&file-trustedgpg;"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:158
@@ -5586,7 +5441,7 @@ msgstr "Muestra la versión del programa."
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-mark.8.xml:124
msgid " &file-extended_states;"
-msgstr ""
+msgstr " &file-extended_states;"
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:129
@@ -5985,12 +5840,6 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>18 September 2009</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -6000,7 +5849,7 @@ msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Documentación inicial de "
"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>18 de Septiembre de 2009</date>"
+"&apt-product; <date>16 de Enero de 2009</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt.conf.5.xml:28 apt.conf.5.xml:35
@@ -6025,6 +5874,11 @@ msgid ""
"made. All tools therefore share the configuration files and also use a "
"common command line parser to provide a uniform environment."
msgstr ""
+"<filename>apt.conf</filename> es el fichero de configuración principal del "
+"conjunto de herramientas APT, pero no es ni mucho menos donde se pueden "
+"ubicar cambios a las opciones. Por ello, todas las herramientas comparten "
+"los ficheros de configuración y también usan un analizador de línea de "
+"órdenes común para ofrecer un entorno uniforme."
#. type: Content of: <refentry><refsect1><orderedlist><para>
#: apt.conf.5.xml:45
@@ -6032,6 +5886,8 @@ msgid ""
"When an APT tool starts up it will read the configuration files in the "
"following order:"
msgstr ""
+"Cuando se inicia una herramienta de APT, leerá los ficheros de configuración "
+"en el siguiente orden:"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:47
@@ -6039,6 +5895,8 @@ msgid ""
"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
"any)"
msgstr ""
+"El fichero definido por la variable de entorno <envar>APT_CONFIG</envar> (de "
+"existir)."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:49
@@ -6048,12 +5906,19 @@ msgid ""
"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
"characters - otherwise they will be silently ignored."
msgstr ""
+"Todos los ficheros en <literal>Dir::Etc::Parts</literal> en orden "
+"alfanumérico ascendente que no tienen extensión o la extensión "
+"«<literal>conf</literal>», y que sólo contiene caracteres alfanuméricos, "
+"guiones (-), y guión bajo (_) y punto (.). De otra forma, se ignorarán "
+"silenciosamente."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:54
msgid ""
"the main configuration file specified by <literal>Dir::Etc::main</literal>"
msgstr ""
+"El fichero de configuración principal definido por <literal>Dir::Etc::main</"
+"literal>."
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:56
@@ -6061,11 +5926,13 @@ msgid ""
"the command line options are applied to override the configuration "
"directives or to load even more configuration files."
msgstr ""
+"Las opciones de línea de órdenes se aplican para anular directivas de "
+"configuración o para cargar más ficheros de configuración."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:60
msgid "Syntax"
-msgstr ""
+msgstr "Sintaxis"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:61
@@ -6301,12 +6168,6 @@ msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:153
-#, fuzzy
-#| msgid ""
-#| "Default release to install packages from if more than one version "
-#| "available. Contains release name, codename or release version. Examples: "
-#| "'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See "
-#| "also &apt-preferences;."
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -6316,8 +6177,8 @@ msgstr ""
"La versión predeterminada de la que se instalarán los paquetes, si hay más "
"de una versión disponible. Contiene el nombre de la versión, ya sea el "
"nombre en código o el número de la versión. Por ejemplo: «stable», "
-"«testing», «unstable», «lenny», «squeeze», «4.0», «5.0*». Vea también &apt-"
-"preferences;."
+"«testing», «unstable», «&stable-codename;», «&testing-codename;», «4.0», "
+"«5.0*». Vea también &apt-preferences;."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:158
@@ -6359,37 +6220,6 @@ msgstr "Immediate-Configure"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:171
-#, fuzzy
-#| msgid ""
-#| "Defaults to on which will cause APT to install essential and important "
-#| "packages as fast as possible in the install/upgrade operation. This is "
-#| "done to limit the effect of a failing &dpkg; call: If this option is "
-#| "disabled APT does treat an important package in the same way as an extra "
-#| "package: Between the unpacking of the important package A and his "
-#| "configuration can then be many other unpack or configuration calls, e.g. "
-#| "for package B which has no relation to A, but causes the dpkg call to "
-#| "fail (e.g. because maintainer script of package B generates an error) "
-#| "which results in a system state in which package A is unpacked but "
-#| "unconfigured - each package depending on A is now no longer guaranteed to "
-#| "work as their dependency on A is not longer satisfied. The immediate "
-#| "configuration marker is also applied to all dependencies which can "
-#| "generate a problem if the dependencies e.g. form a circle as a dependency "
-#| "with the immediate flag is comparable with a Pre-Dependency. So in theory "
-#| "it is possible that APT encounters a situation in which it is unable to "
-#| "perform immediate configuration, error out and refers to this option so "
-#| "the user can deactivate the immediate configuration temporary to be able "
-#| "to perform an install/upgrade again. Note the use of the word \"theory\" "
-#| "here as this problem was only encountered by now in real world a few "
-#| "times in non-stable distribution versions and caused by wrong "
-#| "dependencies of the package in question or by a system in an already "
-#| "broken state, so you should not blindly disable this option as the "
-#| "mentioned scenario above is not the only problem immediate configuration "
-#| "can help to prevent in the first place. Before a big operation like "
-#| "<literal>dist-upgrade</literal> is run with this option disabled it "
-#| "should be tried to explicitly <literal>install</literal> the package APT "
-#| "is unable to configure immediately, but please make sure to report your "
-#| "problem also to your distribution and to the APT team with the buglink "
-#| "below so they can work on improving or correcting the upgrade process."
msgid ""
"Defaults to on which will cause APT to install essential and important "
"packages as fast as possible in the install/upgrade operation. This is done "
@@ -6437,7 +6267,7 @@ msgstr ""
"configuración inmediata, lo cual lo califica casi como Pre-Dependencia. Así, "
"en teoría es posible que APT encuentre una situación en la que es incapaz de "
"llevar a cabo una configuración inmediata, devuelva un error y mencione esta "
-"opción para que así el usuario puede desactivar la configuración inmediata "
+"opción para que así el usuario pueda desactivar la configuración inmediata "
"temporalmente para llevar a cabo una vez más la instalación y/o "
"actualización. Observe el uso de la expresión «en teoría», ya que esta "
"situación sólo se ha visto algunas veces con versiones de distribución no "
@@ -6446,10 +6276,10 @@ msgstr ""
"opción ya que la situación mencionada anteriormente no es el único problema "
"que la configuración inmediata puede resolver. Antes de llevar a cabo una "
"operación grande como <literal>dist-upgrade</literal> con esta opción "
-"desactivada debería intentar un <literal>install</literal> explícito con el "
-"paquete que APT es incapaz de configurar inmediatamente, pero asegúrese de "
-"informar del fallo a su distribución y al equipo de APT mediante el enlace a "
-"informes de fallo para que así puedan mejorar o corregir el proceso de "
+"desactivada debería intentar un <literal>install</literal> con el paquete "
+"que APT es incapaz de configurar inmediatamente, pero asegúrese de informar "
+"del fallo a su distribución y al equipo de APT mediante el enlace a informes "
+"de fallo a continuación para que así puedan mejorar o corregir el proceso de "
"actualización."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -6477,7 +6307,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:202
msgid "Cache-Start, Cache-Grow and Cache-Limit"
-msgstr ""
+msgstr "Cache-Start, Cache-Grow y Cache-Limit"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:203
@@ -6498,6 +6328,23 @@ msgid ""
"literal> is 0 which stands for no limit. If <literal>Cache-Grow</literal> "
"is set to 0 the automatic grow of the cache is disabled."
msgstr ""
+"A partir de la versión 0.7.26, APT usa un fichero de caché mapeado («mapped "
+"cache file») redimensionable para almacenar la información disponible. "
+"<literal>Cache-Start</literal> actúa como una indicación del tamaño que el "
+"caché alcanzará y por ello es la cantidad de memoria que APT solicitará al "
+"iniciarse. El valor predeterminado es 20971520 bytes (~20 MB). Tenga en "
+"cuenta que esta cantidad de espacio debe estar disponible para APT, o "
+"fallará. Por ello, este valor se debería disminuir para los dispositivos con "
+"memoria restringida, mientras que se debería aumentar en sistemas con varias "
+"fuentes configuradas. <literal>Cache-Grow</literal> define en bytes, con el "
+"valor predeterminado de 1048576 (~1 MB) cuánto se aumentará el caché en el "
+"caso de que el espacio definido por <literal>Cache-Start</literal> no sea "
+"suficiente. Este valor se aplicará repetidamente hasta que el caché sea "
+"suficientemente grande para almacenar toda la información o si el caché "
+"alcanza <literal>Cache-Limit</literal>. El valor predeterminado de "
+"<literal>Cache-Limit</literal> es cero, esto es, ilimitado. Si define "
+"<literal>Cache-Grow</literal> con un valor de cero se desactivará el "
+"crecimiento automático del cache."
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:218
@@ -6560,7 +6407,7 @@ msgstr "El grupo Acquire"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:244
msgid "Check-Valid-Until"
-msgstr ""
+msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:245
@@ -6573,11 +6420,19 @@ msgid ""
"header, but if they don't or a stricter value is volitional the following "
"<literal>Max-ValidTime</literal> option can be used."
msgstr ""
+"Opción relacionada con la seguridad, cuyo valor predeterminado de «true», ya "
+"que una validación temporal para un fichero «Release» evita ataques "
+"«longtime replay» y puede, por ejemplo, ayudar a identificar las réplicas no "
+"actualizadas, aunque esta función depende de la corrección de la hora del "
+"sistema del usuario. Se recomienda a los responsables de archivos que creen "
+"ficheros «Release» con la cabecera <literal>Valid-Until</literal>, pero si "
+"se hace, o si un valor más estricto es opcional, se puede usar la opción "
+"<literal>Max-ValidTime</literal>."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:255
msgid "Max-ValidTime"
-msgstr ""
+msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:256
@@ -6592,6 +6447,17 @@ msgid ""
"settings can be made by appending the label of the archive to the option "
"name."
msgstr ""
+"Los segundos que el fichero «Release» se considerará válido después de su "
+"creación. El valor predeterminado es «para siempre» (cero) si el fichero "
+"«Release» del archivo no incluye una cabecera <literal>Valid-Until</"
+"literal>. Si lo incluye, el valor predeterminado es esta fecha. La fecha del "
+"fichero «Release» o la fecha definida por la hora de creación del fichero "
+"«Release» (cabecera <literal>Date</literal>), a lo que se añaden los "
+"segundos definidos con estas opciones, se usan para comprobar si la validez "
+"de un fichero a expirado, usando la fecha más antigua de las dos "
+"anteriormente mencionadas. Se pueden definir opciones de configuración "
+"específicas al archivo añadiendo la etiqueta del archivo al nombre de la "
+"opción."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:268
@@ -6618,6 +6484,12 @@ msgid ""
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
+"Se ofrecen dos opciones secundarias para limitar el uso de «PDiffs»: "
+"<literal>FileLimit</literal> permite definir cuántos ficheros «PDiff» como "
+"máximo se descargarán para parchear un fichero. Por otra parte, "
+"<literal>SizeLimit</literal> es el porcentaje de tamaño máximo de todos los "
+"parches comparados con el tamaño del fichero destino. Si se supera uno de "
+"estos límites, se descargará el fichero completo en lugar de los parches."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:281
@@ -7087,7 +6959,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:450
msgid "GzipIndexes"
-msgstr ""
+msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:452
@@ -7097,6 +6969,11 @@ msgid ""
"unpacking them. This saves quite a lot of disk space at the expense of more "
"CPU requirements when building the local package caches. False by default."
msgstr ""
+"Al descargar ficheros de índice comprimidos con <literal>gzip</literal>, "
+"(«Packages», «Sources», o «Translations»), los mantiene comprimidos "
+"localmente en lugar de desempaquetarlos. Esto ahorra mucho espacio en disco "
+"a costa de mayores requerimientos del procesador al generar los almacenes de "
+"paquetes locales. El valor predeterminado es «false»."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:459
@@ -7105,16 +6982,6 @@ msgstr "Languages"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:460
-#, fuzzy
-#| msgid ""
-#| "The Languages subsection controls which <filename>Translation</filename> "
-#| "files are downloaded and in which order APT tries to display the "
-#| "Description-Translations. APT will try to display the first available "
-#| "Description for the Language which is listed at first. Languages can be "
-#| "defined with their short or long Languagecodes. Note that not all "
-#| "archives provide <filename>Translation</filename> files for every "
-#| "Language - especially the long Languagecodes are rare, so please inform "
-#| "you which ones are available before you set here impossible values."
msgid ""
"The Languages subsection controls which <filename>Translation</filename> "
"files are downloaded and in which order APT tries to display the Description-"
@@ -7127,7 +6994,7 @@ msgid ""
msgstr ""
"La subsección «Languages» controla qué ficheros <filename>Translation</"
"filename> se descargan y en qué orden APT intentará mostrar las traducciones "
-"de la descripción. APT intentará mostrar la primera descripción del idioma "
+"de la descripción. APT intentará mostrar la primera descripción en el idioma "
"que esté primero en la lista. Los idiomas se pueden definir con sus códigos "
"de idioma cortos o largos. Tenga en cuenta que no todos los archivos de "
"paquetes proporcionan ficheros <filename>Translation</filename> para cada "
@@ -7142,26 +7009,6 @@ msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\";
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:466
-#, fuzzy
-#| msgid ""
-#| "The default list includes \"environment\" and \"en\". "
-#| "\"<literal>environment</literal>\" has a special meaning here: It will be "
-#| "replaced at runtime with the languagecodes extracted from the "
-#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure "
-#| "that these codes are not included twice in the list. If "
-#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the "
-#| "<filename>Translation-en</filename> file (if available) will be used. To "
-#| "force apt to use no Translation file use the setting <literal>Acquire::"
-#| "Languages=none</literal>. \"<literal>none</literal>\" is another special "
-#| "meaning code which will stop the search for a fitting "
-#| "<filename>Translation</filename> file. This can be used by the system "
-#| "administrator to let APT know that it should download also this files "
-#| "without actually use them if not the environment specifies this "
-#| "languages. So the following example configuration will result in the "
-#| "order \"en, de\" in an english and in \"de, en\" in a german "
-#| "localization. Note that \"fr\" is downloaded, but not used if APT is not "
-#| "used in a french localization, in such an environment the order would be "
-#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The default list includes \"environment\" and \"en\". "
"\"<literal>environment</literal>\" has a special meaning here: It will be "
@@ -7187,19 +7034,20 @@ msgstr ""
"ejecución con los códigos de idioma extraídos de la variable de entorno "
"<literal>LC_MESSAGES</literal>. También se asegurará de que estos códigos no "
"se incluyan dos veces en la lista. Si <literal>LC_MESSAGES</literal> está "
-"definida con «C» sólo se usará el fichero <filename>Translation-en</"
+"definida como «C» sólo se usará el fichero <filename>Translation-en</"
"filename> (si está disponible). Puede usar la opción <literal>Acquire::"
"Languages=none</literal> para forzar apt a que no use ficheros "
"«Translation» . «<literal>none</literal>» es otro código especial que "
"significa que detendrá la búsqueda de un fichero <filename>Translation</"
"filename> adecuado. El administrador del sistema puede usar esto para "
"permitir que APT sepa que debería descargar estos ficheros sin tener que "
-"usarlos si no se definen en «environment». De modo que la siguiente "
-"configuración de ejemplo resultará en el orden «en, de» en una localización "
-"inglesa y «de, en» en una localización alemana. Tenga en cuenta que «fr» se "
-"descargará, pero no se usará si APT no se usa en una localización francesa "
-"de modo que la orden en este entorno («environment») sería «fr, de, en». "
-"<placeholder type=\"programlisting\" id=\"0\"/>"
+"usarlos si no se definen con «environment». De modo que el siguiente ejemplo "
+"de configuración resultará en el orden «en, de» en una configuración "
+"regional inglesa y «de, en» en una configuración regional alemana. Tenga en "
+"cuenta que «fr» se descargará, pero no se usará si APT no se usa con una "
+"configuración regional francesa, de modo que la orden en este entorno "
+"(«environment») sería «fr, de, en». <placeholder type=\"programlisting\" id="
+"\"0\"/>"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:240
@@ -7332,6 +7180,13 @@ msgid ""
"z]+</literal> is silently ignored. As seen in the last default value these "
"patterns can use regular expression syntax."
msgstr ""
+"La lista <literal>Ignore-Files-Silently</literal> se puede usar para definir "
+"qué fichero debería ignorar APT silenciosamente al analizar ficheros en los "
+"directorios de fragmentos. Por omisión, se ignora silenciosamente un fichero "
+"que termina con <literal>.disabled</literal>, <literal>~</literal>, "
+"<literal>.bak</literal> o <literal>.dpkg-[a-z]+</literal>. Como se puede ver "
+"con el último valor predeterminado, estos patrones pueden usar la sintaxis "
+"de expresiones regulares."
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:541
@@ -8275,12 +8130,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-#, fuzzy
-#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
msgid ""
"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
msgstr ""
-"&apt-author.team; &apt-email; &apt-product; <date>4 de Mayo 2009</date>"
+"&apt-author.team; &apt-email; &apt-product; <date>16 de Febrero 2010</date>"
#. type: Content of: <refentry><refnamediv><refname>
#: apt_preferences.5.xml:21 apt_preferences.5.xml:28
@@ -8355,6 +8208,16 @@ msgid ""
"expected in older or newer releases or together with other packages from "
"different releases. You have been warned."
msgstr ""
+"Las preferencias («preferences») son un gran poder en las manos de un "
+"administrador de sistemas, ¡pero también se pueden convertir en su mayor "
+"pesadilla si se usan sin cuidado! APT no se cuestionará si las preferencias "
+"contienen opciones erróneas, y por ello puede llevar a paquetes no "
+"instalables o tomar decisiones erróneas al actualizar paquetes. Pueden "
+"surgir más problemas si se mezclan varias publicaciones de distribución sin "
+"un correcto entendimiento de los siguientes párrafos. Los paquetes incluidos "
+"en una distribución específica no se revisan en combinación con otras "
+"distribuciones más antiguas o más recientes, y puede que no funcionen como "
+"esperado. Queda avisado."
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:67
@@ -8366,6 +8229,12 @@ msgid ""
"underscore (_) and period (.) characters - otherwise they will be silently "
"ignored."
msgstr ""
+"Tenga en cuenta los ficheros en el directorio <filename>/etc/apt/preferences."
+"d</filename> se analizan en orden alfanumérico ascendente y deben seguir las "
+"convenciones de nombre a continuación: Los ficheros no tienen extensión o la "
+"extensión «<literal>pref</literal>» y sólo deben contener caracteres "
+"alfanuméricos, guión (-), guión bajo (_) y punto (.). De no ser así, se "
+"ignorarán silenciosamente."
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:74
@@ -8414,10 +8283,8 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:101
-#, fuzzy
-#| msgid "priority 100"
msgid "priority 1"
-msgstr "prioridad 100"
+msgstr "priority 1"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:102
@@ -8426,6 +8293,9 @@ msgid ""
"filename> files are marked as \"NotAutomatic: yes\" like the debian "
"experimental archive."
msgstr ""
+"para las versiones procedentes de archivos que en sus ficheros "
+"<filename>Release</filename> están marcados como «NotAutomatic:yes», como en "
+"el archivo «experimental» de Debian."
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:107
@@ -8477,11 +8347,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:123
-#, fuzzy
-#| msgid ""
-#| "If the target release has not been specified then APT simply assigns "
-#| "priority 100 to all installed package versions and priority 500 to all "
-#| "uninstalled package versions."
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 "
@@ -8491,7 +8356,9 @@ msgid ""
msgstr ""
"Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a "
"todas las versiones de los paquetes instalados y 500 a las versiones no "
-"instaladas de paquetes."
+"instaladas de paquetes. Las versiones procedentes de archivos que en sus "
+"ficheros <filename>Release</filename> están marcados como «NotAutomatic:yes» "
+"- estas versiones reciben la prioridad 1."
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:129
@@ -8684,32 +8551,26 @@ msgid ""
"high priority to all versions available from the server identified by the "
"hostname \"ftp.de.debian.org\""
msgstr ""
+"Una nota de aviso: la palabra clave usada aquí es «<literal>origin</"
+"literal>», el cual se puede usar para coincidir con un nombre de sistema. El "
+"siguiente registro asignará una prioridad alta a todas las versiones "
+"disponibles desde el servidor identificado con el nombre de sistema «ftp.de."
+"debian.org»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:210
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: origin \"\"\n"
-#| "Pin-Priority: 999\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: origin \"ftp.de.debian.org\"\n"
"Pin-Priority: 999\n"
msgstr ""
"Package: *\n"
-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
"Pin-Priority: 999\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:214
-#, fuzzy
-#| 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 in a <filename>Release</filename> file. What follows the "
-#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
-#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -8717,12 +8578,11 @@ msgid ""
"Internet address but an author or vendor name, such as \"Debian\" or \"Ximian"
"\"."
msgstr ""
-"Aviso: la palabra clave usada aquí es «<literal>origin</literal>». No se "
-"debe confundir con el origen («Origin:») de una distribución tal y como se "
-"especifica en el fichero <filename>Release</filename>. Lo que sigue a la "
-"etiqueta «Origin:» en un fichero <filename>Release</filename> no es la "
-"dirección de un sitio de Internet, sino el autor o el nombre del proveedor, "
-"tales como «Debian» o «Ximian»."
+"<emphasis>No</emphasis> se debe confundir con el origen («Origin») de una "
+"distribución tal y como se especifica un fichero <filename>Release</"
+"filename>. Lo que sigue a la etiqueta «Origin:» en un fichero "
+"<filename>Release</filename> no es la dirección de un sitio de Internet, "
+"sino el autor o el nombre del proveedor, tales como «Debian» o «Ximian»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:219
@@ -8749,11 +8609,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:228
-#, fuzzy
-#| msgid ""
-#| "The following record assigns a high priority to all package versions "
-#| "belonging to any distribution whose Codename is \"<literal>squeeze</"
-#| "literal>\"."
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -8761,22 +8616,18 @@ msgid ""
msgstr ""
"El siguiente registro asigna una prioridad alta a todas las versiones de los "
"paquetes pertenecientes a cualquier distribución que tenga como nombre clave "
-"«<literal>squeeze</literal>»."
+"«<literal>&testing-codename;</literal>»."
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting>
#: apt_preferences.5.xml:232
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
msgstr ""
"Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -9087,14 +8938,6 @@ msgstr "La línea <literal>Codename:</literal>"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:392
-#, fuzzy
-#| 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 packages in the directory tree below the parent of the "
-#| "<filename>Release</filename> file belong to a version named "
-#| "<literal>squeeze</literal>. Specifying this value in the APT preferences "
-#| "file would require the line:"
msgid ""
"names the codename to which all the packages in the directory tree belong. "
"For example, the line \"Codename: &testing-codename;\" specifies that all of "
@@ -9104,19 +8947,19 @@ msgid ""
"preferences file would require the line:"
msgstr ""
"indica el nombre de la distribución a la que pertenecen todos los paquetes "
-"del árbol de directorios. Por ejemplo, la línea «Codename: squeeze» "
-"especifica que todos los paquetes en el árbol de directorios por debajo del "
-"directorio padre marcado en el fichero <filename>Release</filename> "
-"pertenecen a la versión llamada <literal>squeeze</literal>. Para especificar "
-"una preferencia de acuerdo con este parámetro tendrá que poner una de las "
-"siguientes líneas en el fichero de preferencias de APT:"
+"del árbol de directorios. Por ejemplo, la línea «Codename: &testing-"
+"codename;» especifica que todos los paquetes en el árbol de directorios por "
+"debajo del directorio padre marcado en el fichero <filename>Release</"
+"filename> pertenecen a la versión llamada <literal>&testing-codename;</"
+"literal>. Para especificar una preferencia de acuerdo con este parámetro "
+"tendrá que poner una de las 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:401
-#, fuzzy, no-wrap
-#| msgid "Pin: release a=stable\n"
+#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release a=stable\n"
+msgstr "Pin: release n=&testing-codename;\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:408
@@ -9226,17 +9069,6 @@ msgstr "Pin: release l=Debian\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:363
-#, fuzzy
-#| msgid ""
-#| "The <filename>Release</filename> file is normally found in the directory "
-#| "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
-#| "example, <filename>.../dists/stable/Release</filename>, or <filename>.../"
-#| "dists/woody/Release</filename>. It consists of a single multi-line "
-#| "record which applies to <emphasis>all</emphasis> of the packages in the "
-#| "directory tree below its parent. Unlike the <filename>Packages</"
-#| "filename> file, nearly all of the lines in a <filename>Release</filename> "
-#| "file are relevant for setting APT priorities: <placeholder type="
-#| "\"variablelist\" id=\"0\"/>"
msgid ""
"The <filename>Release</filename> file is normally found in the directory "
"<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for "
@@ -9251,12 +9083,12 @@ msgstr ""
"El fichero <filename>Release</filename> se suele encontrar en el directorio "
"<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por "
"ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/"
-"woody/Release</filename>. El fichero consiste en registros de una sola línea "
-"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\"/>"
+"&stable-codename;/Release</filename>. El fichero consiste en registros de "
+"una sola línea 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\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:469
@@ -9484,22 +9316,7 @@ msgstr "Seguir la evolución de una publicación por el nombre"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:600
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
-#| "\n"
-#| "Explanation: Debian unstable is always codenamed with sid\n"
-#| "Package: *\n"
-#| "Pin: release a=sid\n"
-#| "Pin-Priority: 800\n"
-#| "\n"
-#| "Package: *\n"
-#| "Pin: release o=Debian\n"
-#| "Pin-Priority: -10\n"
+#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
@@ -9519,12 +9336,12 @@ msgstr ""
"Explanation: Eliminar o no instalar cualquier paquete de Debian cuya versión sea\n"
"Explanation: distinta a aquellos en las distribuciones de nombre squeeze o sid\n"
"Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
"\n"
-"Explanation: El nombre clave de Debian unstable siempre es sid\n"
+"Explanation: El nombre clave de Debian «unstable» siempre es sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -9560,12 +9377,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:617
-#, fuzzy
-#| 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 the release codenamed with <literal>squeeze</literal>. "
-#| "<placeholder type=\"programlisting\" id=\"0\"/>"
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 "
@@ -9575,7 +9386,8 @@ msgstr ""
"Con un fichero «&sources-list;» adecuado y el fichero de preferencias "
"mostrado anteriormente, cualquiera de las siguientes órdenes provocará que "
"APT actualice los paquetes a la última versión de la distribución llamada "
-"<literal>squeeze</literal>. <placeholder type=\"programlisting\" id=\"0\"/>"
+"<literal>&testing-codename;</literal>. <placeholder type=\"programlisting\" "
+"id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:637
@@ -9585,15 +9397,6 @@ msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:628
-#, fuzzy
-#| msgid ""
-#| "The following command will cause APT to upgrade the specified package to "
-#| "the latest version from the <literal>sid</literal> distribution. "
-#| "Thereafter, <command>apt-get upgrade</command> will upgrade the package "
-#| "to the most recent <literal>squeeze</literal> version if that is more "
-#| "recent than the installed version, otherwise, to the most recent "
-#| "<literal>sid</literal> version if that is more recent than the installed "
-#| "version. <placeholder type=\"programlisting\" id=\"0\"/>"
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>sid</literal> distribution. Thereafter, "
@@ -9606,8 +9409,8 @@ msgstr ""
"La siguiente orden hace que APT actualice un determinado paquete a la última "
"versión de la distribución <literal>sid</literal>. Más tarde, <command>apt-"
"get upgrade</command> actualizará el paquete a la última versión de la "
-"distribución<literal>squeeze</literal> si es más reciente que la versión "
-"instalada. De otro modo, se instalará la versión más reciente de la "
+"distribución<literal>&testing-codename;</literal> si es más reciente que la "
+"versión instalada. De otro modo, se instalará la versión más reciente de la "
"distribución <literal>sid</literal> si es más reciente que la versión "
"instalada. <placeholder type=\"programlisting\" id=\"0\"/>"
@@ -9818,18 +9621,14 @@ msgstr "Algunos ejemplos:"
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
-#| " "
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
msgstr ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
#. type: Content of: <refentry><refsect1><title>
@@ -9942,23 +9741,11 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
-#, fuzzy
-#| msgid "more recongnizable URI types"
msgid "more recognizable URI types"
msgstr "Otros tipos de URI reconocidos."
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
-#, fuzzy
-#| msgid ""
-#| "APT can be extended with more methods shipped in other optional packages "
-#| "which should follow the nameing scheme <literal>apt-transport-"
-#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain "
-#| "also the <literal>apt-transport-https</literal> package which provides "
-#| "access methods for https-URIs with features similiar to the http method, "
-#| "but other methods for using e.g. debtorrent are also available, see "
-#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</"
-#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>."
msgid ""
"APT can be extended with more methods shipped in other optional packages "
"which should follow the nameing scheme <literal>apt-transport-"
@@ -10042,23 +9829,18 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:208
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the stable/contrib area."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
"Usa FTP para acceder al archivo de Debian en «ftp.debian.org», debajo del "
-"directorio «debian», y usa sólo la sección «stable/contrib»."
+"directorio «debian», y usa sólo la sección «&stable-codename;/contrib»."
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:210
-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:212
@@ -10238,13 +10020,6 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:63
-#, fuzzy
-#| msgid ""
-#| "For instance, mailcrypt is an emacs extension that aids in encrypting "
-#| "email with GPG. Without GPGP installed mail-crypt is useless, so "
-#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs "
-#| "extension it has a simple dependency on emacs, without emacs it is "
-#| "completely useless."
msgid ""
"For instance, mailcrypt is an emacs extension that aids in encrypting email "
"with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a "
@@ -10469,17 +10244,6 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:184
-#, fuzzy
-#| msgid ""
-#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</"
-#| "prgn> and then choose the APT method. You will be prompted for a set of "
-#| "<em>Sources</em> which are places to fetch archives from. These can be "
-#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can "
-#| "provide a fragment of the total Debian archive, APT will automatically "
-#| "combine them to form a complete set of packages. If you have a CDROM then "
-#| "it is a good idea to specify it first and then specify a mirror so that "
-#| "you have access to the latest bug fixes. APT will automatically use "
-#| "packages on your CDROM before downloading from the Internet."
msgid ""
"To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> "
"and then choose the APT method. You will be prompted for a set of "
@@ -10616,13 +10380,6 @@ msgstr ""
#. type: <p></p>
#: guide.sgml:247
-#, fuzzy
-#| msgid ""
-#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the "
-#| "available list by selecting [U]pdate from the menu. This is a super-set "
-#| "of <tt>apt-get update</tt> that makes the fetched information available "
-#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get "
-#| "update</tt> has been run before."
msgid ""
"Before starting to use <prgn>dselect</prgn> it is necessary to update the "
"available list by selecting [U]pdate from the menu. This is a superset of "
@@ -10631,8 +10388,8 @@ msgid ""
"tt> has been run before."
msgstr ""
"Es necesario actualizar la lista disponible mediante el elemento de menú [A]"
-"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un super-conjunto "
-"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
+"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un superconjunto de "
+"<tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la "
"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado "
"<tt>apt-get update</tt> con anterioridad."
@@ -11311,12 +11068,6 @@ msgstr ""
#. type: <p></p>
#: offline.sgml:57
-#, fuzzy
-#| msgid ""
-#| "This is achieved by creatively manipulating the APT configuration file. "
-#| "The essential premis to tell APT to look on a disc for it's archive "
-#| "files. Note that the disc should be formated with a filesystem that can "
-#| "handle long file names such as ext2, fat32 or vfat."
msgid ""
"This is achieved by creatively manipulating the APT configuration file. The "
"essential premise to tell APT to look on a disc for it's archive files. Note "
@@ -11465,13 +11216,6 @@ msgstr ""
#. type: <p><example>
#: offline.sgml:136
-#, fuzzy
-#| msgid ""
-#| "On the target machine the first thing to do is mount the disc and copy "
-#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the "
-#| "directories outlined in the Overview, <em>archives/partial/</em> and "
-#| "<em>lists/partial/</em> Then take the disc to the remote machine and "
-#| "configure the sources.list. On the remote machine execute the following:"
msgid ""
"On the target machine the first thing to do is mount the disc and copy <em>/"
"var/lib/dpkg/status</em> to it. You will also need to create the directories "
@@ -11482,8 +11226,8 @@ msgstr ""
"Lo primero que debe hacer en el sistema destino es montar el disco y guardar "
"en él una copia de <em>/var/lib/dpkg/status</em>. También debe crear los "
"directorios definidos en el Resumen, <em>archives/partial/</em> y <em>lists/"
-"partial/</em>. Lleve el disco hasta el sistema remoto y configure «sources."
-"list». Ejecute lo siguiente en el sistema remoto:"
+"partial/</em>. Después, lleve el disco hasta el sistema remoto y configure "
+"«sources.list». Ejecute lo siguiente en el sistema remoto:"
#. type: <example></example>
#: offline.sgml:142
@@ -11504,12 +11248,6 @@ msgstr ""
#. type: </example></p>
#: offline.sgml:149
-#, fuzzy
-#| msgid ""
-#| "The dist-upgrade command can be replaced with any-other standard APT "
-#| "commands, particularly dselect-upgrade. You can even use an APT front end "
-#| "such as <em>dselect</em> However this presents a problem in communicating "
-#| "your selections back to the local computer."
msgid ""
"The dist-upgrade command can be replaced with any other standard APT "
"commands, particularly dselect-upgrade. You can even use an APT front end "
diff --git a/doc/po/fr.po b/doc/po/fr.po
index 43f8b87ee..caa6f5fb1 100644
--- a/doc/po/fr.po
+++ b/doc/po/fr.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"POT-Creation-Date: 2010-08-23 18:46-0300\n"
-"PO-Revision-Date: 2010-08-23 14:04-0400\n"
+"PO-Revision-Date: 2010-08-31 07:24+0200\n"
"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
"Language: \n"
@@ -1153,7 +1153,7 @@ msgstr ""
"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
"ENTITY testing-codename \"squeeze\">"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13
#: apt-sortpkgs.1.xml:13 sources.list.5.xml:13
@@ -2585,7 +2585,7 @@ msgstr ""
"<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, "
"le nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
msgid ""
@@ -3830,7 +3830,7 @@ msgstr ""
"<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le "
"nombre 100 en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-get.8.xml:13
msgid ""
@@ -3882,30 +3882,32 @@ msgid ""
"</group> </arg> </group>"
msgstr ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-"<option>-o= <replaceable>option_de_configuration</replaceable> </option> </"
+"<option>-o= <replaceable>options_de_configuration</replaceable> </option> </"
"arg> <arg> <option>-c= <replaceable>fichier_de_configuration</replaceable> </"
-"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg "
-"choice='plain'> <replaceable>nom_version_cible</replaceable> </arg> <group "
-"choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>numero_version_paquet</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>nom_version_cible</"
-"replaceable> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
-"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
-"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
-"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
-"=<replaceable>numéro_version_paquet</replaceable> </arg> </arg> </arg> <arg "
-"choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>check</"
-"arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
-"<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
-"choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
-"arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
-"choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </"
-"group>"
+"option> </arg> <arg> <option>-t=</option> <arg choice='plain'> "
+"<replaceable>nom_version_cible</replaceable> </arg> </arg> <group choice="
+"\"req\"> <arg choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> "
+"<arg choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</"
+"arg> <arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquet</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>numéro_version_paquet</replaceable> </arg> "
+"<arg choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" "
+"rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>paquet</replaceable></arg></arg> <arg choice='plain'>source "
+"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquet</replaceable> <arg> "
+"<group choice='req'> <arg choice='plain'> "
+"=<replaceable>numéro_version_paquet</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>nom_version_cible</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
+"\" rep=\"repeat\"><replaceable>paquet</replaceable></arg></arg> <arg "
+"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
+"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
+"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
+"choice='plain'>--version</arg> </group> </arg> <arg choice='plain'> <group "
+"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
+"</group> </arg> </group>"
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:112
@@ -5216,7 +5218,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian."
msgid "&apt-get;, &apt-secure;"
msgstr "&apt-get;, &apt-secure;"
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
msgid ""
@@ -5778,7 +5780,7 @@ msgstr ""
"<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 "
"en cas d'erreur."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
msgid ""
@@ -7678,7 +7680,7 @@ msgstr ""
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
-#. to do this.
+#. to do this.
#. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para>
#: apt.conf.5.xml:746
msgid ""
@@ -8101,13 +8103,13 @@ msgstr ""
msgid "&file-aptconf;"
msgstr "&file-aptconf;"
-#. ? reading apt.conf
+#. ? reading apt.conf
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:1096
msgid "&apt-cache;, &apt-config;, &apt-preferences;."
msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
-#. The last update date
+#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
msgid ""
diff --git a/doc/po/ja.po b/doc/po/ja.po
index 11a0d446f..3b8fa75de 100644
--- a/doc/po/ja.po
+++ b/doc/po/ja.po
@@ -1,35 +1,34 @@
-# SOME DESCRIPTIVE TITLE
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translation of apt package man pages
+# Copyright (C) 2003-2010 Debian Japanese List <debian-japanese@lists.debian.org>
+# This file is distributed under the same license as the apt package.
#
+# Translators:
+# KURASAWA Nozomu, 2003-2006, 2009-2010.
msgid ""
msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2010-07-30 12:46+0300\n"
-"PO-Revision-Date: 2009-07-30 22:55+0900\n"
+"Project-Id-Version: apt 0.7.25.3\n"
+"POT-Creation-Date: 2010-08-23 18:46-0300\n"
+"PO-Revision-Date: 2010-09-07 07:38+0900\n"
"Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
-# type: TH
#. type: TH
#: apt.8:17
#, no-wrap
msgid "apt"
msgstr "apt"
-# type: TH
#. type: TH
#: apt.8:17
#, no-wrap
msgid "16 June 1998"
msgstr "16 June 1998"
-# type: TH
#. type: TH
#: apt.8:17
#, no-wrap
@@ -41,7 +40,7 @@ msgstr "Debian GNU/Linux"
#: apt.8:18
#, no-wrap
msgid "NAME"
-msgstr "名称"
+msgstr "名前"
# type: Plain text
#. type: Plain text
@@ -78,10 +77,10 @@ msgid ""
"(8) for the command line or B<synaptic>(8) for the X Window System. Some "
"options are only implemented in B<apt-get>(8) though."
msgstr ""
-"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理には、コ"
-"マンドライン用には B<aptitude>(8)、X Window System 用には B<synaptic>(8) と"
-"いった、いくつかのフロントエンドが用意されています。しかし、いくつかのオプ"
-"ションは B<apt-get>(8) にしか実装されていません。"
+"APT はソフトウェアパッケージの管理システムです。日々のパッケージ管理のため"
+"に、コマンドライン用の B<aptitude>(8) や、X Window System 用の B<synaptic>"
+"(8) といった、いくつかのフロントエンドが用意されています。いくつかのオプショ"
+"ンは B<apt-get>(8) にしか実装されていません。"
# type: SH
#. type: SH
@@ -170,7 +169,7 @@ msgstr "著者"
#: apt.8:56
msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>."
msgstr ""
-"apt は the APT team E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
+"apt は APT チーム E<lt>apt@packages.debian.orgE<gt> によって書かれました。"
#. type: Plain text
#: apt.ent:2
@@ -372,13 +371,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:84
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
@@ -388,7 +381,7 @@ msgid ""
msgstr ""
"<!ENTITY dpkg \"<citerefentry>\n"
" <refentrytitle><command>dpkg</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -426,13 +419,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:102
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
@@ -442,19 +429,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scanpackages \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:108
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dpkg-scansources \"<citerefentry>\n"
-#| " <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
@@ -464,19 +445,13 @@ msgid ""
msgstr ""
"<!ENTITY dpkg-scansources \"<citerefentry>\n"
" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
#. type: Plain text
#: apt.ent:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY dselect \"<citerefentry>\n"
-#| " <refentrytitle><command>dselect</command></refentrytitle>\n"
-#| " <manvolnum>8</manvolnum>\n"
-#| " </citerefentry>\"\n"
-#| ">\n"
+#, no-wrap
msgid ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
@@ -486,7 +461,7 @@ msgid ""
msgstr ""
"<!ENTITY dselect \"<citerefentry>\n"
" <refentrytitle><command>dselect</command></refentrytitle>\n"
-" <manvolnum>8</manvolnum>\n"
+" <manvolnum>1</manvolnum>\n"
" </citerefentry>\"\n"
">\n"
@@ -588,16 +563,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:162
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!-- Boiler plate docinfo section -->\n"
-#| "<!ENTITY apt-docinfo \"\n"
-#| " <refentryinfo>\n"
-#| " <address><email>apt@packages.debian.org</email></address>\n"
-#| " <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
-#| " <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
-#| " <date>28 October 2008</date>\n"
-#| " <productname>Linux</productname>\n"
+#, no-wrap
msgid ""
"<!-- Boiler plate docinfo section -->\n"
"<!ENTITY apt-docinfo \"\n"
@@ -615,7 +581,10 @@ msgstr ""
"<!ENTITY apt-docinfo \"\n"
" <refentryinfo>\n"
" <address><email>apt@packages.debian.org</email></address>\n"
-" <author><firstname>Jason</firstname> <surname>Gunthorpe</surname></author>\n"
+" <author>\n"
+" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
+" </author>\n"
" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n"
" <date>28 October 2008</date>\n"
" <productname>Linux</productname>\n"
@@ -648,14 +617,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:179
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.jgunthorpe \"\n"
-#| " <author>\n"
-#| " <firstname>Jason</firstname>\n"
-#| " <surname>Gunthorpe</surname>\n"
-#| " </author>\n"
-#| "\">\n"
+#, no-wrap
msgid ""
"<!ENTITY apt-author.jgunthorpe \"\n"
" <author>\n"
@@ -669,19 +631,13 @@ msgstr ""
" <author>\n"
" <firstname>Jason</firstname>\n"
" <surname>Gunthorpe</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
#. type: Plain text
#: apt.ent:187
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.moconnor \"\n"
-#| " <author>\n"
-#| " <firstname>Mike</firstname>\n"
-#| " <surname>O'Connor</surname>\n"
-#| " </author>\n"
-#| "\">\n"
+#, no-wrap
msgid ""
"<!ENTITY apt-author.moconnor \"\n"
" <author>\n"
@@ -695,18 +651,13 @@ msgstr ""
" <author>\n"
" <firstname>Mike</firstname>\n"
" <surname>O'Connor</surname>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
#. type: Plain text
#: apt.ent:194
-#, fuzzy, no-wrap
-#| msgid ""
-#| "<!ENTITY apt-author.team \"\n"
-#| " <author>\n"
-#| " <othername>APT team</othername>\n"
-#| " </author>\n"
-#| "\">\n"
+#, no-wrap
msgid ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
@@ -717,7 +668,8 @@ msgid ""
msgstr ""
"<!ENTITY apt-author.team \"\n"
" <author>\n"
-" <othername>APT team</othername>\n"
+" <othername>APT チーム</othername>\n"
+" <contrib></contrib>\n"
" </author>\n"
"\">\n"
@@ -763,7 +715,7 @@ msgid ""
msgstr ""
"<!ENTITY apt-qapage \"\n"
"\t<para>\n"
-"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>QA Page</ulink>\n"
+"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>QA ページ</ulink>\n"
"\t</para>\n"
"\">\n"
@@ -808,7 +760,7 @@ msgstr ""
"<!-- Boiler plate Author section -->\n"
"<!ENTITY manauthor \"\n"
" <refsect1><title>著者</title>\n"
-" <para>APT は APT team <email>apt@packages.debian.org</email> によって書かれました。\n"
+" <para>APT は APT チーム <email>apt@packages.debian.org</email> によって書かれました。\n"
" </para>\n"
" </refsect1>\n"
"\">\n"
@@ -849,7 +801,7 @@ msgid ""
" </listitem>\n"
" </varlistentry>\n"
msgstr ""
-" <varlistentry>\n"
+" <varlistentry>\n"
" <term><option>-v</option></term>\n"
" <term><option>--version</option></term>\n"
" <listitem><para>プログラムのバージョンを表示します。\n"
@@ -859,17 +811,7 @@ msgstr ""
#. type: Plain text
#: apt.ent:264
-#, fuzzy, no-wrap
-#| msgid ""
-#| " <varlistentry>\n"
-#| " <term><option>-c</option></term>\n"
-#| " <term><option>--config-file</option></term>\n"
-#| " <listitem><para>Configuration File; Specify a configuration file to use. \n"
-#| " The program will read the default configuration file and then this \n"
-#| " configuration file. See &apt-conf; for syntax information. \n"
-#| " </para>\n"
-#| " </listitem>\n"
-#| " </varlistentry>\n"
+#, no-wrap
msgid ""
" <varlistentry>\n"
" <term><option>-c</option></term>\n"
@@ -887,8 +829,9 @@ msgstr ""
" <term><option>-c</option></term>\n"
" <term><option>--config-file</option></term>\n"
" <listitem><para>設定ファイル。 使用する設定ファイルを指定します。\n"
-" この設定ファイルが読めない場合はデフォルトの設定ファイルを読み込みます。\n"
-" 文法については &apt-conf; を参照してください。\n"
+" このプログラムは、デフォルト設定ファイルを読んでから、この設定ファイルを読みます。\n"
+" この設定をデフォルト設定ファイルよりも前に読む必要がある場合、\n"
+" <envar>APT_CONFIG</envar> 環境変数に指定してください。構文については &apt-conf; をご覧ください。\n"
" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
@@ -909,13 +852,14 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
-" <varlistentry>\n"
+" <varlistentry>\n"
" <term><option>-o</option></term>\n"
" <term><option>--option</option></term>\n"
" <listitem><para>設定オプションのセット。任意の設定オプションをセットします。\n"
-" 文法は <option>-o Foo::Bar=bar</option> となります。\n"
+" 構文 <option>-o Foo::Bar=bar</option> となります。\n"
" 異なるオプションを設定するため、<option>-o</option> と <option>--option</option> は、\n"
-" 複数回使用できます。 </para>\n"
+" 複数回使用できます。\n"
+" </para>\n"
" </listitem>\n"
" </varlistentry>\n"
"\">\n"
@@ -945,6 +889,7 @@ msgstr ""
" などのようにして上書きできます。\n"
" </para>\n"
"\">\n"
+"\n"
#. type: Plain text
#: apt.ent:293
@@ -956,6 +901,11 @@ msgid ""
" Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
+"<!ENTITY file-aptconf \"\n"
+" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n"
+" <listitem><para>APT 設定ファイル。\n"
+" 設定項目 - <literal>Dir::Etc::Main</literal></para></listitem>\n"
+" </varlistentry>\n"
#. type: Plain text
#: apt.ent:299
@@ -967,6 +917,11 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
+" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n"
+" <listitem><para>APT 設定ファイル断片。\n"
+" 設定項目 - <literal>Dir::Etc::Parts</literal></para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
#. type: Plain text
#: apt.ent:305
@@ -978,25 +933,33 @@ msgid ""
" Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
+"<!ENTITY file-cachearchives \"\n"
+" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n"
+" <listitem><para>取得済みパッケージファイル格納エリア。\n"
+" 設定項目 - <literal>Dir::Cache::Archives</literal></para></listitem>\n"
+" </varlistentry>\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:311
-#, fuzzy, no-wrap
-#| msgid "Storage area for package files in transit. Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial)."
+#, no-wrap
msgid ""
" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
" <listitem><para>Storage area for package files in transit.\n"
" Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n"
" </varlistentry>\n"
"\">\n"
-msgstr "取得中パッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)"
+msgstr ""
+" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n"
+" <listitem><para>取得中パッケージファイル格納エリア。\n"
+" 設定項目 - <literal>Dir::Cache::Archives</literal> (必然的に不完全)</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:321
-#, fuzzy, no-wrap
-#| msgid "Version preferences file. This is where you would specify \"pinning\", i.e. a preference to get certain packages from a separate source or from a different version of a distribution. Configuration Item: <literal>Dir::Etc::Preferences</literal>."
+#, no-wrap
msgid ""
"<!ENTITY file-preferences \"\n"
" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
@@ -1007,7 +970,15 @@ msgid ""
" or from a different version of a distribution.\n"
" Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n"
" </varlistentry>\n"
-msgstr "バージョン優先ファイル。ここに \"pin\" の設定を行います。つまり、別々の取得元や異なるディストリビューションのバージョンの、どこからパッケージを取得するかを設定します。設定項目 - <literal>Dir::Etc::Preferences</literal>"
+msgstr ""
+"<!ENTITY file-preferences \"\n"
+" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n"
+" <listitem><para>バージョン選択ファイル。\n"
+" ここに &quot;pinning&quot;の設定を行います。\n"
+" つまり、別々の取得元や異なるディストリビューションのバージョンの、\n"
+" どこからパッケージを取得するかを設定します。\n"
+" 設定項目 - <literal>Dir::Etc::Preferences</literal></para></listitem>\n"
+" </varlistentry>\n"
#. type: Plain text
#: apt.ent:327
@@ -1019,6 +990,11 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
+" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n"
+" <listitem><para>バージョン選択ファイル断片。\n"
+" 設定項目 - <literal>Dir::Etc::PreferencesParts</literal></para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
#. type: Plain text
#: apt.ent:333
@@ -1030,6 +1006,11 @@ msgid ""
" Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n"
" </varlistentry>\n"
msgstr ""
+"<!ENTITY file-sourceslist \"\n"
+" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n"
+" <listitem><para>パッケージ取得元の場所。\n"
+" 設定項目 - <literal>Dir::Etc::SourceList</literal></para></listitem>\n"
+" </varlistentry>\n"
#. type: Plain text
#: apt.ent:339
@@ -1041,12 +1022,16 @@ msgid ""
" </varlistentry>\n"
"\">\n"
msgstr ""
+" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n"
+" <listitem><para>パッケージ取得元の場所のファイル断片\n"
+" 設定項目 - <literal>Dir::Etc::SourceParts</literal></para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:346
-#, fuzzy, no-wrap
-#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+#, no-wrap
msgid ""
"<!ENTITY file-statelists \"\n"
" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
@@ -1054,39 +1039,51 @@ msgid ""
" &sources-list;\n"
" Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n"
" </varlistentry>\n"
-msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
+msgstr ""
+"<!ENTITY file-statelists \"\n"
+" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n"
+" <listitem><para>&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。\n"
+" 設定項目 - <literal>Dir::State::Lists</literal></para></listitem>\n"
+" </varlistentry>\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:352
-#, fuzzy, no-wrap
-#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
+#, no-wrap
msgid ""
" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
" <listitem><para>Storage area for state information in transit.\n"
" Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial).</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
-msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
+msgstr ""
+" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n"
+" <listitem><para>取得中状態情報格納エリア。\n"
+" 設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)</para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:358
-#, fuzzy, no-wrap
-#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+#, no-wrap
msgid ""
"<!ENTITY file-trustedgpg \"\n"
" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
" <listitem><para>Keyring of local trusted keys, new keys will be added here.\n"
" Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
" </varlistentry>\n"
-msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
+msgstr ""
+"<!ENTITY file-trustedgpg \"\n"
+" <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n"
+" <listitem><para>ローカルで信頼済みキーのキーリング、新規キーはここに追加します。\n"
+" 設定項目 - <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n"
+" </varlistentry>\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:365
-#, fuzzy, no-wrap
-#| msgid "Storage area for state information in transit. Configuration Item: <literal>Dir::State::Lists</literal> (implicit partial)."
+#, no-wrap
msgid ""
" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
" <listitem><para>File fragments for the trusted keys, additional keyrings can\n"
@@ -1094,13 +1091,16 @@ msgid ""
" Configuration Item <literal>Dir::Etc::TrustedParts</literal>.</para></listitem>\n"
" </varlistentry>\n"
"\">\n"
-msgstr "取得中状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal> (必然的に不完全)"
+msgstr ""
+" <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n"
+" <listitem><para>信頼済みキーのファイル断片、追加キーリングは (他のパッケージや管理者により) ここに格納します。\n"
+" 設定項目 - <literal>Dir::Etc::TrustedParts</literal></para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Plain text
#: apt.ent:373
-#, fuzzy, no-wrap
-#| msgid "Storage area for state information for each package resource specified in &sources-list; Configuration Item: <literal>Dir::State::Lists</literal>."
+#, no-wrap
msgid ""
"<!ENTITY file-extended_states \"\n"
" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
@@ -1109,7 +1109,14 @@ msgid ""
" </para></listitem>\n"
" </varlistentry>\n"
"\">\n"
-msgstr "&sources-list; に指定した、パッケージリソースごとの状態情報格納エリア。設定項目 - <literal>Dir::State::Lists</literal>"
+msgstr ""
+"<!ENTITY file-extended_states \"\n"
+" <varlistentry><term><filename>/var/lib/apt/extended_states</filename></term>\n"
+" <listitem><para>自動インストールされたパッケージの状態一覧です。\n"
+" 設定項目 - <literal>Dir::State::extended_states</literal>\n"
+" </para></listitem>\n"
+" </varlistentry>\n"
+"\">\n"
#. type: Plain text
#: apt.ent:377
@@ -1118,7 +1125,10 @@ msgid ""
"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
"<!ENTITY translation-title \"TRANSLATION\">\n"
-msgstr "<!ENTITY translation-title \"訳者\">\n"
+msgstr ""
+"<!-- TRANSLATOR: This is the section header for the following paragraphs - comparable\n"
+" to the other headers like NAME and DESCRIPTION and should therefore be uppercase. -->\n"
+"<!ENTITY translation-title \"翻訳\">\n"
#. type: Plain text
#: apt.ent:386
@@ -1133,8 +1143,11 @@ msgid ""
" Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n"
"\">\n"
msgstr ""
+"<!-- TRANSLATOR: This is a placeholder. You should write here who has contributed\n"
+" to the translation in the past, who is responsible now and maybe further information\n"
+" specially related to your translation. -->\n"
"<!ENTITY translation-holder \"\n"
-" 倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),\n"
+" 倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009-2010),\n"
" Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>\n"
"\">\n"
@@ -1153,6 +1166,16 @@ msgid ""
" translation is lagging behind the original content.\n"
"\">\n"
msgstr ""
+"<!-- TRANSLATOR: As a translation is allowed to have 20% of untranslated/fuzzy strings\n"
+" in a shipped manpage newer/modified paragraphs will maybe appear in english in\n"
+" the generated manpage. This sentence is therefore here to tell the reader that this\n"
+" is not a mistake by the translator - obviously the target is that at least for stable\n"
+" releases this sentence is not needed. :) -->\n"
+"<!ENTITY translation-english \"\n"
+" この翻訳文書には未訳部分が含まれていることに注意してください。\n"
+" 翻訳がオリジナルに追従できていない場合、\n"
+" 内容を失わないようにこのようにしています。\n"
+"\">\n"
#. type: Plain text
#: apt.ent:400
@@ -1160,6 +1183,8 @@ msgid ""
"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
"ENTITY testing-codename \"squeeze\">"
msgstr ""
+"<!ENTITY oldstable-codename \"etch\"> <!ENTITY stable-codename \"lenny\"> <!"
+"ENTITY testing-codename \"squeeze\">"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
@@ -1191,7 +1216,7 @@ msgstr "8"
#: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23
#: sources.list.5.xml:24
msgid "APT"
-msgstr ""
+msgstr "APT"
# type: Content of: <refentry><refnamediv><refpurpose>
#. type: Content of: <refentry><refnamediv><refpurpose>
@@ -1367,6 +1392,7 @@ msgstr ""
"Provides:\n"
"2.1-12 - \n"
"Reverse Provides: \n"
+" \n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -1475,13 +1501,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#: apt-cache.8.xml:152
-#, fuzzy
-#| msgid ""
-#| "<literal>Missing</literal> is the number of package names that were "
-#| "referenced in a dependency but were not provided by any package. Missing "
-#| "packages may be in evidence if a full distribution is not accessed, or if "
-#| "a package (real or virtual) has been dropped from the distribution. "
-#| "Usually they are referenced from Conflicts or Breaks statements."
msgid ""
"<literal>Missing</literal> is the number of package names that were "
"referenced in a dependency but were not provided by any package. Missing "
@@ -1490,10 +1509,10 @@ msgid ""
"they are referenced from Conflicts or Breaks statements."
msgstr ""
"<literal>欠落</literal>は、依存関係中には存在するのに、どのパッケージにも提供"
-"されていないパッケージ名の数を表します。このパッケージがあるということは、全"
-"ディストリビューションにアクセスできていないか、(実ないし仮想) パッケージが"
-"ディストリビューションからはずされてしまった可能性もあります。通常では、構文"
-"が矛盾するとこのようになります。"
+"されていないパッケージ名の数を表します。欠落パッケージは、全ディストリビュー"
+"ションにアクセスできていないか、(実ないし仮想) パッケージがディストリビュー"
+"ションからはずされたという兆候かもしれません。通常、構文が競合や破損するとこ"
+"のようになります。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para>
@@ -1677,13 +1696,6 @@ msgstr "pkgnames <replaceable>[ prefix ]</replaceable>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:229
-#, fuzzy
-#| msgid ""
-#| "This command prints the name of each package in the system. The optional "
-#| "argument is a prefix match to filter the name list. The output is "
-#| "suitable for use in a shell tab complete function and the output is "
-#| "generated extremely quickly. This command is best used with the <option>--"
-#| "generate</option> option."
msgid ""
"This command prints the name of each package APT knows. The optional "
"argument is a prefix match to filter the name list. The output is suitable "
@@ -1691,10 +1703,10 @@ msgid ""
"extremely quickly. This command is best used with the <option>--generate</"
"option> option."
msgstr ""
-"このコマンドは、システムでの各パッケージの名称を表示します。オプションの引数"
-"により、取得する一覧より先頭一致で抽出することができます。この出力はシェルの"
-"タブによる補完機能に使いやすく、また非常に速く生成されます。このコマンドは "
-"<option>--generate</option> オプションと共に使用すると非常に便利です。"
+"このコマンドは、APT が知っている各パッケージの名前を表示します。オプション引"
+"数は、名前一覧から先頭一致で抽出します。この出力はシェルのタブによる補完機能"
+"で使いやすく、また非常に拘束に生成されます。このコマンドは <option>--"
+"generate</option> オプションと共に使用すると非常に便利です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:234
@@ -1703,6 +1715,9 @@ msgid ""
"download, installable or installed, e.g. virtual packages are also listed in "
"the generated list."
msgstr ""
+"APT が知っているパッケージは、ダウンロード可能、インストール可能、インストー"
+"ル済みである必要がないことに注意してください。つまり、仮想パッケージも生成し"
+"た一覧にあります。"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -1914,68 +1929,48 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:312
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
msgid "<option>--no-pre-depends</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-pre-depends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:313
-#, fuzzy
-#| msgid "<option>--no-download</option>"
msgid "<option>--no-depends</option>"
-msgstr "<option>--no-download</option>"
+msgstr "<option>--no-depends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:314
-#, fuzzy
-#| msgid "<option>--install-recommends</option>"
msgid "<option>--no-recommends</option>"
-msgstr "<option>--install-recommends</option>"
+msgstr "<option>--no-recommends</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:315
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
msgid "<option>--no-suggests</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--no-suggests</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:316
-#, fuzzy
-#| msgid "<option>--no-mount</option>"
msgid "<option>--no-conflicts</option>"
-msgstr "<option>--no-mount</option>"
+msgstr "<option>--no-conflicts</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:317
-#, fuzzy
-#| msgid "<option>--no-act</option>"
msgid "<option>--no-breaks</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-breaks</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:318
-#, fuzzy
-#| msgid "<option>--no-act</option>"
msgid "<option>--no-replaces</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-replaces</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-cache.8.xml:319
-#, fuzzy
-#| msgid "<option>--no-act</option>"
msgid "<option>--no-enhances</option>"
-msgstr "<option>--no-act</option>"
+msgstr "<option>--no-enhances</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-cache.8.xml:320
#, fuzzy
-#| msgid ""
-#| "Make <literal>depends</literal> and <literal>rdepends</literal> recursive "
-#| "so that all packages mentioned are printed once. Configuration Item: "
-#| "<literal>APT::Cache::RecurseDepends</literal>."
msgid ""
"Per default the <literal>depends</literal> and <literal>rdepends</literal> "
"print all dependencies. This can be twicked with these flags which will omit "
@@ -2145,7 +2140,7 @@ msgstr "ファイル"
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-cache.8.xml:377
msgid "&file-sourceslist; &file-statelists;"
-msgstr ""
+msgstr "&file-sourceslist; &file-statelists;"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
@@ -2249,16 +2244,8 @@ msgstr ""
msgid "add"
msgstr "add"
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt-cdrom.8.xml:66
-#, fuzzy
-#| msgid ""
-#| "<literal>add</literal> is used to add a new disc to the source list. It "
-#| "will unmount the CDROM device, prompt for a disk to be inserted and then "
-#| "procceed to scan it and copy the index files. If the disc does not have a "
-#| "proper <filename>disk</filename> directory you will be prompted for a "
-#| "descriptive title."
msgid ""
"<literal>add</literal> is used to add a new disc to the source list. It will "
"unmount the CDROM device, prompt for a disk to be inserted and then proceed "
@@ -2267,8 +2254,8 @@ msgid ""
"title."
msgstr ""
"<literal>add</literal> は、新しいディスクを取得元リストに追加します。CDROM デ"
-"バイスのアンマウント、ディスク挿入のプロンプトの表示の後に、ディスクのスキャ"
-"ンとインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
+"バイスのアンマウント、ディスク挿入のプロンプト表示の後に、ディスクのスキャン"
+"とインデックスファイルのコピーを行います。ディスクに正しい <filename>disk</"
"filename> ディレクトリが存在しない場合、タイトルを入力するよう促します。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -2543,6 +2530,7 @@ msgstr ""
"OPTS=\"-f\"\n"
"RES=`apt-config shell OPTS MyApp::options`\n"
"eval $RES\n"
+"\n"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -2670,11 +2658,6 @@ msgstr "<option>--tempdir</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-extracttemplates.1.xml:62
-#, fuzzy
-#| msgid ""
-#| "Temporary directory in which to write extracted debconf template files "
-#| "and config scripts Configuration Item: <literal>APT::ExtractTemplates::"
-#| "TempDir</literal>"
msgid ""
"Temporary directory in which to write extracted debconf template files and "
"config scripts. Configuration Item: <literal>APT::ExtractTemplates::"
@@ -2696,16 +2679,12 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-ftparchive.1.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"November 2007</date>"
+"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 "
+"August 2009</date>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
@@ -2722,26 +2701,6 @@ msgstr "インデックスファイル生成ユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-ftparchive.1.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
-#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
-#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-#| "arg> <arg><option>-o=<replaceable>config string</replaceable></option></"
-#| "arg> <arg><option>-c=<replaceable>file</replaceable></option></arg> "
-#| "<group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
-#| "replaceable></arg><arg><replaceable>override</"
-#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
-#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></"
-#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</"
-#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain"
-#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep="
-#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg "
-#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </"
-#| "group>"
msgid ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
@@ -2765,10 +2724,11 @@ msgstr ""
"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> "
"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> "
"<arg><option>--readonly</option></arg> <arg><option>--contents</option></"
-"arg> <arg><option>-o=<replaceable>config string</replaceable></option></arg> "
-"<arg><option>-c=<replaceable>file</replaceable></option></arg> <group choice="
-"\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
+"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></"
+"arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</"
+"replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></"
+"option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep="
+"\"repeat\"><replaceable>path</replaceable></arg><arg><replaceable>override</"
"replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> "
"<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</"
"replaceable></arg><arg><replaceable>override</"
@@ -2926,19 +2886,8 @@ msgstr ""
"再帰検索します。その後、ファイルごとの MD5 ダイジェストと SHA1 ダイジェストを"
"含んだ Release ファイルを、標準出力に書き出します。"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:119
-#, fuzzy
-#| msgid ""
-#| "Values for the additional metadata fields in the Release file are taken "
-#| "from the corresponding variables under <literal>APT::FTPArchive::Release</"
-#| "literal>, e.g. <literal>APT::FTPArchive::Release::Origin</literal>. The "
-#| "supported fields are: <literal>Origin</literal>, <literal>Label</"
-#| "literal>, <literal>Suite</literal>, <literal>Version</literal>, "
-#| "<literal>Codename</literal>, <literal>Date</literal>, "
-#| "<literal>Architectures</literal>, <literal>Components</literal>, "
-#| "<literal>Description</literal>."
msgid ""
"Values for the additional metadata fields in the Release file are taken from "
"the corresponding variables under <literal>APT::FTPArchive::Release</"
@@ -2954,8 +2903,8 @@ msgstr ""
"Origin</literal>) をとります。サポートするフィールドは、<literal>Origin</"
"literal>, <literal>Label</literal>, <literal>Suite</literal>, "
"<literal>Version</literal>, <literal>Codename</literal>, <literal>Date</"
-"literal>, <literal>Architectures</literal>, <literal>Components</literal>, "
-"<literal>Description</literal> です。"
+"literal>, <literal>Valid-Until</literal>, <literal>Architectures</literal>, "
+"<literal>Components</literal>, <literal>Description</literal> です。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:130
@@ -3011,7 +2960,7 @@ msgid ""
msgstr ""
"<literal>generate</literal> コマンドは、生成するアーカイブに関する記述をした"
"設定ファイルを使用します。設定ファイルは、bind 8 や dhcpd といった ISC ツール"
-"に見られるような、ISC 設定フォーマットに従います。&apt-conf; に、文法の説明が"
+"に見られるような、ISC 設定フォーマットに従います。&apt-conf; に、構文の説明が"
"あります。Generate 設定はセクション法で解析しますが、&apt-conf; はツリー法で"
"解析するのに注意してください。これはスコープタグの扱い方に違いがあるだけで"
"す。"
@@ -3034,12 +2983,6 @@ msgstr "Dir セクション"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:161
-#, fuzzy
-#| msgid ""
-#| "The <literal>Dir</literal> section defines the standard directories "
-#| "needed to locate the files required during the generation process. These "
-#| "directories are prepended to certain relative paths defined in later "
-#| "sections to produce a complete an absolute path."
msgid ""
"The <literal>Dir</literal> section defines the standard directories needed "
"to locate the files required during the generation process. These "
@@ -3047,8 +2990,8 @@ msgid ""
"to produce a complete an absolute path."
msgstr ""
"<literal>Dir</literal> セクションは、生成プロセスで必要なファイルを配置するた"
-"めの、標準ディレクトリを定義します。このディレクトリは、完全な絶対パスを生成"
-"するため、後のセクションで定義される相対パスの前に結合します。"
+"めに必要な、標準ディレクトリを定義します。このディレクトリは、完全な絶対パス"
+"を生成するため、後のセクションで定義される相対パスの前に結合されます。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -3204,24 +3147,17 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:229
-#, fuzzy
-#| msgid "Contents::Compress"
msgid "Translation::Compress"
-msgstr "Contents::Compress"
+msgstr "Translation::Compress"
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:231
-#, fuzzy
-#| msgid ""
-#| "This is similar to <literal>Packages::Compress</literal> except that it "
-#| "controls the compression for the Contents files."
msgid ""
"This is similar to <literal>Packages::Compress</literal> except that it "
"controls the compression for the Translation-en master file."
msgstr ""
-"<literal>Packages::Compress</literal> と同様に、Contents ファイルの圧縮方法を"
-"指定します。"
+"<literal>Packages::Compress</literal> と同様に、Translation-en マスターファイ"
+"ルの圧縮を制御します。"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:235
@@ -3259,10 +3195,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:249 apt-ftparchive.1.xml:395
-#, fuzzy
-#| msgid "Description"
msgid "LongDescription"
-msgstr "説明"
+msgstr "LongDescription"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:251 apt-ftparchive.1.xml:397
@@ -3385,23 +3319,18 @@ msgstr "Sources"
# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:302
-#, fuzzy
-#| msgid ""
-#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/"
-#| "source/Sources</filename>"
msgid ""
"Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/"
"source/Sources</filename>"
msgstr ""
-"Packages ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
+"Sources ファイルの出力先を設定します。デフォルトは <filename>$(DIST)/"
"$(SECTION)/source/Sources</filename> です。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:306
-#, fuzzy
msgid "Translation"
-msgstr "オプション"
+msgstr "Translation"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:308
@@ -3531,15 +3460,8 @@ msgstr ""
"との複数のアーキテクチャを定義します。使用する正確なパスは、"
"<literal>Directory</literal> 変数で定義されます。"
-# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:364
-#, fuzzy
-#| msgid ""
-#| "The <literal>Tree</literal> section takes a scope tag which sets the "
-#| "<literal>$(DIST)</literal> variable and defines the root of the tree (the "
-#| "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a "
-#| "setting such as <filename>dists/woody</filename>."
msgid ""
"The <literal>Tree</literal> section takes a scope tag which sets the "
"<literal>$(DIST)</literal> variable and defines the root of the tree (the "
@@ -3548,8 +3470,8 @@ msgid ""
msgstr ""
"<literal>Tree</literal> セクションは、<literal>$(DIST)</literal> 変数で設定さ"
"れているスコープタグをとり、ツリーのルート (<literal>ArchiveDir</literal>が先"
-"頭につくパス) を定義します。通常、この設定は <filename>dists/woody</"
-"filename> のようになります。"
+"頭につくパス) を定義します。通常、この設定は <filename>dists/&stable-"
+"codename;</filename> のようになります。"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -3565,11 +3487,7 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt-ftparchive.1.xml:375
-#, fuzzy, no-wrap
-#| msgid ""
-#| "for i in Sections do \n"
-#| " for j in Architectures do\n"
-#| " Generate for DIST=scope SECTION=i ARCH=j\n"
+#, no-wrap
msgid ""
"for i in Sections do \n"
" for j in Architectures do\n"
@@ -3579,21 +3497,19 @@ msgstr ""
"for i in Sections do \n"
" for j in Architectures do\n"
" Generate for DIST=scope SECTION=i ARCH=j\n"
+" "
# type: Content of: <refentry><refsect1><refsect2><para><informalexample>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt-ftparchive.1.xml:372
-#, fuzzy
-#| msgid ""
-#| "When processing a <literal>Tree</literal> section <command>apt-"
-#| "ftparchive</command> performs an operation similar to:"
msgid ""
"When processing a <literal>Tree</literal> section <command>apt-ftparchive</"
"command> performs an operation similar to: <placeholder type=\"programlisting"
"\" id=\"0\"/>"
msgstr ""
"<literal>Tree</literal> セクションを処理する際、<command>apt-ftparchive</"
-"command> は以下のような操作を行います。"
+"command> は以下のような操作を行います。<placeholder type=\"programlisting\" "
+"id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
@@ -3975,20 +3891,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:574
-#, fuzzy
-#| msgid "<option>-a</option>"
msgid "<option>--arch</option>"
-msgstr "<option>-a</option>"
+msgstr "<option>--arch</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:575
#, fuzzy
-#| msgid ""
-#| "If the command is either <literal>install</literal> or <literal>remove</"
-#| "literal>, then this option acts like running <literal>autoremove</"
-#| "literal> command, removing the unused dependency packages. Configuration "
-#| "Item: <literal>APT::Get::AutomaticRemove</literal>."
msgid ""
"Accept in the <literal>packages</literal> and <literal>contents</literal> "
"commands only package files matching <literal>*_arch.deb</literal> or "
@@ -4002,8 +3911,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:581
-#, fuzzy
-#| msgid "<option>--version</option>"
msgid "<option>APT::FTPArchive::AlwaysStat</option>"
msgstr "<option>--version</option>"
@@ -4023,13 +3930,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-ftparchive.1.xml:593
-#, fuzzy
-#| msgid "<option>--version</option>"
msgid "<option>APT::FTPArchive::LongDescription</option>"
-msgstr "<option>--version</option>"
+msgstr "<option>APT::FTPArchive::LongDescription</option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-ftparchive.1.xml:595
+#, fuzzy
msgid ""
"This configuration option defaults to \"<literal>true</literal>\" and should "
"only be set to <literal>\"false\"</literal> if the Archive generated with "
@@ -4037,6 +3943,10 @@ msgid ""
"that the <filename>Translation-en</filename> master file can only be created "
"in the generate command."
msgstr ""
+"この設定オプションはデフォルトで \"<literal>true</literal>\" で、&apt-"
+"ftparchive; が <filename>Translation</filename> ファイルも生成した場合にのみ "
+"<literal>\"false\"</literal> に設定してください。現在 <command>apt-"
+"ftparchive</command> は、このファイルを生成できないことに注意してください。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
@@ -4050,7 +3960,9 @@ msgstr "サンプル"
#: apt-ftparchive.1.xml:613
#, no-wrap
msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
-msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+msgstr ""
+"<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n"
+"\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -4096,38 +4008,6 @@ msgstr "APT パッケージ操作ユーティリティ -- コマンドライン
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-get.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
-#| "<option>-o= <replaceable>config_string</replaceable> </option> </arg> "
-#| "<arg> <option>-c= <replaceable>config_file</replaceable> </option> </arg> "
-#| "<arg> <option>-t=</option> <group choice='req'> <arg choice='plain'> "
-#| "<replaceable>target_release_name</replaceable> </arg> <arg "
-#| "choice='plain'> <replaceable>target_release_number_expression</"
-#| "replaceable> </arg> <arg choice='plain'> "
-#| "<replaceable>target_release_codename</replaceable> </arg> </group> </arg> "
-#| "<group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-#| "choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> "
-#| "<arg choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "<group choice='req'> <arg choice='plain'> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> <arg "
-#| "choice='plain'> /<replaceable>target_release_name</replaceable> </arg> "
-#| "<arg choice='plain'> /<replaceable>target_release_codename</replaceable> "
-#| "</arg> </group> </arg> </arg> </arg> <arg choice='plain'>remove <arg "
-#| "choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></"
-#| "arg> <arg choice='plain'>purge <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>source "
-#| "<arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> "
-#| "=<replaceable>pkg_version_number</replaceable> </arg> </arg> </arg> <arg "
-#| "choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat"
-#| "\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>check</"
-#| "arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> "
-#| "<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group "
-#| "choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</"
-#| "arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg "
-#| "choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> "
-#| "</group>"
msgid ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
@@ -4159,25 +4039,23 @@ msgstr ""
"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> "
"<option>-o= <replaceable>config_string</replaceable> </option> </arg> <arg> "
"<option>-c= <replaceable>config_file</replaceable> </option> </arg> <arg> "
-"<option>-t=</option> <group choice='req'> <arg choice='plain'> "
-"<replaceable>target_release_name</replaceable> </arg> <arg choice='plain'> "
-"<replaceable>target_release_number_expression</replaceable> </arg> <arg "
-"choice='plain'> <replaceable>target_release_codename</replaceable> </arg> </"
-"group> </arg> <group choice=\"req\"> <arg choice='plain'>update</arg> <arg "
-"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg "
-"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group "
-"choice='req'> <arg choice='plain'> =<replaceable>pkg_version_number</"
-"replaceable> </arg> <arg choice='plain'> /<replaceable>target_release_name</"
-"replaceable> </arg> <arg choice='plain'> /"
-"<replaceable>target_release_codename</replaceable> </arg> </group> </arg> </"
-"arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable></arg></arg> <arg choice='plain'>purge <arg "
-"choice=\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> "
-"<arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat"
-"\"><replaceable>pkg</replaceable> <arg> =<replaceable>pkg_version_number</"
-"replaceable> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice="
-"\"plain\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+"<option>-t=</option> <arg choice='plain'> <replaceable>target_release</"
+"replaceable> </arg> </arg> <group choice=\"req\"> <arg "
+"choice='plain'>update</arg> <arg choice='plain'>upgrade</arg> <arg "
+"choice='plain'>dselect-upgrade</arg> <arg choice='plain'>dist-upgrade</arg> "
+"<arg choice='plain'>install <arg choice=\"plain\" rep=\"repeat"
+"\"><replaceable>pkg</replaceable> <arg> <group choice='req'> <arg "
+"choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> <arg "
+"choice='plain'> /<replaceable>target_release</replaceable> </arg> </group> </"
+"arg> </arg> </arg> <arg choice='plain'>remove <arg choice=\"plain\" rep="
+"\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
+"choice='plain'>purge <arg choice=\"plain\" rep=\"repeat\"><replaceable>pkg</"
+"replaceable></arg></arg> <arg choice='plain'>source <arg choice=\"plain\" "
+"rep=\"repeat\"><replaceable>pkg</replaceable> <arg> <group choice='req'> "
+"<arg choice='plain'> =<replaceable>pkg_version_number</replaceable> </arg> "
+"<arg choice='plain'> /<replaceable>target_release</replaceable> </arg> </"
+"group> </arg> </arg> </arg> <arg choice='plain'>build-dep <arg choice=\"plain"
+"\" rep=\"repeat\"><replaceable>pkg</replaceable></arg></arg> <arg "
"choice='plain'>check</arg> <arg choice='plain'>clean</arg> <arg "
"choice='plain'>autoclean</arg> <arg choice='plain'>autoremove</arg> <arg "
"choice='plain'> <group choice='req'> <arg choice='plain'>-v</arg> <arg "
@@ -4185,15 +4063,8 @@ msgstr ""
"choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> "
"</group> </arg> </group>"
-# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-get.8.xml:112
-#, fuzzy
-#| msgid ""
-#| "<command>apt-get</command> is the command-line tool for handling "
-#| "packages, and may be considered the user's \"back-end\" to other tools "
-#| "using the APT library. Several \"front-end\" interfaces exist, such as "
-#| "&dselect;, &aptitude;, &synaptic;, &gnome-apt; and &wajig;."
msgid ""
"<command>apt-get</command> is the command-line tool for handling packages, "
"and may be considered the user's \"back-end\" to other tools using the APT "
@@ -4203,7 +4074,7 @@ msgstr ""
"<command>apt-get</command> は、パッケージを操作するコマンドラインツールで、"
"APT ライブラリを用いる他のツールのユーザ側「バックエンド」といえるものです。"
"「フロントエンド」インターフェースには、&dselect;, &aptitude;, &synaptic;, "
-"&gnome-apt;, &wajig; などがあります。"
+"&wajig; などがあります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:121 apt-key.8.xml:124
@@ -4375,8 +4246,8 @@ msgid ""
"Both of the version selection mechanisms can downgrade packages and must be "
"used with care."
msgstr ""
-"バージョン選択機構はダウングレード時にも使用できるため、注意して使用しなけれ"
-"ばなりません。"
+"バージョン選択機構はダウングレードにも使用できるため、注意して使用しなければ"
+"なりません。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:199
@@ -4389,6 +4260,13 @@ msgid ""
"you wish to upgrade, and if a newer version is available, it (and its "
"dependencies, as described above) will be downloaded and installed."
msgstr ""
+"システムにインストール済みのパッケージを、すべてアップグレードするのではな"
+"く、いくつかのパッケージをアップグレードする場合にも、このターゲットを使用で"
+"きます。現在インストールされているパッケージすべての最新版をインストールする "
+"\"upgrade\" ターゲットと異なり、\"install\" は指定したパッケージの最新版のみ"
+"をインストールします。単純にアップグレードしたいパッケージ名をしてください。"
+"より新しいバージョンが利用できる場合、そのパッケージ (と前述の依存関係にある"
+"パッケージ) をダウンロード・インストールします。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4464,19 +4342,6 @@ msgstr "source"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:237
-#, fuzzy
-#| msgid ""
-#| "<literal>source</literal> causes <command>apt-get</command> to fetch "
-#| "source packages. APT will examine the available packages to decide which "
-#| "source package to fetch. It will then find and download into the current "
-#| "directory the newest available version of that source package. Source "
-#| "packages are tracked separately from binary packages via <literal>deb-"
-#| "src</literal> type lines in the &sources-list; file. This probably will "
-#| "mean that you will not get the same source as the package you have "
-#| "installed or as you could install. If the --compile options is specified "
-#| "then the package will be compiled to a binary .deb using dpkg-"
-#| "buildpackage, if --download-only is specified then the source package "
-#| "will not be unpacked."
msgid ""
"<literal>source</literal> causes <command>apt-get</command> to fetch source "
"packages. APT will examine the available packages to decide which source "
@@ -4486,15 +4351,13 @@ msgid ""
"literal>, the <option>-t</option> option or per package with the "
"<literal>pkg/release</literal> syntax, if possible."
msgstr ""
-"<literal>source</literal> は、ソースパッケージを取得するのに <command>apt-"
-"get</command> します。APT はどのソースパッケージを取得するか決定するよう、利"
-"用可能なパッケージを検討します。その後、最新の利用可能なソースパッケージを見"
-"つけ、カレントディレクトリへダウンロードします。バイナリパッケージとは別に "
-"&sources-list; ファイルの<literal>deb-src</literal> 行から、ソースパッケージ"
-"を追跡します。これは、インストールした (またはインストールできる) パッケージ"
-"と、取得元を変えることができることを示しています。--compile オプションが指定"
-"された場合、dpkg-buildpackage を用いてバイナリ .deb ファイルへコンパイルを行"
-"います。--download-only の場合はソースパッケージを展開しません。"
+"<literal>source</literal> は、<command>apt-get</command> にソースパッケージを"
+"取得させます。APT はどのソースパッケージを取得するか決めるため、利用可能な"
+"パッケージを検査します。その後、デフォルトリリースから最新の利用可能なソース"
+"パッケージを見つけ、カレントディレクトリへダウンロードします。デフォルトリ"
+"リースは、可能であれば、<literal>APT::Default-Release</literal> オプション、"
+"<option>-t</option> オプション、パッケージごとの <literal>pkg/release</"
+"literal> 構文で指定します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:245
@@ -4505,6 +4368,11 @@ msgid ""
"from. If you don't do this you will properly get another (newer, older or "
"none) source version than the one you have installed or could install."
msgstr ""
+"ソースパッケージは、&sources-list; ファイルの <literal>deb-src</literal> タイ"
+"プにより、バイナリパッケート分けて管理されます。つまり、ソースを取得したいリ"
+"ポジトリを、それぞれ追加する必要があるということです。こうしないと、インス"
+"トール済み・インストール可能なものとは違う (新しい、または古い、存在しない) "
+"もっと適切なものを取得します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:252
@@ -4514,6 +4382,10 @@ msgid ""
"<option>--download-only</option> is specified then the source package will "
"not be unpacked."
msgstr ""
+"<option>--compile</option> オプションを指定すると、<command>dpkg-"
+"buildpackage</command> を用いてバイナリ .deb パッケージをコンパイルします。"
+"<option>--download-only</option> を指定すると、ソースパッケージを展開しませ"
+"ん。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
@@ -4669,19 +4541,6 @@ msgstr "<option>--fix-broken</option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:320
-#, fuzzy
-#| msgid ""
-#| "Fix; attempt to correct a system with broken dependencies in place. This "
-#| "option, when used with install/remove, can omit any packages to permit "
-#| "APT to deduce a likely solution. Any Package that are specified must "
-#| "completely correct the problem. The option is sometimes necessary when "
-#| "running APT for the first time; APT itself does not allow broken package "
-#| "dependencies to exist on a system. It is possible that a system's "
-#| "dependency structure can be so corrupt as to require manual intervention "
-#| "(which usually means using &dselect; or <command>dpkg --remove</command> "
-#| "to eliminate some of the offending packages). Use of this option together "
-#| "with <option>-m</option> may produce an error in some situations. "
-#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>."
msgid ""
"Fix; attempt to correct a system with broken dependencies in place. This "
"option, when used with install/remove, can omit any packages to permit APT "
@@ -4696,15 +4555,15 @@ msgid ""
"<literal>APT::Get::Fix-Broken</literal>."
msgstr ""
"修復 - 依存関係が壊れたシステムの修正を試みます。このオプションを install や "
-"remove と一緒に使うときは、パッケージを指定しなくてもかまいません。どのパッ"
-"ケージを指定しても、完全に問題を解決します。APT 自体は、システムに存在する壊"
-"れたパッケージ依存関係を許すことができないので、初めて APT を実行する場合、こ"
-"のオプションが必要になることがあります。システムの依存関係構造にかなり問題が"
-"ある場合は、手動で修正するよう要求することもあります。(通常は、問題のあるパッ"
-"ケージを取り除くのに &dselect; や <command>dpkg --remove</command> を使用しま"
-"す) このオプションを <option>-m</option> オプションと同時に使用すると、エラー"
-"になる状況があるかもしれません。設定項目 - <literal>APT::Get::Fix-Broken</"
-"literal>"
+"remove と一緒に使うときは、APT が解決法を推測するので、パッケージを指定しなく"
+"てもかまいません。どのパッケージを指定しても、完全に問題を解決します。APT 自"
+"体は、システムに存在する破損したパッケージ依存関係を許すことができないので、"
+"初めて APT を実行する場合、このオプションが必要になることがあります。システム"
+"の依存関係構造にかなり問題がある場合は、手動で修正するよう要求することもあり"
+"ます。(通常は、問題のあるパッケージを取り除くのに &dselect; や <command>dpkg "
+"--remove</command> を使用します) このオプションを <option>-m</option> オプ"
+"ションと同時に使用すると、エラーになる状況があるかもしれません。設定項目 - "
+"<literal>APT::Get::Fix-Broken</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:333
@@ -4804,16 +4663,16 @@ msgid ""
"will be triggered if run as root (root should know what he is doing without "
"further warnings by <literal>apt-get</literal>)."
msgstr ""
+"シミュレーションは、自動ではロックを行わず (<literal>Debug::NoLocking</"
+"literal>) ユーザ権限で実行します。また、<literal>APT::Get::Show-User-"
+"Simulation-Note</literal> オプション (デフォルト: true) をセットすると、これ"
+"がシミュレーションであるという注意を表示したりもします。root 権限で実行する"
+"と、NoLocking も 注意も行われません (root は <literal>apt-get</literal> によ"
+"る警告などなくても、何をしているのか知っているべきです)。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:378
-#, fuzzy
-#| msgid ""
-#| "Simulate prints out a series of lines each one representing a dpkg "
-#| "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square "
-#| "brackets indicate broken packages with and empty set of square brackets "
-#| "meaning breaks that are of no consequence (rare)."
msgid ""
"Simulate prints out a series of lines each one representing a dpkg "
"operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets "
@@ -4973,20 +4832,12 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-get.8.xml:433
-#, fuzzy
-#| msgid "<option>--no-upgrade</option>"
msgid "<option>--only-upgrade</option>"
-msgstr "<option>--no-upgrade</option>"
+msgstr "<option>--only-upgrade</option>"
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-get.8.xml:434
#, 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 "
@@ -5052,13 +4903,6 @@ 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:460
-#, fuzzy
-#| msgid ""
-#| "Use purge instead of remove for anything that would be removed. An "
-#| "asterisk (\"*\") will be displayed next to packages which are scheduled "
-#| "to be purged. <option>remove --purge</option> is equivalent for "
-#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::"
-#| "Purge</literal>."
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. "
@@ -5267,7 +5111,6 @@ 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:541
-#, fuzzy
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::"
@@ -5283,6 +5126,8 @@ msgid ""
"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
"&file-statelists;"
msgstr ""
+"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; "
+"&file-statelists;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -5293,7 +5138,8 @@ msgid ""
"preferences;, the APT Howto."
msgstr ""
"&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, "
-"&apt-config;, &docdir; の APT ユーザーズガイド, &apt-preferences;, APT Howto"
+"&apt-config;, &apt-secure;, &guidesdir; の APT ユーザーズガイド, &apt-"
+"preferences;, APT Howto"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -5340,18 +5186,14 @@ msgstr "APT キー管理ユーティリティ"
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-key.8.xml:28
-#, fuzzy
-#| msgid ""
-#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
-#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></"
-#| "option></arg>"
msgid ""
"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
msgstr ""
-"<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> "
+"<command>apt-key</command> <arg><option>--keyring <replaceable>filename</"
+"replaceable></option></arg> <arg><replaceable>command</replaceable></arg> "
"<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></"
"arg>"
@@ -5480,14 +5322,14 @@ msgid ""
"Note that options need to be defined before the commands described in the "
"previous section."
msgstr ""
+"前節で説明したコマンドの前に、このオプションを定義する必要があることに注意し"
+"てください。"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-key.8.xml:142
-#, fuzzy
-#| msgid "add <replaceable>filename</replaceable>"
msgid "--keyring <replaceable>filename</replaceable>"
-msgstr "add <replaceable>filename</replaceable>"
+msgstr "--keyring <replaceable>filename</replaceable>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-key.8.xml:143
@@ -5499,11 +5341,16 @@ msgid ""
"filename> is the primary keyring which means that e.g. new keys are added to "
"this one."
msgstr ""
+"このオプションでは、コマンドが動作する際のキーリングを指定できます。デフォル"
+"トは、<filename>trusted.gpg</filename> と <filename>trusted.gpg.d</filename> "
+"ディレクトリにあるすべてのファイルで動作します。この中で <filename>trusted."
+"gpg</filename> がプライマリキーリングです。つまり新しいキーはこのファイルに追"
+"加されます。"
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-key.8.xml:156
msgid "&file-trustedgpg;"
-msgstr ""
+msgstr "&file-trustedgpg;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
@@ -5550,16 +5397,12 @@ msgstr "&apt-get;, &apt-secure;"
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt-mark.8.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-#| "November 2007</date>"
msgid ""
"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
"August 2009</date>"
msgstr ""
-"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>2 "
-"November 2007</date>"
+"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 "
+"August 2009</date>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
@@ -5576,12 +5419,6 @@ msgstr "パッケージが自動的にインストールされたかどうかの
# type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis>
#: apt-mark.8.xml:36
-#, fuzzy
-#| msgid ""
-#| "<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-#| "f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-#| "\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-#| "rep=\"repeat\"><replaceable>package</replaceable></arg>"
msgid ""
" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
@@ -5590,10 +5427,12 @@ msgid ""
"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
"arg> <arg choice=\"plain\">showauto</arg> </group>"
msgstr ""
-"<command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
-"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"req"
-"\"><arg>markauto</arg><arg>unmarkauto</arg></group> <arg choice=\"plain\" "
-"rep=\"repeat\"><replaceable>package</replaceable></arg>"
+" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-"
+"f=<replaceable>FILENAME</replaceable></option></arg> <group choice=\"plain"
+"\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain"
+"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg "
+"choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </"
+"arg> <arg choice=\"plain\">showauto</arg> </group>"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -5608,13 +5447,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:57
-#, fuzzy
-#| msgid ""
-#| "When you request that a package is installed, and as a result other "
-#| "packages are installed to satisfy its dependencies, the dependencies are "
-#| "marked as being automatically installed. Once these automatically "
-#| "installed packages are no longer depended on by any manually installed "
-#| "packages, they will be removed."
msgid ""
"When you request that a package is installed, and as a result other packages "
"are installed to satisfy its dependencies, the dependencies are marked as "
@@ -5623,9 +5455,10 @@ msgid ""
"removed by e.g. <command>apt-get</command> or <command>aptitude</command>."
msgstr ""
"パッケージをインストールすると要求し、その結果、別のパッケージが依存関係を満"
-"たすためにインストールされた場合、依存関係に自動的にインストールしたとマーク"
-"します。いったん自動的にインストールされたパッケージは、手動でインストールし"
-"たパッケージに依存されなくなると、そのパッケージは削除されます。"
+"たすためにインストールされた場合、依存関係に自動的にインストールしたと印を付"
+"けます。いったん自動的にインストールされたパッケージは、手動でインストールし"
+"たパッケージに依存されなくなると、そのパッケージは、例えば <command>apt-get</"
+"command> や <command>aptitude</command> により削除されます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:65
@@ -5664,49 +5497,37 @@ msgstr ""
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:81
msgid "showauto"
-msgstr ""
+msgstr "showauto"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:82
-#, fuzzy
-#| msgid ""
-#| "<literal>autoremove</literal> is used to remove packages that were "
-#| "automatically installed to satisfy dependencies for some package and that "
-#| "are no more needed."
msgid ""
"<literal>showauto</literal> is used to print a list of automatically "
"installed packages with each package on a new line."
msgstr ""
-"<literal>autoremove</literal> は、依存関係を満たすために自動的にインストール"
-"され、もう必要なくなったパッケージを削除するのに使用します。"
+"<literal>showauto</literal> は、自動的にインストールされたパッケージを、パッ"
+"ケージごとに改行して表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:93
-#, fuzzy
-#| msgid "<option>-f=<filename>FILENAME</filename></option>"
msgid ""
"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
-msgstr "<option>-f=<filename>FILENAME</filename></option>"
+msgstr ""
+"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt-mark.8.xml:94
-#, fuzzy
-#| msgid "<option>--file=<filename>FILENAME</filename></option>"
msgid ""
"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
"option>"
-msgstr "<option>--file=<filename>FILENAME</filename></option>"
+msgstr ""
+"<option>--file=<filename><replaceable>FILENAME</replaceable></filename></"
+"option>"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt-mark.8.xml:97
-#, fuzzy
-#| msgid ""
-#| "Read/Write package stats from <filename>FILENAME</filename> instead of "
-#| "the default location, which is <filename>extended_status</filename> in "
-#| "the directory defined by the Configuration Item: <literal>Dir::State</"
-#| "literal>."
msgid ""
"Read/Write package stats from <filename><replaceable>FILENAME</replaceable></"
"filename> instead of the default location, which is "
@@ -5752,15 +5573,13 @@ msgstr "プログラムのバージョン情報を表示します"
#. type: Content of: <refentry><refsect1><variablelist>
#: apt-mark.8.xml:124
msgid " &file-extended_states;"
-msgstr ""
+msgstr " &file-extended_states;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-mark.8.xml:129
-#, fuzzy
-#| msgid "&apt-cache; &apt-conf;"
msgid "&apt-get;,&aptitude;,&apt-conf;"
-msgstr "&apt-cache; &apt-conf;"
+msgstr "&apt-get;,&aptitude;,&apt-conf;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -5832,14 +5651,6 @@ msgstr "信頼済アーカイブ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:67
-#, fuzzy
-#| msgid ""
-#| "The chain of trust from an apt archive to the end user is made up of "
-#| "different steps. <command>apt-secure</command> is the last step in this "
-#| "chain, trusting an archive does not mean that the packages that you trust "
-#| "it do not contain malicious code but means that you trust the archive "
-#| "maintainer. Its the archive maintainer responsibility to ensure that the "
-#| "archive integrity is correct."
msgid ""
"The chain of trust from an apt archive to the end user is made up of "
"different steps. <command>apt-secure</command> is the last step in this "
@@ -5851,8 +5662,9 @@ msgstr ""
"apt アーカイブからエンドユーザまでの信頼の輪は、いくつかのステップで構成され"
"ています。<command>apt-secure</command> は、この輪の最後のステップで、アーカ"
"イブを信頼することは、パッケージに悪意のあるコードが含まれていないと信頼する"
-"わけではありませんが、アーカイブメンテナを信頼すると言うことです。これは、"
-"アーカイブの完全性を保証するのは、アーカイブメンテナの責任だということです。"
+"わけではありませんが、アーカイブメンテナを信頼するということになります。これ"
+"は、アーカイブの完全性が正しいことを保証するのは、アーカイブメンテナの責任だ"
+"ということです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -5889,15 +5701,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt-secure.8.xml:92
-#, fuzzy
-#| msgid ""
-#| "Once the uploaded package is verified and included in the archive, the "
-#| "maintainer signature is stripped off, an MD5 sum of the package is "
-#| "computed and put in the Packages file. The MD5 sum of all of the packages "
-#| "files are then computed and put into the Release file. The Release file "
-#| "is then signed by the archive key (which is created once a year and "
-#| "distributed through the FTP server. This key is also on the Debian "
-#| "keyring."
msgid ""
"Once the uploaded package is verified and included in the archive, the "
"maintainer signature is stripped off, an MD5 sum of the package is computed "
@@ -5906,12 +5709,11 @@ msgid ""
"by the archive key (which is created once a year) and distributed through "
"the FTP server. This key is also on the Debian keyring."
msgstr ""
-"アップロードされたパッケージごとに、検証してアーカイブに格納します。パッケー"
-"ジは、メンテナの署名をはがされ、MD5 sum を計算されて、Packages ファイルに格納"
-"されます。その後、全パッケージファイルの MD5 sum を計算してから、Release ファ"
-"イルに置きます。Release ファイルは、アーカイブキーで署名されます。アーカイブ"
-"キーは年ごとに作成され、FTP サーバで配布されます。このキーも Debian キーリン"
-"グに含まれます。"
+"アップロードされたパッケージが検証されてアーカイブに格納されると、メンテナの"
+"署名をはがし、パッケージの MD5 sum を計算して、Packages ファイルに格納しま"
+"す。その後、全パッケージファイルの MD5 sum を計算して、Release ファイルに格納"
+"します。Release ファイルは、(毎年作成される) アーカイブキーで署名され、FTP "
+"サーバで配布されます。このキーも Debian キーリングに含まれます。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -6037,49 +5839,36 @@ msgstr ""
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:160
-#, fuzzy
-#| msgid ""
-#| "<literal>Create a toplevel Release file</literal>. if it does not exist "
-#| "already. You can do this by running <command>apt-ftparchive release</"
-#| "command> (provided in apt-utils)."
msgid ""
"<emphasis>Create a toplevel Release file</emphasis>, if it does not exist "
"already. You can do this by running <command>apt-ftparchive release</"
"command> (provided in apt-utils)."
msgstr ""
-"<literal>最上位 Release ファイルの作成</literal>。既にこれが存在しているので"
-"なければ、<command>apt-ftparchive release</command> (apt-utils で提供) を実行"
-"して作成してください。"
+"<emphasis>最上位 Release ファイルの作成</emphasis>。既にこれが存在しているの"
+"でなければ、<command>apt-ftparchive release</command> (apt-utils で提供) を実"
+"行して作成してください。"
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:165
-#, fuzzy
-#| msgid ""
-#| "<literal>Sign it</literal>. You can do this by running <command>gpg -abs -"
-#| "o Release.gpg Release</command>."
msgid ""
"<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -"
"o Release.gpg Release</command>."
msgstr ""
-"<literal>署名</literal>します。<command>gpg -abs -o Release.gpg Release</"
+"<emphasis>署名</emphasis>します。<command>gpg -abs -o Release.gpg Release</"
"command> を実行して、署名してください。"
# type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#. type: Content of: <refentry><refsect1><itemizedlist><listitem><para>
#: apt-secure.8.xml:168
-#, fuzzy
-#| msgid ""
-#| "<literal>Publish the key fingerprint</literal>, that way your users will "
-#| "know what key they need to import in order to authenticate the files in "
-#| "the archive."
msgid ""
"<emphasis>Publish the key fingerprint</emphasis>, that way your users will "
"know what key they need to import in order to authenticate the files in the "
"archive."
msgstr ""
-"<literal>キーの指紋を配布</literal> これにより、アーカイブ内のファイル認証"
-"に、どのキーをインポートする必要があるかを、ユーザに知らせることになります。"
+"<emphasis>キーの指紋を配布</emphasis>します。これにより、アーカイブ内のファイ"
+"ル認証に、どのキーをインポートする必要があるかを、ユーザに知らせることになり"
+"ます。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -6209,12 +5998,6 @@ msgstr ""
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt.conf.5.xml:13
-#, fuzzy
-#| msgid ""
-#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-"
-#| "email; &apt-product; <date>10 December 2008</date>"
msgid ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
@@ -6222,9 +6005,9 @@ msgid ""
"&apt-product; <date>16 January 2010</date>"
msgstr ""
"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</"
-"firstname> <surname>Burrows</surname> <contrib>Initial documentation of "
-"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; "
-"&apt-product; <date>10 December 2008</date>"
+"firstname> <surname>Burrows</surname> <contrib>Debug::*. の最初のドキュメント"
+"</contrib> <email>dburrows@debian.org</email> </author> &apt-email; &apt-"
+"product; <date>16 January 2010</date>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
@@ -6251,20 +6034,24 @@ msgid ""
"made. All tools therefore share the configuration files and also use a "
"common command line parser to provide a uniform environment."
msgstr ""
+"<filename>apt.conf</filename> は、APT ツールスイートのメイン設定ファイルです"
+"が、間違いなくオプションの変更を指定するだけの場所などではありません。そのた"
+"め、すべてのツールは設定ファイルを共有し、統一環境を提供するため、共通のコマ"
+"ンドラインパーサも使用します。"
#. type: Content of: <refentry><refsect1><orderedlist><para>
#: apt.conf.5.xml:45
msgid ""
"When an APT tool starts up it will read the configuration files in the "
"following order:"
-msgstr ""
+msgstr "APT ツールの起動時に、設定ファイルを以下の順番で読み込みます。"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:47
msgid ""
"the file specified by the <envar>APT_CONFIG</envar> environment variable (if "
"any)"
-msgstr ""
+msgstr "<envar>APT_CONFIG</envar> 環境変数で指定したファイル (存在する場合)"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:49
@@ -6274,17 +6061,17 @@ msgid ""
"which only contain alphanumeric, hyphen (-), underscore (_) and period (.) "
"characters - otherwise they will be silently ignored."
msgstr ""
+"<literal>Dir::Etc::Parts</literal> にあるすべてのファイルを英数字の昇順に。"
+"ファイル名には拡張子がないか、\"<literal>conf</literal>\" となっており、英数"
+"字、ハイフン (-)、アンダースコア (_)、ピリオド (.) で構成されています。そうで"
+"なければ、黙って無視されます。"
# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:54
-#, fuzzy
-#| msgid ""
-#| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</"
-#| "literal>."
msgid ""
"the main configuration file specified by <literal>Dir::Etc::main</literal>"
-msgstr "APT 設定ファイル。設定項目 - <literal>Dir::Etc::Main</literal>"
+msgstr "<literal>Dir::Etc::Main</literal> で指定される、メイン設定ファイル"
#. type: Content of: <refentry><refsect1><orderedlist><listitem><para>
#: apt.conf.5.xml:56
@@ -6292,22 +6079,17 @@ msgid ""
"the command line options are applied to override the configuration "
"directives or to load even more configuration files."
msgstr ""
+"コマンドラインオプションにより、設定ディレクティブの上書きや設定ファイルの追"
+"加読み込みができます。"
#. type: Content of: <refentry><refsect1><title>
#: apt.conf.5.xml:60
msgid "Syntax"
-msgstr ""
+msgstr "構文"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The configuration file is organized in a tree with options organized into "
-#| "functional groups. option specification is given with a double colon "
-#| "notation, for instance <literal>APT::Get::Assume-Yes</literal> is an "
-#| "option within the APT tool group, for the Get tool. options do not "
-#| "inherit from their parent groups."
msgid ""
"The configuration file is organized in a tree with options organized into "
"functional groups. Option specification is given with a double colon "
@@ -6316,22 +6098,13 @@ msgid ""
"their parent groups."
msgstr ""
"設定ファイルは、機能グループごとに系統立てられたオプションを木構造で表しま"
-"す。オプションの内容は、2 つのコロンで区切ります。例えば <literal>APT::Get::"
+"す。オプションの指定は、2 つのコロンで区切ります。例えば <literal>APT::Get::"
"Assume-Yes</literal> は、APT ツールグループの Get ツール用オプションです。オ"
"プションは、親グループから継承しません。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:67
-#, fuzzy
-#| msgid ""
-#| "Syntactically the configuration language is modeled after what the ISC "
-#| "tools such as bind and dhcp use. Lines starting with <literal>//</"
-#| "literal> are treated as comments (ignored), as well as all text between "
-#| "<literal>/*</literal> and <literal>*/</literal>, just like C/C++ "
-#| "comments. Each line is of the form <literal>APT::Get::Assume-Yes \"true"
-#| "\";</literal> The trailing semicolon is required and the quotes are "
-#| "optional. A new scope can be opened with curly braces, like:"
msgid ""
"Syntactically the configuration language is modeled after what the ISC tools "
"such as bind and dhcp use. Lines starting with <literal>//</literal> are "
@@ -6345,13 +6118,15 @@ msgid ""
"alphanumerical characters and the \"/-:._+\" characters. A new scope can be "
"opened with curly braces, like:"
msgstr ""
-"設定言語の文法は、bind や dhcp のような ISC ツールをモデルにしています。"
+"設定言語の構文は、bind や dhcp のような ISC ツールをモデルにしています。"
"<literal>//</literal> で始まる行はコメントとして扱われます (無視)。同様に C/C"
"++ のコメントのような <literal>/*</literal> と <literal>*/</literal> の間もコ"
"メントとして扱います。いずれの行も、<literallayout>APT::Get::Assume-Yes "
-"\"true\";</literallayout> のような形式です。行末のセミコロンは必要ですが、ダ"
-"ブルクォートは使わなくてもかまいません。以下のように中カッコを使うと、新しい"
-"スコープを開くことができます。"
+"\"true\";</literallayout> のような形式です。行末のセミコロンとクォートは必要"
+"です。値は1行でなければならず、文字列結合はありません。値の中にクォートは使え"
+"ません。値中のバックスラッシュ \"\\\" とエスケープ文字は、未定義で使用するべ"
+"きではありません。オプション名は、英数字と \"/-:._+\" が使用できます。以下の"
+"ように中カッコを使うと、新しいスコープを開くことができます。"
# type: Content of: <refentry><refsect1><informalexample><programlisting>
#. type: Content of: <refentry><refsect1><informalexample><programlisting>
@@ -6389,7 +6164,9 @@ msgstr ""
#: apt.conf.5.xml:94
#, no-wrap
msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
-msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
+msgstr ""
+"DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n"
+"\n"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -6419,18 +6196,15 @@ msgid ""
"list. If you specify a name you can override the option as every other "
"option by reassigning a new value to the option."
msgstr ""
+"前述した <literal>DPkg::Pre-Install-Pkgs</literal> の例で見られるように、リス"
+"トを定義した場合、設定項目名はオプションになります。名前を指定しない場合、新"
+"しいエントリは、単純に新しいオプションをリストに追加します。名前を指定する"
+"と、あらゆる他の選択肢をオプションに再割り当てし、オプションを上書きできま"
+"す。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:109
-#, fuzzy
-#| msgid ""
-#| "Two specials are allowed, <literal>#include</literal> and "
-#| "<literal>#clear</literal> <literal>#include</literal> will include the "
-#| "given file, unless the filename ends in a slash, then the whole directory "
-#| "is included. <literal>#clear</literal> is used to erase a part of the "
-#| "configuration tree. The specified element and all its descendents are "
-#| "erased."
msgid ""
"Two specials are allowed, <literal>#include</literal> (which is deprecated "
"and not supported by alternative implementations) and <literal>#clear</"
@@ -6440,11 +6214,13 @@ msgid ""
"The specified element and all its descendants are erased. (Note that these "
"lines also need to end with a semicolon.)"
msgstr ""
-"<literal>#include</literal> と <literal>#clear</literal> の 2 つの特別な記法"
-"があります。<literal>#include</literal> は指定したファイルを取り込みます。"
-"ファイル名がスラッシュで終わった場合には、そのディレクトリをすべて取り込みま"
-"す。<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。"
-"指定した要素と、それ以下の要素を削除します。"
+"<literal>#include</literal> (これは廃止予定でサポートしない他の実装もありま"
+"す) と <literal>#clear</literal> の 2 つの特別な記法があります。"
+"<literal>#include</literal> は指定したファイルを取り込みます。ファイル名がス"
+"ラッシュで終わった場合には、そのディレクトリをすべて取り込みます。"
+"<literal>#clear</literal> は、設定ツリーの一部を削除するにに使用します。指定"
+"した要素と、それ以下の要素を削除します (これらの行も、セミコロンで終わる必要"
+"があることに注意してください)。"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:117
@@ -6455,17 +6231,14 @@ msgid ""
"overridden by addressing a new value to it - lists and scopes can't be "
"overridden, only cleared."
msgstr ""
+"#clear コマンドは、リストや完全なスコープを削除する唯一の方法です。スコープの"
+"再オープンや後述する :: スタイルは、それまで書いたエントリを<emphasis>上書き"
+"しません</emphasis>。新しい値を与えて上書きするしかありません。リストやスコー"
+"プは上書きできません。クリアされるだけです。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:122
-#, fuzzy
-#| msgid ""
-#| "All of the APT tools take a -o option which allows an arbitrary "
-#| "configuration directive to be specified on the command line. The syntax "
-#| "is a full option name (<literal>APT::Get::Assume-Yes</literal> for "
-#| "instance) followed by an equals sign then the new value of the option. "
-#| "Lists can be appended too by adding a trailing :: to the list name."
msgid ""
"All of the APT tools take a -o option which allows an arbitrary "
"configuration directive to be specified on the command line. The syntax is a "
@@ -6474,10 +6247,11 @@ msgid ""
"appended too by adding a trailing :: to the list name. (As you might "
"suspect: The scope syntax can't be used on the command line.)"
msgstr ""
-"すべての APT ツールで、コマンドラインで任意の設定を行う -o オプションが使用で"
-"きます。文法は、完全なオプション名 (例: <literal>APT::Get::Assume-Yes</"
-"literal>)、等号、続いてオプションの新しい値となります。リスト名に続き::を加え"
-"ることで、リストを追加することができます。"
+"すべての APT ツールで、コマンドラインで任意の設定ディレクティブを指定できる -"
+"o オプションが使用できます。構文は、完全なオプション名 (例: <literal>APT::"
+"Get::Assume-Yes</literal>)、等号、続いてオプションの新しい値となります。リス"
+"ト名に続き :: を加えることで、リストを追加できます (疑問に思われたように、ス"
+"コープ構文はコマンドラインで使用できません)。"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:129
@@ -6495,6 +6269,16 @@ msgid ""
"correct such statements now as long as APT doesn't complain explicit about "
"them."
msgstr ""
+"1 行で 1 項目の場合にのみ :: は使用でき、スコープ構文と組み合わせるべきではな"
+"いことに注意してください (スコープ構文には暗黙で :: が挿入されます)。両方の構"
+"文を同時に使用すると、「他のオプションと同様に名前と共に動作する、普通ではな"
+"い名前 \"<literal>::</literal>\" のオプションである」といった、(残念なこと"
+"に) 複数のユーザに渡るバグの引き金になります。問題の中には、リストに追加しよ"
+"うと<emphasis>誤った</emphasis>構文で複数行書くユーザが、このオプション "
+"\"<literal>::</literal>\" を最後に割り当てようとして、正反対の結果を得るとい"
+"うことも含まれます。APT の次期バージョンでは、この誤用を検出すると、動作を停"
+"止しエラーを上げるようになります。そのため、APT がこの件で明白にエラーを吐か"
+"ない限りは、自分でそのような構文を修正してください。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
@@ -6538,12 +6322,6 @@ msgstr "Default-Release"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:153
-#, fuzzy
-#| msgid ""
-#| "Default release to install packages from if more than one version "
-#| "available. Contains release name, codename or release version. Examples: "
-#| "'stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See "
-#| "also &apt-preferences;."
msgid ""
"Default release to install packages from if more than one version available. "
"Contains release name, codename or release version. Examples: 'stable', "
@@ -6551,9 +6329,9 @@ msgid ""
"'5.0*'. See also &apt-preferences;."
msgstr ""
"ひとつ以上のバージョンがある場合に、パッケージをインストールを行うデフォルト"
-"リリースです。リリース名や、コード名、リリースバージョンです。例えば "
-"stable', 'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*' となりま"
-"す。 &apt-preferences; も参照してください。"
+"リリースです。リリース名や、コード名、リリースバージョンがあります。例えば "
+"'stable', 'testing', 'unstable', '&stable-codename;', '&testing-codename;', "
+"'4.0', '5.0*' となります。&apt-preferences; も参照してください。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:158
@@ -6629,6 +6407,29 @@ msgid ""
"distribution and to the APT team with the buglink below so they can work on "
"improving or correcting the upgrade process."
msgstr ""
+"デフォルトで有効で、インストールやアップグレード処理中に、APT が不可欠パッ"
+"ケージや重要パッケージのインストールを、可能な限り早く行うようになります。"
+"&dpkg; の呼び出す際の失敗回数に制限があるため、このようなオプションがありま"
+"す。このオプションが無効の場合、APT は重要パッケージを、特別パッケージと同様"
+"に扱うようになります。重要パッケージ A を展開していて、その設定中に他の展開や"
+"設定をたくさん呼び出すと、パッケージ B は A とはなんの関係もないにもかかわら"
+"ず、dpkg の呼び出しが失敗します (つまり B のメンテナスクリプトがエラーを返し"
+"ます)。この結果、システムの状態として、パッケージ A は展開済みで未設定となり"
+"ます。A に依存するパッケージは、動作の保証がなくなり、A に対する依存関係は、"
+"もう満たせなくなります。 即時設定マーカは、たとえば環状の依存関係といった問題"
+"が発生しそうな、すべての依存関係に先行依存と同等の即時フラグを適用します。そ"
+"のため理論上では、APT が即時設定できない、エラーが発生する、このオプションを"
+"参照するといった状況になる可能性があるのは、ユーザが即時設定を一時的に無効に"
+"して、インストールやアップグレードを行った場合です。「理論上」と言う単語を"
+"使ったのは、現在現実世界でこの問題に遭遇したのは、不安定版を使用しており、問"
+"題になっていたパッケージの間違った依存関係が原因だったり、システムが既に破損"
+"状態であったりした数回だけだからです。前述のシナリオが、即時設定が主に回避す"
+"る問題のすべてというわけではないため、このオプションを闇雲に無効にするべきで"
+"はありません。<literal>dist-upgrade</literal> のような大きな操作を、このオプ"
+"ションを無効にして行う前に、APT がすぐに設定できないパッケージを、明示的に "
+"<literal>install</literal> してみてください。ですが、アップグレードプロセスの"
+"改善のため、バグのリンクにあるディストリビューションと APT チームにも、問題の"
+"レポートをおねがいします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:193
@@ -6744,7 +6545,7 @@ msgstr "Acquire グループ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:244
msgid "Check-Valid-Until"
-msgstr ""
+msgstr "Check-Valid-Until"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:245
@@ -6761,7 +6562,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:255
msgid "Max-ValidTime"
-msgstr ""
+msgstr "Max-ValidTime"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:256
@@ -6802,6 +6603,11 @@ msgid ""
"the size of the targeted file. If one of these limits is exceeded the "
"complete file is downloaded instead of the patches."
msgstr ""
+"PDiffs の使用を制限するふたつのサブオプションがあります。<literal>FileLimit</"
+"literal> では、PDiff ファイルをいくつダウンロードしてパッチを当てるかを指定し"
+"ます。一方、<literal>SizeLimit</literal> は、対象ファイルのサイズに対して、全"
+"パッチサイズの最大パーセンテージを指定します。どちらの制限を超えても、パッチ"
+"をダウンロードする代わりに、完全なファイルをダウンロードします。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:281
@@ -6864,14 +6670,6 @@ msgstr "http"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:300
-#, fuzzy
-#| msgid ""
-#| "HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
-#| "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. "
-#| "Per host proxies can also be specified by using the form <literal>http::"
-#| "Proxy::&lt;host&gt;</literal> with the special keyword <literal>DIRECT</"
-#| "literal> meaning to use no proxies. The <envar>http_proxy</envar> "
-#| "environment variable will override all settings."
msgid ""
"HTTP URIs; http::Proxy is the default http proxy to use. It is in the "
"standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per "
@@ -6884,8 +6682,8 @@ msgstr ""
"<literal>http://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
"す。ホストごとのプロキシの場合は、<literal>http::Proxy::&lt;host&gt;</"
"literal> という形と、プロキシを使用しないという意味の特殊キーワード "
-"<literal>DIRECT</literal> を使用して指定することもできます。すべての設定は、"
-"環境変数 <envar>http_proxy</envar> で上書きされます。"
+"<literal>DIRECT</literal> を使用して指定することもできます。上記の設定をなに"
+"も指定しないと、環境変数 <envar>http_proxy</envar> を使用します。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -6927,15 +6725,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:321
-#, fuzzy
-#| msgid ""
-#| "One setting is provided to control the pipeline depth in cases where the "
-#| "remote server is not RFC conforming or buggy (such as Squid 2.0.2) "
-#| "<literal>Acquire::http::Pipeline-Depth</literal> can be a value from 0 to "
-#| "5 indicating how many outstanding requests APT should send. A value of "
-#| "zero MUST be specified if the remote host does not properly linger on TCP "
-#| "connections - otherwise data corruption will occur. Hosts which require "
-#| "this are in violation of RFC 2068."
msgid ""
"One setting is provided to control the pipeline depth in cases where the "
"remote server is not RFC conforming or buggy (such as Squid 2.0.2). "
@@ -6962,6 +6751,10 @@ msgid ""
"bandwidth (Note that this option implicit deactivates the download from "
"multiple servers at the same time.)"
msgstr ""
+"使用する帯域を制限するには、<literal>Acquire::http::Dl-Limit</literal> にキロ"
+"バイトで整数値を与えます。デフォルト値は 0 で、制限を解除し、使用できる帯域を"
+"すべて使おうとします (このオプションは暗黙的に、同時に複数のサーバからダウン"
+"ロードしなくなることに注意してください)。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:334
@@ -6970,6 +6763,9 @@ msgid ""
"User-Agent for the http download method as some proxies allow access for "
"clients only if the client uses a known identifier."
msgstr ""
+"クライアントが既知の識別子を使用する場合にのみ、プロキシがアクセスを許可する"
+"場合、<literal>Acquire::http::User-Agent</literal> を使用して、http でダウン"
+"ロードするための、異なる User-Agent を設定できます。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
@@ -6979,11 +6775,6 @@ msgstr "https"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:341
-#, fuzzy
-#| msgid ""
-#| "HTTPS URIs. Cache-control and proxy options are the same as for "
-#| "<literal>http</literal> method. <literal>Pipeline-Depth</literal> option "
-#| "is not supported yet."
msgid ""
"HTTPS URIs. Cache-control, Timeout, AllowRedirect, Dl-Limit and proxy "
"options are the same as for <literal>http</literal> method and will also "
@@ -6991,9 +6782,11 @@ msgid ""
"not explicitly set for https. <literal>Pipeline-Depth</literal> option is "
"not supported yet."
msgstr ""
-"HTTPS URI - キャッシュの制御やプロキシオプションは <literal>http</literal> メ"
-"ソッドと同様です。<literal>Pipeline-Depth</literal> オプションはまだサポート"
-"していません。"
+"HTTPS URI - キャッシュ制御、タイムアウト、AllowRedirect、Dl-Limit、プロキシオ"
+"プションは <literal>http</literal> メソッドと同様です。また、https 用に明示的"
+"に設定されない場合、オプションのデフォルト値は <literal>http</literal> メソッ"
+"ドと同じです。<literal>Pipeline-Depth</literal> オプションはまだサポートして"
+"いません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:347
@@ -7015,6 +6808,21 @@ msgid ""
"<literal>&lt;host&gt;::SslForceVersion</literal> is corresponding per-host "
"option."
msgstr ""
+"<literal>CaInfo</literal> サブオプションは、信頼済み証明書情報の保持場所を指"
+"定します。<literal>&lt;host&gt;::CaInfo</literal> は、対応するホストごとのオ"
+"プションです。<literal>Verify-Peer</literal> 真偽値サブオプションは、信頼済み"
+"証明書に対してサーバのホスト証明書を、検証するかどうかを決定します。"
+"<literal>&lt;host&gt;::Verify-Peer</literal> は、対応するホストごとのオプショ"
+"ンです。<literal>Verify-Host</literal> 真偽値サブオプションは、サーバのホスト"
+"名を検証するかどうかを決定します。<literal>&lt;host&gt;::Verify-Host</"
+"literal> は、対応するホストごとのオプションです。<literal>SslCert</literal> "
+"は、クライアント認証に使用する証明書を決定します。<literal>&lt;host&gt;::"
+"SslCert</literal> は、対応するホストごとのオプションです。<literal>SslKey</"
+"literal> は、クライアント認証に使用する秘密鍵を決定します。<literal>&lt;"
+"host&gt;::SslKey</literal> は、対応するホストごとのオプションです。"
+"<literal>SslForceVersion</literal> は、デフォルトで使用する SSL のバージョン"
+"を上書きします。'TLSv1' か 'SSLv3' という文字列を指定できます。<literal>&lt;"
+"host&gt;::SslForceVersion</literal> は、対応するホストごとのオプションです。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
@@ -7025,19 +6833,6 @@ msgstr "ftp"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:366
-#, fuzzy
-#| msgid ""
-#| "FTP URIs; ftp::Proxy is the default proxy server to use. It is in the "
-#| "standard form of <literal>ftp://[[user][:pass]@]host[:port]/</literal> "
-#| "and is overridden by the <envar>ftp_proxy</envar> environment variable. "
-#| "To use a ftp proxy you will have to set the <literal>ftp::ProxyLogin</"
-#| "literal> script in the configuration file. This entry specifies the "
-#| "commands to send to tell the proxy server what to connect to. Please see "
-#| "&configureindex; for an example of how to do this. The substitution "
-#| "variables available are <literal>$(PROXY_USER)</literal> <literal>"
-#| "$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> <literal>"
-#| "$(SITE_PASS)</literal> <literal>$(SITE)</literal> and <literal>"
-#| "$(SITE_PORT)</literal> Each is taken from it's respective URI component."
msgid ""
"FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard "
"form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host "
@@ -7055,15 +6850,18 @@ msgid ""
"respective URI component."
msgstr ""
"FTP URI - ftp::Proxy は、デフォルトで使用するプロキシサーバです。"
-"<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表します"
-"が、環境変数 <envar>ftp_proxy</envar> で上書きされます。ftp プロキシを使用す"
-"るには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプトを設定す"
-"る必要があります。接続する際にプロキシサーバに送信するコマンドをこのエントリ"
-"に設定します。どのようにするのかは &configureindex; の例を参照してください。"
-"その他にも、<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</"
+"<literal>ftp://[[user][:pass]@]host[:port]/</literal> という標準形で表しま"
+"す。ホストごとのプロキシの場合は、<literal>ftp::Proxy::&lt;host&gt;</"
+"literal> という形と、プロキシを使用しないという意味の特殊キーワード "
+"<literal>DIRECT</literal> を使用して指定することもできます。上記の設定をなに"
+"も指定しないと、環境変数 <envar>ftp_proxy</envar> を使用します。ftp プロキシ"
+"を使用するには、設定ファイルに <literal>ftp::ProxyLogin</literal> スクリプト"
+"を設定する必要があります。接続する際にプロキシサーバに送信するコマンドをこの"
+"エントリに設定します。どのようにするのかは &configureindex; の例を参照してく"
+"ださい。その他にも、<literal>$(PROXY_USER)</literal> <literal>$(PROXY_PASS)</"
"literal> <literal>$(SITE_USER)</literal> <literal>$(SITE_PASS)</literal> "
-"<literal>$(SITE)</literal> and <literal>$(SITE_PORT)</literal> が利用可能で"
-"す。いずれも、それぞれ URI を構成するトークンです。"
+"<literal>$(SITE)</literal> <literal>$(SITE_PORT)</literal> が代わりに利用可能"
+"です。いずれも、それぞれ URI を構成するトークンです。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -7091,8 +6889,8 @@ msgid ""
"it is not recommended to use FTP over HTTP due to its low efficiency."
msgstr ""
"環境変数 <envar>ftp_proxy</envar> の http url により FTP over HTTP のプロキシ"
-"が利用可能になります。文法は上の http についての説明を参照してください。設定"
-"ファイルの中でこれをセットすることはできません。また、効率が悪いため FTP "
+"が利用可能になります。構文は前述の http についての説明を参照してください。設"
+"定ファイルの中でこれをセットすることはできません。また、効率が悪いため FTP "
"over HTTP を使用するのは推奨しません。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -7120,10 +6918,9 @@ msgstr "cdrom"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml:410
-#, fuzzy, no-wrap
-#| msgid "\"/cdrom/\"::Mount \"foo\";"
+#, no-wrap
msgid "/cdrom/::Mount \"foo\";"
-msgstr "\"/cdrom/\"::Mount \"foo\";"
+msgstr "/cdrom/::Mount \"foo\";"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -7142,7 +6939,7 @@ msgstr ""
"fstab</filename> で設定されているように、CDROM ドライブのマウントポイントを "
"<literal>cdrom::Mount</literal> に設定しなければなりません。(SMB マウントや古"
"い mount パッケージなど) マウントポイントが fstab に記述できない場合、かわり"
-"にマウント・アンマウントコマンドも使用できます。文法は、cdrom ブロックを "
+"にマウント・アンマウントコマンドも使用できます。構文は、cdrom ブロックを "
"<placeholder type=\"literallayout\" id=\"0\"/> の形で記述します。スラッシュを"
"後につけるのが重要です。アンマウントコマンドは UMount で指定することができま"
"す。"
@@ -7167,13 +6964,13 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:421
msgid "CompressionTypes"
-msgstr ""
+msgstr "CompressionTypes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml:427
#, no-wrap
msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:422
@@ -7186,18 +6983,24 @@ msgid ""
"the fly or the used method can be changed. The syntax for this is: "
"<placeholder type=\"synopsis\" id=\"0\"/>"
msgstr ""
+"acquire メソッドが理解できる、圧縮法のリストです。<filename>Packages</"
+"filename> のようなファイルは、さまざまな圧縮形式が利用できます。デフォルト "
+"acquire メソッドごとに、<command>bzip2</command>, <command>lzma</command>, "
+"<command>gzip</command> で圧縮されたファイルを伸張できます。この設定では、よ"
+"り多くの形式を、オンザフライで追加したり、使用するメソッドで変更したりできま"
+"す。構文は以下のようになります。<placeholder type=\"synopsis\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml:432
#, no-wrap
msgid "Acquire::CompressionTypes::Order:: \"gz\";"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order:: \"gz\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis>
#: apt.conf.5.xml:435
#, no-wrap
msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
-msgstr ""
+msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:428
@@ -7215,12 +7018,23 @@ msgid ""
"<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add "
"<literal>bz2</literal> explicit to the list as it will be added automatic."
msgstr ""
+"また、<literal>Order</literal> サブグループを使用して、取得システムが圧縮ファ"
+"イルのダウンロードを試みる順番を、定義できます。取得システムは先頭のものを試"
+"行し、エラーが発生すると次の圧縮タイプのダウンロードを開始します。そのため、"
+"どれかを他のものより優先したい場合、単にそのタイプを先頭に追加してください。"
+"まだ追加していないデフォルトタイプは、実行時にリストの最後に追加されます。つ"
+"まり、<placeholder type=\"synopsis\" id=\"0\"/> とすると、<command>gzip</"
+"command> で圧縮されたファイルを <command>bzip2</command> や <command>lzma</"
+"command> よりも優先的に使用します。もし <command>lzma</command> を "
+"<command>gzip</command> や <command>bzip2</command> よりも優先するべきなら、"
+"設定を以下のようにしてください。<placeholder type=\"synopsis\" id=\"1\"/> "
+"<literal>bz2</literal> は自動的に追加されるため、明示する必要はありません。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml:439
#, no-wrap
msgid "Dir::Bin::bzip2 \"/bin/bzip2\";"
-msgstr ""
+msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:437
@@ -7236,6 +7050,15 @@ msgid ""
"will not override the defined list, it will only prefix the list with this "
"type."
msgstr ""
+"実行時に <literal>Dir::Bin::<replaceable>Methodname</replaceable></literal> "
+"をチェックすることに注意してください。この設定があると、ファイルがある場合"
+"に、この方法しか使われなくなります。例えば、bzip2 メソッド (内蔵) の設定は以"
+"下になります。<placeholder type=\"literallayout\" id=\"0\"/> また、コマンドラ"
+"インに指定した一覧のエントリは設定ファイルに指定したものの後、デフォルトエン"
+"トリの前に追加されることに注意してください。この場合、設定ファイルに指定した"
+"内容よりも前に指定するには、オプションを直接 (一覧スタイルでなく) 指定してく"
+"ださい。これにより定義された一覧が上書きされ、このタイプのもののみ定義されま"
+"す。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:444
@@ -7246,14 +7069,17 @@ msgid ""
"time false negatives. Future versions will maybe include a way to really "
"prefer uncompressed files to support the usage of local mirrors."
msgstr ""
+"順序リストに空の圧縮タイプを追加できますが、最新版の APT では正しく解釈でき"
+"ず、ファイルをダウンロードできないと言う警告を大量に表示することになります "
+"(この警告はたいてい見逃してしまいます)。将来のバージョンでは、ローカルミラー"
+"の利用をサポートするため、非圧縮ファイルを使用する方法が追加されるかもしれま"
+"せん。"
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:450
-#, fuzzy
-#| msgid "IndexType"
msgid "GzipIndexes"
-msgstr "IndexType"
+msgstr "GzipIndexes"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:452
@@ -7267,7 +7093,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: apt.conf.5.xml:459
msgid "Languages"
-msgstr ""
+msgstr "Languages"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:460
@@ -7286,7 +7112,7 @@ msgstr ""
#: apt.conf.5.xml:476
#, no-wrap
msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
-msgstr ""
+msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:466
@@ -7400,14 +7226,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:511
-#, fuzzy
-#| msgid ""
-#| "Binary programs are pointed to by <literal>Dir::Bin</literal>. "
-#| "<literal>Dir::Bin::Methods</literal> specifies the location of the method "
-#| "handlers and <literal>gzip</literal>, <literal>dpkg</literal>, "
-#| "<literal>apt-get</literal> <literal>dpkg-source</literal> <literal>dpkg-"
-#| "buildpackage</literal> and <literal>apt-cache</literal> specify the "
-#| "location of the respective programs."
msgid ""
"Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::"
"Bin::Methods</literal> specifies the location of the method handlers and "
@@ -7418,9 +7236,10 @@ msgid ""
msgstr ""
"バイナリプログラムは <literal>Dir::Bin</literal> で指定します。<literal>Dir::"
"Bin::Methods</literal> はメソッドハンドラの場所を指定し、<literal>gzip</"
-"literal>, <literal>dpkg</literal>, <literal>apt-get</literal>, <literal>dpkg-"
-"source</literal>, <literal>dpkg-buildpackage</literal>, <literal>apt-cache</"
-"literal> はそれぞれプログラムの場所を指定します。"
+"literal>, <literal>bzip2</literal>, <literal>lzma</literal>, <literal>dpkg</"
+"literal>, <literal>apt-get</literal> <literal>dpkg-source</literal> "
+"<literal>dpkg-buildpackage</literal>, <literal>apt-cache</literal> はそれぞれ"
+"プログラムの場所を指定します。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -7658,7 +7477,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt.conf.5.xml:616
msgid "dpkg trigger usage (and related options)"
-msgstr ""
+msgstr "dpkg トリガの使い方 (および関連オプション)"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt.conf.5.xml:617
@@ -7684,6 +7503,10 @@ msgid ""
"DPkg::ConfigurePending \"true\";\n"
"DPkg::TriggersPending \"true\";"
msgstr ""
+"DPkg::NoTriggers \"true\";\n"
+"PackageManager::Configure \"smart\";\n"
+"DPkg::ConfigurePending \"true\";\n"
+"DPkg::TriggersPending \"true\";"
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt.conf.5.xml:626
@@ -7702,7 +7525,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt.conf.5.xml:638
msgid "DPkg::NoTriggers"
-msgstr ""
+msgstr "DPkg::NoTriggers"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:639
@@ -7719,10 +7542,8 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt.conf.5.xml:646
-#, fuzzy
-#| msgid "Packages::Compress"
msgid "PackageManager::Configure"
-msgstr "Packages::Compress"
+msgstr "PackageManager::Configure"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:647
@@ -7743,9 +7564,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt.conf.5.xml:657
-#, fuzzy
msgid "DPkg::ConfigurePending"
-msgstr "ユーザの設定"
+msgstr "DPkg::ConfigurePending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:658
@@ -7761,7 +7581,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt.conf.5.xml:664
msgid "DPkg::TriggersPending"
-msgstr ""
+msgstr "DPkg::TriggersPending"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:665
@@ -7776,7 +7596,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt.conf.5.xml:670
msgid "PackageManager::UnpackAll"
-msgstr ""
+msgstr "PackageManager::UnpackAll"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:671
@@ -7793,7 +7613,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term>
#: apt.conf.5.xml:678
msgid "OrderList::Score::Immediate"
-msgstr ""
+msgstr "OrderList::Score::Immediate"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout>
#: apt.conf.5.xml:686
@@ -7806,6 +7626,12 @@ msgid ""
"\tPreDepends 50;\n"
"};"
msgstr ""
+"OrderList::Score {\n"
+"\tDelete 500;\n"
+"\tEssential 200;\n"
+"\tImmediate 10;\n"
+"\tPreDepends 50;\n"
+"};"
#. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:679
@@ -7884,6 +7710,8 @@ msgid ""
"<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each "
"time that <literal>apt</literal> invokes &dpkg;."
msgstr ""
+"<literal>Debug::pkgDPkgPM</literal> は <literal>apt</literal> が実際に "
+"&dpkg; を起動する際の各コマンドラインを表示します。"
#. TODO: provide a
#. motivating example, except I haven't a clue why you'd want
@@ -7894,11 +7722,13 @@ msgid ""
"<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data "
"in CDROM IDs."
msgstr ""
+"<literal>Debug::IdentCdrom</literal> は CDROM ID にある statfs データの方gain"
+"を無効にします。"
#. type: Content of: <refentry><refsect1><para>
#: apt.conf.5.xml:756
msgid "A full list of debugging options to apt follows."
-msgstr ""
+msgstr "以下は apt に対するデバッグオプションのすべてです。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:761
@@ -7966,6 +7796,8 @@ msgid ""
"Output information about the process of accessing collections of packages "
"stored on CD-ROMs."
msgstr ""
+"CD-ROM にあるパッケージ集合に対して、アクセスするプロセスについての情報を出力"
+"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:827
@@ -7975,7 +7807,7 @@ msgstr "<literal>Debug::BuildDeps</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:830
msgid "Describes the process of resolving build-dependencies in &apt-get;."
-msgstr ""
+msgstr "&apt-get; での構築依存関係解決のプロセスを説明します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:837
@@ -7988,6 +7820,7 @@ msgid ""
"Output each cryptographic hash that is generated by the <literal>apt</"
"literal> libraries."
msgstr ""
+"<literal>apt</literal> ライブラリが生成した、暗号化ハッシュを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:847
@@ -8001,6 +7834,8 @@ msgid ""
"of used and free blocks on the CD-ROM filesystem, when generating an ID for "
"a CD-ROM."
msgstr ""
+"CD-ROM の ID を生成する際に <literal>statfs</literal> という、CD-ROM ファイル"
+"システムにある使用済・未使用ブロックの数からの情報を含めないようにします。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:858
@@ -8013,6 +7848,8 @@ msgid ""
"Disable all file locking. For instance, this will allow two instances of "
"<quote><literal>apt-get update</literal></quote> to run at the same time."
msgstr ""
+"ファイルのロックをすべて無効にします。例えば、同時にふたつの "
+"<quote><literal>apt-get update</literal></quote> を実行できるようになります。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:869
@@ -8023,6 +7860,7 @@ msgstr "<literal>Debug::pkgAcquire</literal>"
#: apt.conf.5.xml:873
msgid "Log when items are added to or removed from the global download queue."
msgstr ""
+"グローバルダウンロードキューに対する項目の追加・削除の際にログを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:880
@@ -8035,6 +7873,8 @@ msgid ""
"Output status messages and errors related to verifying checksums and "
"cryptographic signatures of downloaded files."
msgstr ""
+"ダウンロードしたファイルのチェックサムや暗号署名の確認に関する、状態メッセー"
+"ジやエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:890
@@ -8047,6 +7887,8 @@ msgid ""
"Output information about downloading and applying package index list diffs, "
"and errors relating to package index list diffs."
msgstr ""
+"パッケージインデックスリスト差分のダウンロード・適用時の、情報やエラーを出力"
+"します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:901
@@ -8059,6 +7901,8 @@ msgid ""
"Output information related to patching apt package lists when downloading "
"index diffs instead of full indices."
msgstr ""
+"インデックス全体ではなくインデックス差分のダウンロードの際に、apt パッケージ"
+"リストへのパッチ適用に関する情報を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:912
@@ -8070,6 +7914,7 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>"
msgid ""
"Log all interactions with the sub-processes that actually perform downloads."
msgstr ""
+"実際のダウンロードを行う際の、サブプロセスとのやりとりをログに出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:923
@@ -8082,6 +7927,8 @@ msgid ""
"Log events related to the automatically-installed status of packages and to "
"the removal of unused packages."
msgstr ""
+"パッケージの自動インストールや、不要パッケージの削除に関するイベントを、ログ"
+"に出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:934
@@ -8097,6 +7944,11 @@ msgid ""
"to the full <literal>apt</literal> dependency resolver; see <literal>Debug::"
"pkgProblemResolver</literal> for that."
msgstr ""
+"依存関係解決のために、どのパッケージが自動的にインストールされたかのデバッグ"
+"メッセージを生成します。これは完全な <literal>apt</literal> 依存関係解決プロ"
+"グラム (<literal>Debug::pkgProblemResolver</literal> を参照) ではなく、例え"
+"ば <literal>apt-get install</literal> で実行された、初期の自動インストール経"
+"路に対応しています。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:948
@@ -8128,7 +7980,7 @@ msgstr "<literal>Debug::pkgInitConfig</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:973
msgid "Dump the default configuration to standard error on startup."
-msgstr ""
+msgstr "起動時に、標準エラー出力へデフォルト設定を出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:980
@@ -8141,6 +7993,8 @@ msgid ""
"When invoking &dpkg;, output the precise command line with which it is being "
"invoked, with arguments separated by a single space character."
msgstr ""
+"&dpkg; 起動時に、起動した際の正確なコマンドラインを出力します。引数は空白で区"
+"切られます。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:991
@@ -8153,6 +8007,8 @@ msgid ""
"Output all the data received from &dpkg; on the status file descriptor and "
"any errors encountered while parsing it."
msgstr ""
+"状態ファイルディスクリプタに、&dpkg; から受信したすべてのデータと、そのデータ"
+"を解析中に発生したエラーを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:1001
@@ -8165,6 +8021,8 @@ msgid ""
"Generate a trace of the algorithm that decides the order in which "
"<literal>apt</literal> should pass packages to &dpkg;."
msgstr ""
+"<literal>apt</literal> が &dpkg; にパッケージを渡す順番を決める、アルゴリズム"
+"のトレースを生成します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:1013
@@ -8175,7 +8033,7 @@ msgstr "<literal>Debug::pkgPackageManager</literal>"
#: apt.conf.5.xml:1017
msgid ""
"Output status messages tracing the steps performed when invoking &dpkg;."
-msgstr ""
+msgstr "&dpkg; を呼び出す際に、実行手順を追跡した状態メッセージを出力します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:1024
@@ -8185,7 +8043,7 @@ msgstr "<literal>Debug::pkgPolicy</literal>"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
#: apt.conf.5.xml:1028
msgid "Output the priority of each package list on startup."
-msgstr ""
+msgstr "起動時の各パッケージの優先度を表示します。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:1034
@@ -8198,6 +8056,8 @@ msgid ""
"Trace the execution of the dependency resolver (this applies only to what "
"happens when a complex dependency problem is encountered)."
msgstr ""
+"依存関係解決システムの実行内容を追跡します (これは複雑な依存関係の問題に遭遇"
+"した場合にのみ、適用されます)。"
#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term>
#: apt.conf.5.xml:1046
@@ -8223,6 +8083,8 @@ msgid ""
"Print information about the vendors read from <filename>/etc/apt/vendors."
"list</filename>."
msgstr ""
+"<filename>/etc/apt/vendors.list</filename> から読み込んだ、ベンダの情報を出力"
+"します。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -8237,10 +8099,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt.conf.5.xml:1091
-#, fuzzy
-#| msgid "&apt-conf;"
msgid "&file-aptconf;"
-msgstr "&apt-conf;"
+msgstr "&file-aptconf;"
# type: Content of: <refentry><refsect1><para>
#. ? reading apt.conf
@@ -8252,11 +8112,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;."
#. The last update date
#. type: Content of: <refentry><refentryinfo>
#: apt_preferences.5.xml:13
-#, fuzzy
-#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
msgid ""
"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
-msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>"
+msgstr ""
+"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refnamediv><refname>
@@ -8268,24 +8127,20 @@ msgstr "apt_preferences"
#. type: Content of: <refentry><refnamediv><refpurpose>
#: apt_preferences.5.xml:29
msgid "Preference control file for APT"
-msgstr "APT 設定制御ファイル"
+msgstr "APT 用選択制御ファイル"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: apt_preferences.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The APT preferences file <filename>/etc/apt/preferences</filename> can be "
-#| "used to control which versions of packages will be selected for "
-#| "installation."
msgid ""
"The APT preferences file <filename>/etc/apt/preferences</filename> and the "
"fragment files in the <filename>/etc/apt/preferences.d/</filename> folder "
"can be used to control which versions of packages will be selected for "
"installation."
msgstr ""
-"APT 設定ファイル <filename>/etc/apt/preferences</filename> は、インストールす"
-"るパッケージのバージョン選択を制御するのに使用します。"
+"APT 選択ファイル <filename>/etc/apt/preferences</filename> と <filename>/etc/"
+"apt/preferences.d/</filename> フォルダにある断片ファイルは、インストールする"
+"パッケージのバージョンを制御するのに使用します。"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -8305,7 +8160,7 @@ msgstr ""
"し複数のバージョンがインストールできることがあります。このとき APT は、利用で"
"きるバージョンごとに優先度を割り当てます。依存関係規則を条件として、"
"<command>apt-get</command> は、最も高い優先度を持つバージョンをインストールす"
-"るよう選択します。APT 設定ファイルは、APT がデフォルトで割り当てた、パッケー"
+"るよう選択します。APT 選択ファイルは、APT がデフォルトで割り当てた、パッケー"
"ジのバージョンの優先度を上書きします。その結果インストールするものの選択を、"
"ユーザが選択できるようになります。"
@@ -8322,7 +8177,7 @@ msgstr ""
"&sources-list; ファイルに複数の参照が書かれている場合、パッケージの同じバー"
"ジョンのインスタンスが複数利用できる可能性があります。この場合、<command>apt-"
"get</command> は &sources-list; ファイルの初めの方に指定されているところから"
-"ダウンロードします。APT 設定ファイルはバージョンの選択にのみ影響し、インスタ"
+"ダウンロードします。APT 選択ファイルはバージョンの選択にのみ影響し、インスタ"
"ンスの選択には影響しません。"
#. type: Content of: <refentry><refsect1><para>
@@ -8349,6 +8204,11 @@ msgid ""
"underscore (_) and period (.) characters - otherwise they will be silently "
"ignored."
msgstr ""
+"<filename>/etc/apt/preferences.d</filename> ディレクトリにあるファイルは、英"
+"数字の昇順で解析され、以下の規約に従う必要があることに注意してください。ファ"
+"イル名には、拡張子はないか、\"<literal>pref</literal>\" となっており、英数"
+"字、ハイフン (-)、アンダースコア (_)、ピリオド (.) でできています。そうでなけ"
+"れば、黙って無視されます。"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -8361,14 +8221,18 @@ msgstr "APT のデフォルト優先度の割り当て"
#: 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"
+msgstr ""
+"<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:92
#, no-wrap
msgid "APT::Default-Release \"stable\";\n"
-msgstr "APT::Default-Release \"stable\";\n"
+msgstr ""
+"APT::Default-Release \"stable\";\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -8398,10 +8262,8 @@ msgstr ""
# type: <tag></tag>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:101
-#, fuzzy
-#| msgid "priority 100"
msgid "priority 1"
-msgstr "priority 100"
+msgstr "priority 1"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#: apt_preferences.5.xml:102
@@ -8466,10 +8328,6 @@ msgstr ""
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:123
#, fuzzy
-#| msgid ""
-#| "If the target release has not been specified then APT simply assigns "
-#| "priority 100 to all installed package versions and priority 500 to all "
-#| "uninstalled package versions."
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 "
@@ -8600,7 +8458,7 @@ msgid ""
"records separated by blank lines. Records can have one of two forms, a "
"specific form and a general form."
msgstr ""
-"APT 設定ファイルを使うと、システム管理者が優先度を割り当てられるようになりま"
+"APT 選択ファイルを使うと、システム管理者が優先度を割り当てられるようになりま"
"す。ファイルは、空白行で区切られた、複数行からなるレコードで構成されていま"
"す。レコードは特定形式か、汎用形式のどちらかの形式をとります。"
@@ -8631,6 +8489,7 @@ msgstr ""
"Package: perl\n"
"Pin: version 5.8*\n"
"Pin-Priority: 1001\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -8655,7 +8514,7 @@ msgid ""
"of packages. For example, the following record assigns a high priority to "
"all package versions available from the local site."
msgstr ""
-"APT 設定ファイルに書かれている汎用形式のエントリは、パッケージのグループにつ"
+"APT 選択ファイルに書かれている汎用形式のエントリは、パッケージのグループにつ"
"いてのみ適用されます。例えば以下のレコードは、ローカルサイトにある全パッケー"
"ジについて、高い優先度を割り当てます。"
@@ -8671,6 +8530,7 @@ msgstr ""
"Package: *\n"
"Pin: origin \"\"\n"
"Pin-Priority: 999\n"
+"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:206
@@ -8684,30 +8544,20 @@ 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:210
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: origin \"\"\n"
-#| "Pin-Priority: 999\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: origin \"ftp.de.debian.org\"\n"
"Pin-Priority: 999\n"
msgstr ""
"Package: *\n"
-"Pin: origin \"\"\n"
+"Pin: origin \"ftp.de.debian.org\"\n"
"Pin-Priority: 999\n"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:214
#, fuzzy
-#| 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 in a <filename>Release</filename> file. What follows the "
-#| "\"Origin:\" tag in a <filename>Release</filename> file is not an Internet "
-#| "address but an author or vendor name, such as \"Debian\" or \"Ximian\"."
msgid ""
"This should <emphasis>not</emphasis> be confused with the Origin of a "
"distribution as specified in a <filename>Release</filename> file. What "
@@ -8744,15 +8594,12 @@ msgstr ""
"Package: *\n"
"Pin: release a=unstable\n"
"Pin-Priority: 50\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
#: apt_preferences.5.xml:228
#, fuzzy
-#| msgid ""
-#| "The following record assigns a high priority to all package versions "
-#| "belonging to any distribution whose Codename is \"<literal>squeeze</"
-#| "literal>\"."
msgid ""
"The following record assigns a high priority to all package versions "
"belonging to any distribution whose Codename is \"<literal>&testing-codename;"
@@ -8764,18 +8611,14 @@ 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:232
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
+#, no-wrap
msgid ""
"Package: *\n"
"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
msgstr ""
"Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
# type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara>
@@ -8802,6 +8645,7 @@ msgstr ""
"Package: *\n"
"Pin: release a=stable, v=3.0\n"
"Pin-Priority: 500\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -8903,7 +8747,7 @@ msgid ""
"negative integers. They are interpreted as follows (roughly speaking): "
"<placeholder type=\"variablelist\" id=\"0\"/>"
msgstr ""
-"APT 設定ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ"
+"APT 選択ファイルで割り当てた優先度 (P) は、正負の整数でなくてはなりません。こ"
"れは (おおざっぱにいうと) 以下のように解釈されます。<placeholder type="
"\"variablelist\" id=\"0\"/>"
@@ -8928,7 +8772,7 @@ msgid ""
"For example, suppose the APT preferences file contains the three records "
"presented earlier:"
msgstr ""
-"例えば、APT 設定ファイルの上の方に、以下のレコードが書かれていると仮定してく"
+"例えば、APT 選択ファイルの上の方に、以下のレコードが書かれていると仮定してく"
"ださい。"
# type: Content of: <refentry><refsect1><refsect2><programlisting>
@@ -8959,6 +8803,7 @@ msgstr ""
"Package: *\n"
"Pin: release unstable\n"
"Pin-Priority: 50\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -9076,7 +8921,6 @@ 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:375
-#, fuzzy
msgid ""
"names the archive to which all the packages in the directory tree belong. "
"For example, the line \"Archive: stable\" or \"Suite: stable\" specifies "
@@ -9086,10 +8930,10 @@ msgid ""
"the line:"
msgstr ""
"このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
-"ば、\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親"
-"ディレクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカ"
-"イブだと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要に"
-"なります。"
+"ば、\"Archive: stable\" や \"Suite: stable\" という行は、<filename>Release</"
+"filename> ファイルの親ディレクトリツリー以下にある全パッケージが、"
+"<literal>stable</literal> アーカイブだと指定します。APT 選択ファイルでこの値"
+"を指定するには、以下の行が必要になります。"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -9115,19 +8959,18 @@ msgid ""
"<literal>&testing-codename;</literal>. Specifying this value in the APT "
"preferences file would require the line:"
msgstr ""
-"このディレクトリツリーに属する全パッケージのアーカイブ名です。例え"
-"ば、\"Archive: stable\" という行は、<filename>Release</filename> ファイルの親"
-"ディレクトリツリー以下にある全パッケージが、<literal>stable</literal> アーカ"
-"イブだと指定します。APT 設定ファイルでこの値を指定するには、以下の行が必要に"
-"なります。"
+"このディレクトリツリーに属する全パッケージのコード名です。例え"
+"ば、\"Codename: squeeze\" という行は、<filename>Release</filename> ファイルの"
+"親ディレクトリツリー以下にある全パッケージが、<literal>squeeze</literal> と名"
+"前のついたバージョンであると指定します。APT 選択ファイルでこの値を指定するに"
+"は、以下の行が必要になります。"
# 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:401
-#, fuzzy, no-wrap
-#| msgid "Pin: release a=stable\n"
+#, no-wrap
msgid "Pin: release n=&testing-codename;\n"
-msgstr "Pin: release a=stable\n"
+msgstr "Pin: release n=&testing-codename;\n"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
@@ -9142,7 +8985,7 @@ msgstr ""
"リリースバージョン名です。例えば、このツリーのパッケージが、GNU/Linux リリー"
"スバージョン 3.0 に属するとします。通常 <literal>testing</literal> ディストリ"
"ビューションや <literal>unstable</literal> ディストリビューションには、まだリ"
-"リースされていないので、バージョン番号が付きません。APT 設定ファイルでこれを"
+"リースされていないので、バージョン番号が付きません。APT 選択ファイルでこれを"
"指定するには、以下の行のいずれかが必要になります。"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -9157,6 +9000,7 @@ msgstr ""
"Pin: release v=3.0\n"
"Pin: release a=stable, v=3.0\n"
"Pin: release 3.0\n"
+"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:426
@@ -9178,7 +9022,7 @@ msgstr ""
"ライセンスコンポーネント名です。例えば、\"Component: main\" という行は、この"
"ディレクトリ以下の全ファイルが、<literal>main</literal> コンポーネント "
"(Debian フリーソフトウェアガイドラインの元でライセンスされている) であること"
-"を表します。APT 設定ファイルでこのコンポーネントを指定するには、以下の行が必"
+"を表します。APT 選択ファイルでこのコンポーネントを指定するには、以下の行が必"
"要になります。"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -9203,7 +9047,7 @@ msgid ""
"the line:"
msgstr ""
"<filename>Release</filename> ファイルのディレクトリツリーにあるパッケージの提"
-"供者名です。ほとんど共通で、<literal>Debian</literal> です。APT 設定ファイル"
+"供者名です。ほとんど共通で、<literal>Debian</literal> です。APT 選択ファイル"
"でこの提供者を指定するには、以下の行が必要になります。"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -9211,7 +9055,9 @@ msgstr ""
#: apt_preferences.5.xml:449
#, no-wrap
msgid "Pin: release o=Debian\n"
-msgstr "Pin: release o=Debian\n"
+msgstr ""
+"Pin: release o=Debian\n"
+"\n"
#. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term>
#: apt_preferences.5.xml:455
@@ -9228,7 +9074,7 @@ msgid ""
"the line:"
msgstr ""
"<filename>Release</filename> ファイルのディレクトリツリーにあるパッケージのラ"
-"ベル名です。ほとんど共通で <literal>Debian</literal> です。APT 設定ファイルで"
+"ベル名です。ほとんど共通で <literal>Debian</literal> です。APT 選択ファイルで"
"このラベルを指定するには、以下の行が必要になります。"
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
@@ -9236,7 +9082,9 @@ msgstr ""
#: apt_preferences.5.xml:462
#, no-wrap
msgid "Pin: release l=Debian\n"
-msgstr "Pin: release l=Debian\n"
+msgstr ""
+"Pin: release l=Debian\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -9254,12 +9102,13 @@ msgid ""
"\"0\"/>"
msgstr ""
"<filename>Release</filename> ファイルは、通常 <filename>.../dists/"
-"<replaceable>dist-name</replaceable></filename> にあります。例えば、 "
-"<filename>.../dists/stable/Release</filename>, <filename>.../dists/woody/"
-"Release</filename> です。これは、このディレクトリ以下にある<emphasis>全</"
-"emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。"
-"<filename>Packages</filename> と違い <filename>Release</filename> ファイル"
-"は、ほとんどの行が APT 優先度の設定に関連します。"
+"<replaceable>dist-name</replaceable></filename> ディレクトリにあります。例え"
+"ば、 <filename>.../dists/stable/Release</filename>, <filename>.../dists/"
+"woody/Release</filename> です。これは、このディレクトリ以下にある<emphasis>全"
+"</emphasis>パッケージに適用する、複数行のレコード 1 つから成っています。"
+"<filename>Packages</filename> ファイルと違い <filename>Release</filename> "
+"ファイルは、以下のようにほとんどの行が APT 優先度の設定に関連します。"
+"<placeholder type=\"variablelist\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
@@ -9301,7 +9150,7 @@ msgid ""
"more lines beginning with the word <literal>Explanation:</literal>. This "
"provides a place for comments."
msgstr ""
-"APT 設定ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始"
+"APT 選択ファイルのレコードごとに、任意で <literal>Explanation:</literal> で始"
"まる行を持てます。これは、コメント用の場所を確保します。"
# type: Content of: <refentry><refsect1><refsect2><title>
@@ -9334,11 +9183,11 @@ msgstr ""
"Package: *\n"
"Pin: release o=Debian\n"
"Pin-Priority: -10\n"
+"\n"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:495
-#, fuzzy
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 "
@@ -9346,10 +9195,11 @@ msgid ""
"package versions belonging to other <literal>Debian</literal> "
"distributions. <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-"以下の APT 設定ファイルは、<literal>stable</literal> ディストリビューションに"
+"以下の APT 選択ファイルは、<literal>stable</literal> ディストリビューションに"
"属する全てのパッケージのバージョンに、デフォルト (500) より高い優先度を割り当"
"て、他の <literal>Debian</literal> ディストリビューションのパッケージのバー"
"ジョンには、低くてインストールできないような優先度を割り当てます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -9368,15 +9218,15 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:513
-#, fuzzy
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 "
"<literal>stable</literal> version(s). <placeholder type=\"programlisting\" "
"id=\"0\"/>"
msgstr ""
-"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
+"適切な &sources-list; ファイルと上記の選択ファイルにより、以下のコマンドで最"
"新の <literal>stable</literal> バージョンにアップグレードできます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -9388,7 +9238,6 @@ 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:524
-#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>testing</literal> distribution; the package "
@@ -9397,7 +9246,8 @@ msgid ""
msgstr ""
"以下のコマンドで、指定したパッケージを <literal>testing</literal> ディストリ"
"ビューションの最新バージョンにアップグレードします。このパッケージは、再度こ"
-"のコマンドを発行しないとアップグレードされません。"
+"のコマンドを発行しないとアップグレードされません。<placeholder type="
+"\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><title>
#. type: Content of: <refentry><refsect1><refsect2><title>
@@ -9437,7 +9287,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:538
-#, fuzzy
msgid ""
"The following APT preferences file will cause APT to assign a high priority "
"to package versions from the <literal>testing</literal> distribution, a "
@@ -9446,24 +9295,25 @@ msgid ""
"other <literal>Debian</literal> distributions. <placeholder type="
"\"programlisting\" id=\"0\"/>"
msgstr ""
-"以下の APT 設定ファイルは、<literal>testing</literal> ディストリビューション"
+"以下の APT 選択ファイルは、<literal>testing</literal> ディストリビューション"
"のパッケージのバージョンに高い優先度を割り当て、<literal>unstable</literal> "
"ディストリビューションのパッケージのバージョンには低い優先度を割り当てます。"
"また他の <literal>Debian</literal> ディストリビューションのパッケージのバー"
"ジョンには、低くてインストールできないような優先度を割り当てます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:559
-#, fuzzy
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 "
"<literal>testing</literal> version(s). <placeholder type=\"programlisting\" "
"id=\"0\"/>"
msgstr ""
-"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
+"適切な &sources-list; ファイルと上記の選択ファイルにより、以下のコマンドで最"
"新の <literal>testing</literal> バージョンにアップグレードできます。"
+"<placeholder type=\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -9475,7 +9325,6 @@ 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:570
-#, fuzzy
msgid ""
"The following command will cause APT to upgrade the specified package to the "
"latest version from the <literal>unstable</literal> distribution. "
@@ -9489,33 +9338,19 @@ msgstr ""
"ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
"get upgrade</command> は <literal>testing</literal> バージョンのパッケージが"
"更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</"
-"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>"
-"の最新版にアップグレードします。"
+"literal> バージョンのパッケージが更新されていれば <literal>unstable</"
+"literal> の最新版にアップグレードします。<placeholder type=\"programlisting"
+"\" id=\"0\"/>"
#. type: Content of: <refentry><refsect1><refsect2><title>
#: apt_preferences.5.xml:586
msgid "Tracking the evolution of a codename release"
-msgstr ""
+msgstr "コード名リリースの進化の追跡"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#: apt_preferences.5.xml:600
-#, fuzzy, no-wrap
-#| msgid ""
-#| "Explanation: Uninstall or do not install any Debian-originated package versions\n"
-#| "Explanation: other than those in the distribution codenamed with squeeze or sid\n"
-#| "Package: *\n"
-#| "Pin: release n=squeeze\n"
-#| "Pin-Priority: 900\n"
-#| "\n"
-#| "Explanation: Debian unstable is always codenamed with sid\n"
-#| "Package: *\n"
-#| "Pin: release a=sid\n"
-#| "Pin-Priority: 800\n"
-#| "\n"
-#| "Package: *\n"
-#| "Pin: release o=Debian\n"
-#| "Pin-Priority: -10\n"
+#, no-wrap
msgid ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
@@ -9533,14 +9368,14 @@ msgid ""
"Pin-Priority: -10\n"
msgstr ""
"Explanation: Uninstall or do not install any Debian-originated package versions\n"
-"Explanation: other than those in the distribution codenamed with squeeze or sid\n"
+"Explanation: other than those in the distribution codenamed with &testing-codename; or sid\n"
"Package: *\n"
-"Pin: release n=squeeze\n"
+"Pin: release n=&testing-codename;\n"
"Pin-Priority: 900\n"
"\n"
"Explanation: Debian unstable is always codenamed with sid\n"
"Package: *\n"
-"Pin: release a=sid\n"
+"Pin: release n=sid\n"
"Pin-Priority: 800\n"
"\n"
"Package: *\n"
@@ -9561,19 +9396,27 @@ msgid ""
"notwithstanding the codename changes you should use the example "
"configurations above. <placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
+"以下の APT 選択ファイルは、指定したコードネームのディストリビューションに属す"
+"る全てのパッケージのバージョンに、デフォルト (500) より高い優先度を割り当て、"
+"他の <literal>Debian</literal> ディストリビューション、コード名、アーカイブの"
+"パッケージのバージョンには、低くてインストールできないような優先度を割り当て"
+"ます。この APT 選択ファイルにより、APT は <literal>testing</literal> アーカイ"
+"ブから、<literal>stable</literal> や最新の <literal>oldstable</literal> へ移"
+"行できます。コード名の変更に関係なく <literal>testing</literal> を追跡したい"
+"場合は、上記の設定例を使用するべきです。<placeholder type=\"programlisting\" "
+"id=\"0\"/>"
-# type: Content of: <refentry><refsect1><refsect2><para>
#. type: Content of: <refentry><refsect1><refsect2><para>
#: apt_preferences.5.xml:617
-#, fuzzy
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 "
"the release codenamed with <literal>&testing-codename;</literal>. "
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-"適切な &sources-list; ファイルと上記の設定ファイルにより、以下のコマンドで最"
-"新の <literal>stable</literal> バージョンにアップグレードできます。"
+"適切な &sources-list; ファイルと上記の選択ファイルにより、以下のコマンドで、"
+"リリースコード名が <literal>&testing-codename;</literal> である最新バージョン"
+"にアップグレードできます。<placeholder type=\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refsect1><refsect2><para><programlisting>
#. type: Content of: <refentry><refsect1><refsect2><para><programlisting>
@@ -9595,20 +9438,18 @@ msgid ""
"literal> version if that is more recent than the installed version. "
"<placeholder type=\"programlisting\" id=\"0\"/>"
msgstr ""
-"以下のコマンドで、指定したパッケージを <literal>unstable</literal> ディストリ"
+"以下のコマンドで、指定したパッケージを <literal>sid</literal> ディストリ"
"ビューションの最新バージョンにアップグレードします。それ以降、<command>apt-"
-"get upgrade</command> は <literal>testing</literal> バージョンのパッケージが"
-"更新されていれば <literal>testing</literal> の最新版に、<literal>unstable</"
-"literal> バージョンのパッケージが更新されていれば <literal>unstable</literal>"
-"の最新版にアップグレードします。"
+"get upgrade</command> は <literal>squeeze</literal> バージョンのパッケージが"
+"更新されていれば <literal>squeeze</literal> の最新版に、<literal>sid</"
+"literal> バージョンのパッケージが更新されていれば <literal>sid</literal>の最"
+"新版にアップグレードします。<placeholder type=\"programlisting\" id=\"0\"/>"
# type: Content of: <refentry><refnamediv><refname>
#. type: Content of: <refentry><refsect1><variablelist>
#: apt_preferences.5.xml:646
-#, fuzzy
-#| msgid "apt_preferences"
msgid "&file-preferences;"
-msgstr "apt_preferences"
+msgstr "&file-preferences;"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
@@ -9631,12 +9472,6 @@ msgstr "APT 用パッケージリソースリスト"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:34
-#, fuzzy
-#| msgid ""
-#| "The package resource list is used to locate archives of the package "
-#| "distribution system in use on the system. At this time, this manual page "
-#| "documents only the packaging system used by the Debian GNU/Linux system. "
-#| "This control file is located in <filename>/etc/apt/sources.list</filename>"
msgid ""
"The package resource list is used to locate archives of the package "
"distribution system in use on the system. At this time, this manual page "
@@ -9651,16 +9486,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:39
-#, fuzzy
-#| msgid ""
-#| "The source list is designed to support any number of active sources and a "
-#| "variety of source media. The file lists one source per line, with the "
-#| "most preferred source listed first. The format of each line is: "
-#| "<literal>type uri args</literal> The first item, <literal>type</literal> "
-#| "determines the format for <literal>args</literal> <literal>uri</literal> "
-#| "is a Universal Resource Identifier (URI), which is a superset of the more "
-#| "specific and well-known Universal Resource Locator, or URL. The rest of "
-#| "the line can be marked as a comment by using a #."
msgid ""
"The source list is designed to support any number of active sources and a "
"variety of source media. The file lists one source per line, with the most "
@@ -9676,8 +9501,8 @@ msgstr ""
"フォーマットは、<literal>タイプ uri 引数</literal> となります。先頭の "
"<literal>タイプ</literal> で、<literal>引数</literal> のフォーマットを決定し"
"ます。<literal>uri</literal> は Universal Resource Identifier (URI) で、よく"
-"知られた URL のスーパーセットです。行の残りに # を付けて、コメントにできま"
-"す。"
+"知られた Universal Resource Locator (URL) のスーパーセットです。行の残りに # "
+"を付けて、コメントにできます。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
@@ -9688,7 +9513,6 @@ msgstr "sources.list.d"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:51
-#, fuzzy
msgid ""
"The <filename>/etc/apt/sources.list.d</filename> directory provides a way to "
"add sources.list entries in separate files. The format is the same as for "
@@ -9697,10 +9521,12 @@ msgid ""
"digits (0-9), underscore (_), hyphen (-) and period (.) characters. "
"Otherwise they will be silently ignored."
msgstr ""
-"<filename>/etc/apt/sources.list.d</filename> ディレクトリにファイル名が "
-"<literal>.list</literal> で終わる個別ファイルを置いておくと、sources.list エ"
-"ントリに追加できます。フォーマットは、通常の <filename>sources.list</"
-"filename> ファイルと同じです。"
+"<filename>/etc/apt/sources.list.d</filename> ディレクトリは、個別ファイルで追"
+"加 source.list エントリを提供します。フォーマットは、通常の "
+"<filename>sources.list</filename> ファイルと同じです。ファイル名は、"
+"<filename>.list</filename> で終わる必要があり、文字 (a-z と A-Z)、数字 "
+"(0-9)、アンダースコア (_)、ハイフン (-)、ピリオド (.) のみを含んでいなければ"
+"なりません。そうでなければ、黙って無視します。"
# type: Content of: <refentry><refsect1><title>
#. type: Content of: <refentry><refsect1><title>
@@ -9711,17 +9537,6 @@ msgstr "deb タイプと deb-src タイプ"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:61
-#, fuzzy
-#| msgid ""
-#| "The <literal>deb</literal> type describes a typical two-level Debian "
-#| "archive, <filename>distribution/component</filename>. Typically, "
-#| "<literal>distribution</literal> is generally one of <literal>stable</"
-#| "literal> <literal>unstable</literal> or <literal>testing</literal> while "
-#| "component is one of <literal>main</literal> <literal>contrib</literal> "
-#| "<literal>non-free</literal> or <literal>non-us</literal> The <literal>deb-"
-#| "src</literal> type describes a debian distribution's source code in the "
-#| "same form as the <literal>deb</literal> type. A <literal>deb-src</"
-#| "literal> line is required to fetch source indexes."
msgid ""
"The <literal>deb</literal> type describes a typical two-level Debian "
"archive, <filename>distribution/component</filename>. Typically, "
@@ -9734,11 +9549,11 @@ msgid ""
"is required to fetch source indexes."
msgstr ""
"<literal>deb</literal> タイプでは典型的な 2 段階の Debian アーカイブ "
-"(<filename>distribution/component</filename>) を記述します。よくあるケースで"
-"は、<literal>distribution</literal> は通常 <literal>stable</literal> "
-"<literal>unstable</literal> <literal>testing</literal> のどれか、component "
-"は、<literal>main</literal> <literal>contrib</literal> <literal>non-free</"
-"literal> <literal>non-us</literal> のどれかです。<literal>deb-src</literal> "
+"<filename>distribution/component</filename> を記述します。よくあるケースで"
+"は、<literal>distribution</literal> は通常 <literal>stable</literal>, "
+"<literal>unstable</literal>, <literal>testing</literal> のどれか、component "
+"は、<literal>main</literal>, <literal>contrib</literal>, <literal>non-free</"
+"literal>, <literal>non-us</literal> のどれかです。<literal>deb-src</literal> "
"タイプでは、Debian ディストリビューションのソースコードを、<literal>deb</"
"literal> タイプと同じ形式で記述します。<literal>deb-src</literal> 行は、ソー"
"スインデックスを取得するのに必要です。"
@@ -9746,10 +9561,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:73
-#, fuzzy
-#| msgid ""
-#| "The format for a <filename>sources.list</filename> entry using the "
-#| "<literal>deb</literal> and <literal>deb-src</literal> types are:"
msgid ""
"The format for a <filename>sources.list</filename> entry using the "
"<literal>deb</literal> and <literal>deb-src</literal> types is:"
@@ -9767,16 +9578,6 @@ msgstr "deb uri distribution [component1] [component2] [...]"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:78
-#, fuzzy
-#| msgid ""
-#| "The URI for the <literal>deb</literal> type must specify the base of the "
-#| "Debian distribution, from which APT will find the information it needs. "
-#| "<literal>distribution</literal> can specify an exact path, in which case "
-#| "the components must be omitted and <literal>distribution</literal> must "
-#| "end with a slash (/). This is useful for when only a particular sub-"
-#| "section of the archive denoted by the URI is of interest. If "
-#| "<literal>distribution</literal> does not specify an exact path, at least "
-#| "one <literal>component</literal> must be present."
msgid ""
"The URI for the <literal>deb</literal> type must specify the base of the "
"Debian distribution, from which APT will find the information it needs. "
@@ -9787,8 +9588,8 @@ msgid ""
"literal> does not specify an exact path, at least one <literal>component</"
"literal> must be present."
msgstr ""
-"<literal>deb</literal> タイプの URI は、APT が情報を見つけられるように、"
-"Debian ディストリビューションの基底を指定しなければなりません。"
+"<literal>deb</literal> タイプの URI は、APT が必要な情報を見つけられるよう"
+"に、Debian ディストリビューションの基底を指定しなければなりません。"
"<literal>distribution</literal> には正確なパスを指定できます。その場合 "
"component を省略し、<literal>distribution</literal> はスラッシュ (/) で終わら"
"なくてはなりません。これは URL で指定されたアーカイブの、特定のサブセクション"
@@ -9861,18 +9662,14 @@ msgstr "例:"
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:114
-#, fuzzy, no-wrap
-#| msgid ""
-#| "deb http://http.us.debian.org/debian stable main contrib non-free\n"
-#| "deb http://http.us.debian.org/debian dists/stable-updates/\n"
-#| " "
+#, no-wrap
msgid ""
"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
msgstr ""
-"deb http://http.us.debian.org/debian stable main contrib non-free\n"
-"deb http://http.us.debian.org/debian dists/stable-updates/\n"
+"deb http://ftp.debian.org/debian &stable-codename; main contrib non-free\n"
+"deb http://security.debian.org/ &stable-codename;/updates main contrib non-free\n"
" "
# type: Content of: <refentry><refsect1><title>
@@ -9912,14 +9709,6 @@ msgstr ""
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:141
-#, fuzzy
-#| msgid ""
-#| "The http scheme specifies an HTTP server for the archive. If an "
-#| "environment variable <envar>http_proxy</envar> is set with the format "
-#| "http://server:port/, the proxy server specified in <envar>http_proxy</"
-#| "envar> will be used. Users of authenticated HTTP/1.1 proxies may use a "
-#| "string of the format http://user:pass@server:port/ Note that this is an "
-#| "insecure method of authentication."
msgid ""
"The http scheme specifies an HTTP server for the archive. If an environment "
"variable <envar>http_proxy</envar> is set with the format http://server:"
@@ -9931,7 +9720,7 @@ msgstr ""
"http スキームはアーカイブとして、HTTP サーバを指定します。環境変数 "
"<envar>http_proxy</envar> が、http://server:port/ と言った形で指定されていれ"
"ば、<envar>http_proxy</envar> で指定したプロキシサーバを使用します。ユーザ認"
-"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ と言う形で"
+"証が必要な HTTP/1.1 プロキシの場合、http://user:pass@server:port/ という形で"
"指定してください。この認証方法は安全ではないことに注意してください。"
# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
@@ -9948,11 +9737,11 @@ msgid ""
msgstr ""
"ftp スキームは、アーカイブに FTP サーバを指定します。APT の FTP の振る舞い"
"は、高度に設定できます。詳細は、&apt-conf; のマニュアルページをご覧ください。"
-"ftp プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することにご注意くださ"
-"い。この方法用に、さらにこの方法でしか使用しないのに、http プロキシを使用する"
-"ことができます (http プロキシサーバは大抵 ftp urlも理解できます)。設定ファイ"
-"ルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視され"
-"ます。"
+"ftp プロキシは、<envar>ftp_proxy</envar> 環境変数で指定することに注意してくだ"
+"さい。この方法用に、さらにこの方法でしか使用しないのに、http プロキシを使用す"
+"ることができます (http プロキシサーバは大抵 ftp urlも理解できます)。設定ファ"
+"イルで http を使用する際に、ftp プロキシを使用するよう設定してあっても無視さ"
+"れます。"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:161
@@ -10000,7 +9789,7 @@ msgstr ""
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term>
#: sources.list.5.xml:178
msgid "more recognizable URI types"
-msgstr ""
+msgstr "さらに認識できる URI タイプ"
#. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
#: sources.list.5.xml:180
@@ -10085,34 +9874,23 @@ msgstr "deb http://archive.debian.org/debian-archive hamm main"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:208
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the stable/contrib area."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the &stable-codename;/contrib area."
msgstr ""
"ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
-"stable/contrib のみを使用します。"
+"&stable-codename;/contrib のみを使用します。"
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
#: sources.list.5.xml:210
-#, fuzzy, no-wrap
-#| msgid "deb ftp://ftp.debian.org/debian stable contrib"
+#, no-wrap
msgid "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
-msgstr "deb ftp://ftp.debian.org/debian stable contrib"
+msgstr "deb ftp://ftp.debian.org/debian &stable-codename; contrib"
# type: Content of: <refentry><refsect1><para>
#. type: Content of: <refentry><refsect1><para>
#: sources.list.5.xml:212
-#, fuzzy
-#| msgid ""
-#| "Uses FTP to access the archive at ftp.debian.org, under the debian "
-#| "directory, and uses only the unstable/contrib area. If this line appears "
-#| "as well as the one in the previous example in <filename>sources.list</"
-#| "filename>. a single FTP session will be used for both resource lines."
msgid ""
"Uses FTP to access the archive at ftp.debian.org, under the debian "
"directory, and uses only the unstable/contrib area. If this line appears as "
@@ -10120,9 +9898,9 @@ msgid ""
"a single FTP session will be used for both resource lines."
msgstr ""
"ftp.debian.org のアーカイブに FTP アクセスし、debian ディレクトリ以下の "
-"unstable/contrib を使用します。<filename>sources.list</filename> に上記サンプ"
-"ルと一緒に指定された場合、両方のリソース行に対応する FTP セッションはひとつだ"
-"けになります。"
+"unstable/contrib のみを使用します。<filename>sources.list</filename> に上記サ"
+"ンプルと一緒に指定された場合、両方のリソース行に対応する FTP セッションはひと"
+"つだけになります。"
# type: <example></example>
#. type: Content of: <refentry><refsect1><literallayout>
@@ -10181,7 +9959,7 @@ msgstr "&apt-cache; &apt-conf;"
#. type: <title></title>
#: guide.sgml:4
msgid "APT User's Guide"
-msgstr ""
+msgstr "APT ユーザガイド"
# type: <author></author>
#. type: <author></author>
@@ -10192,20 +9970,19 @@ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
#. type: <version></version>
#: guide.sgml:7
msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
-msgstr ""
+msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $"
#. type: <abstract></abstract>
#: guide.sgml:11
msgid ""
"This document provides an overview of how to use the the APT package manager."
-msgstr ""
+msgstr "本文書は APT パッケージマネージャの使い方の概要を提供します。"
# type: <copyrightsummary></copyrightsummary>
#. type: <copyrightsummary></copyrightsummary>
#: guide.sgml:15
-#, fuzzy
msgid "Copyright &copy; Jason Gunthorpe, 1998."
-msgstr "Copyright &copy; Jason Gunthorpe, 1999."
+msgstr "Copyright &copy; Jason Gunthorpe, 1998."
#. type: <p></p>
#: guide.sgml:21 offline.sgml:22
@@ -10215,6 +9992,10 @@ msgid ""
"published by the Free Software Foundation; either version 2 of the License, "
"or (at your option) any later version."
msgstr ""
+"\"APT\" and this document are free software; you can redistribute them and/"
+"or modify them under the terms of the GNU General Public License as "
+"published by the Free Software Foundation; either version 2 of the License, "
+"or (at your option) any later version."
#. type: <p></p>
#: guide.sgml:24 offline.sgml:25
@@ -10222,12 +10003,13 @@ msgid ""
"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
"common-licenses/GPL for the full license."
msgstr ""
+"For more details, on Debian GNU/Linux systems, see the file /usr/share/"
+"common-licenses/GPL for the full license."
#. type: <heading></heading>
#: guide.sgml:32
-#, fuzzy
msgid "General"
-msgstr "generate"
+msgstr "全般"
#. type: <p></p>
#: guide.sgml:38
@@ -10241,9 +10023,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
#. type: <heading></heading>
#: guide.sgml:39
-#, fuzzy
msgid "Anatomy of the Package System"
-msgstr "パッケージ名"
+msgstr "パッケージシステムの構造"
#. type: <p></p>
#: guide.sgml:44
@@ -10346,6 +10127,11 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get update\n"
+"Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n"
+"Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
#. type: <p><taglist>
#: guide.sgml:120
@@ -10452,7 +10238,7 @@ msgid ""
" \n"
" \n"
" URL [http://llug.sep.bnl.gov/debian]:"
-msgstr ""
+msgstr " "
#. type: <p></p>
#: guide.sgml:205
@@ -10471,7 +10257,7 @@ msgid ""
" tags are typically something like: stable unstable testing non-US\n"
" \n"
" Distribution [stable]:"
-msgstr ""
+msgstr " "
#. type: <p></p>
#: guide.sgml:222
@@ -10492,7 +10278,7 @@ msgid ""
" The components are typically something like: main contrib non-free\n"
" \n"
" Components [main contrib non-free]:"
-msgstr ""
+msgstr " "
#. type: <p></p>
#: guide.sgml:236
@@ -10540,9 +10326,8 @@ msgstr ""
# type: <tag></tag>
#. type: <heading></heading>
#: guide.sgml:264
-#, fuzzy
msgid "The Interface"
-msgstr "メソッドインスタンス"
+msgstr "インターフェース"
#. type: <p></p>
#: guide.sgml:278
@@ -10579,6 +10364,9 @@ msgid ""
"Reading Package Lists... Done\n"
"Building Dependency Tree... Done"
msgstr ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done"
#. type: <p></p>
#: guide.sgml:297
@@ -10618,6 +10406,21 @@ msgid ""
" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
msgstr ""
+"# apt-get check\n"
+"Reading Package Lists... Done\n"
+"Building Dependency Tree... Done\n"
+"You might want to run apt-get -f install' to correct these.\n"
+"Sorry, but the following packages have unmet dependencies:\n"
+" 9fonts: Depends: xlib6g but it is not installed\n"
+" uucp: Depends: mailx but it is not installed\n"
+" blast: Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" adduser: Depends: perl-base but it is not installed\n"
+" aumix: Depends: libgpmg1 but it is not installed\n"
+" debiandoc-sgml: Depends: sgml-base but it is not installed\n"
+" bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed\n"
+" cthugha: Depends: svgalibg1 but it is not installed\n"
+" Depends: xlib6g (>= 3.3-5) but it is not installed\n"
+" libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)"
#. type: <p></p>
#: guide.sgml:329
@@ -10665,7 +10468,7 @@ msgstr ""
#. type: <heading></heading>
#: guide.sgml:356
msgid "The Status Report"
-msgstr ""
+msgstr "状態レポート"
#. type: <p></p>
#: guide.sgml:363
@@ -10680,9 +10483,8 @@ msgstr ""
# type: <tag></tag>
#. type: <heading></heading>
#: guide.sgml:364
-#, fuzzy
msgid "The Extra Package list"
-msgstr "NextPackage"
+msgstr "追加パッケージリスト"
#. type: <example></example>
#: guide.sgml:372
@@ -10695,6 +10497,12 @@ msgid ""
" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
" ssh"
msgstr ""
+"The following extra packages will be installed:\n"
+" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n"
+" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n"
+" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n"
+" squake pgp-i python-base debmake ldso perl libreadlineg2\n"
+" ssh"
#. type: <p></p>
#: guide.sgml:379
@@ -10708,7 +10516,7 @@ msgstr ""
#. type: <heading></heading>
#: guide.sgml:382
msgid "The Packages to Remove"
-msgstr ""
+msgstr "削除するパッケージ"
#. type: <example></example>
#: guide.sgml:389
@@ -10720,6 +10528,11 @@ msgid ""
" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
" nas xpilot xfig"
msgstr ""
+"The following packages will be REMOVED:\n"
+" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n"
+" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n"
+" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n"
+" nas xpilot xfig"
#. type: <p></p>
#: guide.sgml:399
@@ -10736,9 +10549,8 @@ msgstr ""
# type: <tag></tag>
#. type: <heading></heading>
#: guide.sgml:402
-#, fuzzy
msgid "The New Packages list"
-msgstr "NextPackage"
+msgstr "新規パッケージリスト"
#. type: <example></example>
#: guide.sgml:406
@@ -10747,6 +10559,8 @@ msgid ""
"The following NEW packages will installed:\n"
" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
msgstr ""
+"The following NEW packages will installed:\n"
+" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base"
#. type: <p></p>
#: guide.sgml:411
@@ -10759,9 +10573,8 @@ msgstr ""
# type: <tag></tag>
#. type: <heading></heading>
#: guide.sgml:414
-#, fuzzy
msgid "The Kept Back list"
-msgstr "NextPackage"
+msgstr ""
#. type: <example></example>
#: guide.sgml:419
@@ -10771,6 +10584,9 @@ msgid ""
" compface man-db tetex-base msql libpaper svgalib1\n"
" gs snmp arena lynx xpat2 groff xscreensaver"
msgstr ""
+"The following packages have been kept back\n"
+" compface man-db tetex-base msql libpaper svgalib1\n"
+" gs snmp arena lynx xpat2 groff xscreensaver"
#. type: <p></p>
#: guide.sgml:428
@@ -10795,6 +10611,8 @@ msgid ""
"The following held packages will be changed:\n"
" cvs"
msgstr ""
+"The following held packages will be changed:\n"
+" cvs"
#. type: <p></p>
#: guide.sgml:441
@@ -10807,7 +10625,7 @@ msgstr ""
#. type: <heading></heading>
#: guide.sgml:444
msgid "Final summary"
-msgstr ""
+msgstr "最後のまとめ"
#. type: <p></p>
#: guide.sgml:447
@@ -10823,6 +10641,9 @@ msgid ""
"12 packages not fully installed or removed.\n"
"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
msgstr ""
+"206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.\n"
+"12 packages not fully installed or removed.\n"
+"Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used."
#. type: <p></p>
#: guide.sgml:470
@@ -10852,7 +10673,7 @@ msgstr ""
#. type: <heading></heading>
#: guide.sgml:477
msgid "The Status Display"
-msgstr ""
+msgstr "状態表示"
#. type: <p></p>
#: guide.sgml:481
@@ -10873,6 +10694,13 @@ msgid ""
"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
msgstr ""
+"# apt-get update\n"
+"Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n"
+"Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n"
+"Hit http://llug.sep.bnl.gov/debian/ testing/main Packages\n"
+"Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n"
+"Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n"
+"11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s"
#. type: <p></p>
#: guide.sgml:500
@@ -10951,7 +10779,7 @@ msgstr "オフラインでの APT の使用法"
#. type: <version></version>
#: offline.sgml:7
msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
-msgstr ""
+msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $"
# type: <abstract></abstract>
#. type: <abstract></abstract>
@@ -10961,7 +10789,7 @@ msgid ""
"specifically a 'sneaker-net' approach for performing upgrades."
msgstr ""
"このドキュメントはネットワークがない環境での APT の使用方法を説明しています。"
-"具体的には、アップグレード時に「スニーカーネット」アプローチです。"
+"具体的には、アップグレード時の「スニーカーネット」アプローチです。"
# type: <copyrightsummary></copyrightsummary>
#. type: <copyrightsummary></copyrightsummary>
@@ -10977,9 +10805,8 @@ msgstr "はじめに"
#. type: <heading></heading>
#: offline.sgml:34 offline.sgml:65 offline.sgml:180
-#, fuzzy
msgid "Overview"
-msgstr "OverrideDir"
+msgstr "概要"
#. type: <p></p>
#: offline.sgml:40
@@ -11016,9 +10843,8 @@ msgstr ""
# type: <title></title>
#. type: <heading></heading>
#: offline.sgml:63
-#, fuzzy
msgid "Using APT on both machines"
-msgstr "オフラインでの APT の使用法"
+msgstr "両方のマシンでの APT の使用法"
#. type: <p><example>
#: offline.sgml:71
@@ -11055,9 +10881,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: <heading></heading>
#: offline.sgml:88
-#, fuzzy
msgid "The configuration file"
-msgstr "ユーザの設定"
+msgstr "設定ファイル"
#. type: <p></p>
#: offline.sgml:96
@@ -11080,7 +10905,7 @@ msgstr ""
# type: <example></example>
#. type: <example></example>
#: offline.sgml:124
-#, fuzzy, no-wrap
+#, no-wrap
msgid ""
" APT\n"
" {\n"
@@ -11109,7 +10934,7 @@ msgstr ""
" APT\n"
" {\n"
" /* This is not necessary if the two machines are the same arch, it tells\n"
-" the remote APT what architecture the Debian machine is */\n"
+" the remote APT what architecture the target machine is */\n"
" Architecture \"i386\";\n"
" \n"
" Get::Download-Only \"true\";\n"
@@ -11150,7 +10975,7 @@ msgstr ""
# type: <example></example>
#. type: <example></example>
#: offline.sgml:142
-#, fuzzy, no-wrap
+#, no-wrap
msgid ""
" # export APT_CONFIG=\"/disc/apt.conf\"\n"
" # apt-get update\n"
@@ -11160,9 +10985,9 @@ msgid ""
msgstr ""
" # export APT_CONFIG=\"/disc/apt.conf\"\n"
" # apt-get update\n"
-" [ パッケージファイルを取得します ]\n"
+" [ package ファイルを APT が取得します ]\n"
" # apt-get dist-upgrade\n"
-" [ アップグレードが必要な全パッケージを取得します ]"
+" [ 対象マシンをアップグレードするのに必要なパッケージを、APT が取得します ]"
#. type: </example></p>
#: offline.sgml:149
@@ -11183,7 +11008,7 @@ msgstr ""
# type: <example></example>
#. type: <example></example>
#: offline.sgml:159
-#, fuzzy, no-wrap
+#, no-wrap
msgid ""
" # export APT_CONFIG=\"/disc/apt.conf\"\n"
" # apt-get check\n"
@@ -11191,11 +11016,11 @@ msgid ""
" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
" [ Or any other APT command ]"
msgstr ""
-" # export APT_CONFIG=\"/disc/apt.conf\"\n"
-" # apt-get update\n"
-" [ パッケージファイルを取得します ]\n"
-" # apt-get dist-upgrade\n"
-" [ アップグレードが必要な全パッケージを取得します ]"
+" # export APT_CONFIG=\"/disc/apt.conf\"\n"
+" # apt-get check\n"
+" [ キャッシュファイルのローカルコピーを生成します ]\n"
+" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n"
+" [ もしくはその他の APT コマンド ]"
#. type: <p></p>
#: offline.sgml:165
@@ -11217,9 +11042,8 @@ msgstr ""
# type: <title></title>
#. type: <heading></heading>
#: offline.sgml:178
-#, fuzzy
msgid "Using APT and wget"
-msgstr "オフラインでの APT の使用法"
+msgstr "APT と wget の使用法"
#. type: <p></p>
#: offline.sgml:185
@@ -11241,9 +11065,8 @@ msgstr ""
# type: Content of: <refentry><refsect1><title>
#. type: <heading></heading>
#: offline.sgml:196
-#, fuzzy
msgid "Operation"
-msgstr "オプション"
+msgstr "操作"
#. type: <p><example>
#: offline.sgml:200
@@ -11261,6 +11084,10 @@ msgid ""
" # apt-get -qq --print-uris dist-upgrade > uris\n"
" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
msgstr ""
+" # apt-get dist-upgrade \n"
+" [ Press no when prompted, make sure you are happy with the actions ]\n"
+" # apt-get -qq --print-uris dist-upgrade > uris\n"
+" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script"
#. type: </example></p>
#: offline.sgml:210
@@ -11281,7 +11108,7 @@ msgstr ""
#. type: <p><example>
#: offline.sgml:219
msgid "The remote machine would do something like"
-msgstr ""
+msgstr "リモートマシンでは以下のようにします。"
#. type: <example></example>
#: offline.sgml:223
@@ -11291,6 +11118,9 @@ msgid ""
" # sh -x ./wget-script\n"
" [ wait.. ]"
msgstr ""
+" # cd /disc\n"
+" # sh -x ./wget-script\n"
+" [ お待ちください... ]"
#. type: </example><example>
#: offline.sgml:228
@@ -11303,12 +11133,12 @@ msgstr ""
#: offline.sgml:230
#, no-wrap
msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
-msgstr ""
+msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade"
#. type: </example></p>
#: offline.sgml:234
msgid "Which will use the already fetched archives on the disc."
-msgstr ""
+msgstr "これで、disc にある取得済みのアーカイブを使用するようになります。"
#~ msgid ""
#~ "<!ENTITY gnome-apt \"<citerefentry>\n"
@@ -11323,894 +11153,5 @@ msgstr ""
#~ " </citerefentry>\"\n"
#~ ">\n"
-# type: Content of: <refentry><refsect1><para>
-#, fuzzy
-#~| msgid "<filename>/etc/apt/preferences</filename>"
-#~ msgid "<filename>/var/lib/apt/extended_states</filename>"
-#~ msgstr "<filename>/etc/apt/preferences</filename>"
-
-#~ msgid "Cache-Limit"
-#~ msgstr "Cache-Limit"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "APT uses a fixed size memory mapped cache file to store the 'available' "
-#~ "information. This sets the size of that cache (in bytes)."
-#~ msgstr ""
-#~ "APT は「利用可能」情報を格納するために、固定サイズのメモリマップキャッシュ"
-#~ "ファイルを使用します。このオプションは、そのキャッシュサイズを指定します。"
-
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting>
-#~ msgid "Pin: release n=squeeze\n"
-#~ msgstr "Pin: release n=squeeze\n"
-
-# type: Content of: <refentry><refsect1><refsect2><para>
-#, fuzzy
-#~ msgid ""
-#~ "The <literal>Pin-Priority:</literal> line in each APT preferences record "
-#~ "is optional. If omitted, APT assigns a priority of 1 less than the last "
-#~ "value specified on a line beginning with <literal>Pin-Priority: "
-#~ "release ...</literal>."
-#~ msgstr ""
-#~ "APT 設定レコードの <literal>Pin-Priority:</literal> 行は任意です。省略する"
-#~ "と、<literal>Pin-Priority: release ...</literal> で始まる行で指示した最後"
-#~ "の値 (少なくとも1つ) を優先度に割り当てます。"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid ""
-#~ "<filename>apt.conf</filename> is the main configuration file for the APT "
-#~ "suite of tools, all tools make use of the configuration file and a common "
-#~ "command line parser to provide a uniform environment. When an APT tool "
-#~ "starts up it will read the configuration specified by the "
-#~ "<envar>APT_CONFIG</envar> environment variable (if any) and then read the "
-#~ "files in <literal>Dir::Etc::Parts</literal> then read the main "
-#~ "configuration file specified by <literal>Dir::Etc::main</literal> then "
-#~ "finally apply the command line options to override the configuration "
-#~ "directives, possibly loading even more config files."
-#~ msgstr ""
-#~ "<filename>apt.conf</filename> は、APT ツール集のメイン設定ファイルです。こ"
-#~ "の設定ファイルと共通のコマンドラインパーサを使って、すべてのツールを統一環"
-#~ "境で使用できます。APT ツールの起動時には、<envar>APT_CONFIG</envar> 環境変"
-#~ "数に指定した設定を (存在すれば) 読み込みます。次に <literal>Dir::Etc::"
-#~ "Parts</literal> のファイルを読み込みます。次に <literal>Dir::Etc::main</"
-#~ "literal> で指定した主設定ファイルを読み込み、最後にコマンドラインオプショ"
-#~ "ンで、設定ファイルより取得した値を上書きします。"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/trusted.gpg</filename>"
-#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid "Keyring of local trusted keys, new keys will be added here."
-#~ msgstr "ローカル信頼キーのキーリング。新しいキーはここに追加されます。"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "Disable Immediate Configuration; This dangerous option disables some of "
-#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be "
-#~ "necessary on some extremely slow single user systems but is very "
-#~ "dangerous and may cause package install scripts to fail or worse. Use at "
-#~ "your own risk."
-#~ msgstr ""
-#~ "即時設定無効 - この危険なオプションは、APT の要求コードを無効にして dpkg "
-#~ "の呼び出しをほとんどしないようにします。これは、非常に遅いシングルユーザシ"
-#~ "ステムでは必要かもしれませんが、非常に危険で、パッケージのインストールスク"
-#~ "リプトが失敗したり、もしくはもっと悪いことがおきるかもしれません。自己責任"
-#~ "で使用してください。"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "NoConfigure"
-#~ msgstr "config-files"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/sources.list</filename>"
-#~ msgstr "<filename>/etc/apt/sources.list</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::"
-#~ "SourceList</literal>."
-#~ msgstr ""
-#~ "パッケージの取得元。設定項目 - <literal>Dir::Etc::SourceList</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&statedir;/lists/</filename>"
-#~ msgstr "<filename>&statedir;/lists/</filename>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&statedir;/lists/partial/</filename>"
-#~ msgstr "<filename>&statedir;/lists/partial/</filename>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/apt.conf</filename>"
-#~ msgstr "<filename>/etc/apt/apt.conf</filename>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>"
-#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "APT configuration file fragments. Configuration Item: <literal>Dir::Etc::"
-#~ "Parts</literal>."
-#~ msgstr ""
-#~ "APT 設定ファイルの断片。設定項目 - <literal>Dir::Etc::Parts</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&cachedir;/archives/</filename>"
-#~ msgstr "<filename>&cachedir;/archives/</filename>"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#~ msgid ""
-#~ "Storage area for retrieved package files. Configuration Item: "
-#~ "<literal>Dir::Cache::Archives</literal>."
-#~ msgstr ""
-#~ "取得済みパッケージファイル格納エリア。設定項目 - <literal>Dir::Cache::"
-#~ "Archives</literal>"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "<filename>&cachedir;/archives/partial/</filename>"
-#~ msgstr "<filename>&cachedir;/archives/partial/</filename>"
-
-# type: <copyrightsummary></copyrightsummary>
-#~ msgid "Copyright &copy; Jason Gunthorpe, 1997-1998."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
-
-# type: Content of: <refentry><refnamediv><refpurpose>
-#, fuzzy
-#~ msgid "Note on Pointer access"
-#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作"
-
-# type: <example></example>
-#~ msgid ""
-#~ " void *Map = mmap(...);\n"
-#~ " Package *PkgList = (Package *)Map;\n"
-#~ " Header *Head = (Header *)Map;\n"
-#~ " char *Strings = (char *)Map;\n"
-#~ " cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl;"
-#~ msgstr ""
-#~ " void *Map = mmap(...);\n"
-#~ " Package *PkgList = (Package *)Map;\n"
-#~ " Header *Head = (Header *)Map;\n"
-#~ " char *Strings = (char *)Map;\n"
-#~ " cout << (Strings + PkgList[Head->HashTable[0]]->Name) << endl;"
-
-# type: <heading></heading>
-#~ msgid "Structures"
-#~ msgstr "構造"
-
-# type: <heading></heading>
-#~ msgid "Header"
-#~ msgstr "ヘッダ"
-
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid "This is the first item in the file."
-#~ msgstr "ファイル一覧ファイルを指定します。"
-
-# type: <example></example>
-#~ msgid ""
-#~ " struct Header\n"
-#~ " {\n"
-#~ " // Signature information\n"
-#~ " unsigned long Signature;\n"
-#~ " short MajorVersion;\n"
-#~ " short MinorVersion;\n"
-#~ " bool Dirty;\n"
-#~ " \n"
-#~ " // Size of structure values\n"
-#~ " unsigned short HeaderSz;\n"
-#~ " unsigned short PackageSz;\n"
-#~ " unsigned short PackageFileSz;\n"
-#~ " unsigned short VersionSz;\n"
-#~ " unsigned short DependencySz;\n"
-#~ " unsigned short ProvidesSz;\n"
-#~ " unsigned short VerFileSz;\n"
-#~ " \n"
-#~ " // Structure counts\n"
-#~ " unsigned long PackageCount;\n"
-#~ " unsigned long VersionCount;\n"
-#~ " unsigned long DependsCount;\n"
-#~ " unsigned long PackageFileCount;\n"
-#~ " \n"
-#~ " // Offsets\n"
-#~ " unsigned long FileList; // PackageFile\n"
-#~ " unsigned long StringList; // StringItem\n"
-#~ " unsigned long VerSysName; // StringTable\n"
-#~ " unsigned long Architecture; // StringTable\n"
-#~ " unsigned long MaxVerFileSize;\n"
-#~ " \n"
-#~ " // Allocation pools\n"
-#~ " struct\n"
-#~ " {\n"
-#~ " unsigned long ItemSize;\n"
-#~ "\t unsigned long Start;\n"
-#~ "\t unsigned long Count;\n"
-#~ " } Pools[7];\n"
-#~ "\n"
-#~ " // Package name lookup\n"
-#~ " unsigned long HashTable[2*1024]; // Package\n"
-#~ " };"
-#~ msgstr ""
-#~ " struct Header\n"
-#~ " {\n"
-#~ " // Signature information\n"
-#~ " unsigned long Signature;\n"
-#~ " short MajorVersion;\n"
-#~ " short MinorVersion;\n"
-#~ " bool Dirty;\n"
-#~ " \n"
-#~ " // Size of structure values\n"
-#~ " unsigned short HeaderSz;\n"
-#~ " unsigned short PackageSz;\n"
-#~ " unsigned short PackageFileSz;\n"
-#~ " unsigned short VersionSz;\n"
-#~ " unsigned short DependencySz;\n"
-#~ " unsigned short ProvidesSz;\n"
-#~ " unsigned short VerFileSz;\n"
-#~ " \n"
-#~ " // Structure counts\n"
-#~ " unsigned long PackageCount;\n"
-#~ " unsigned long VersionCount;\n"
-#~ " unsigned long DependsCount;\n"
-#~ " unsigned long PackageFileCount;\n"
-#~ " \n"
-#~ " // Offsets\n"
-#~ " unsigned long FileList; // PackageFile\n"
-#~ " unsigned long StringList; // StringItem\n"
-#~ " unsigned long VerSysName; // StringTable\n"
-#~ " unsigned long Architecture; // StringTable\n"
-#~ " unsigned long MaxVerFileSize;\n"
-#~ " \n"
-#~ " // Allocation pools\n"
-#~ " struct\n"
-#~ " {\n"
-#~ " unsigned long ItemSize;\n"
-#~ "\t unsigned long Start;\n"
-#~ "\t unsigned long Count;\n"
-#~ " } Pools[7];\n"
-#~ "\n"
-#~ " // Package name lookup\n"
-#~ " unsigned long HashTable[2*1024]; // Package\n"
-#~ " };"
-
-# type: <tag></tag>
-#~ msgid "Signature"
-#~ msgstr "Signature"
-
-# type: <tag></tag>
-#~ msgid "MajorVersion"
-#~ msgstr "MajorVersion"
-
-# type: <tag></tag>
-#~ msgid "MinorVersion"
-#~ msgstr "MinorVersion"
-
-# type: <tag></tag>
-#~ msgid "Dirty"
-#~ msgstr "Dirty"
-
-# type: <tag></tag>
-#~ msgid "HeaderSz"
-#~ msgstr "HeaderSz"
-
-# type: <tag></tag>
-#~ msgid "PackageSz"
-#~ msgstr "PackageSz"
-
-# type: <tag></tag>
-#~ msgid "PackageFileSz"
-#~ msgstr "PackageFileSz"
-
-# type: <tag></tag>
-#~ msgid "VersionSz"
-#~ msgstr "VersionSz"
-
-# type: <tag></tag>
-#~ msgid "DependencySz"
-#~ msgstr "DependencySz"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "VerFileSz"
-#~ msgstr "VerFileSz"
-
-# type: <tag></tag>
-#~ msgid "ProvidesSz"
-#~ msgstr "ProvidesSz"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "PackageCount"
-#~ msgstr "PackageFileCount"
-
-# type: <tag></tag>
-#~ msgid "VersionCount"
-#~ msgstr "VersionCount"
-
-# type: <tag></tag>
-#~ msgid "DependsCount"
-#~ msgstr "DependsCount"
-
-# type: <tag></tag>
-#~ msgid "PackageFileCount"
-#~ msgstr "PackageFileCount"
-
-# type: <tag></tag>
-#~ msgid "VerSysName"
-#~ msgstr "VerSysName"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "MaxVerFileSize"
-#~ msgstr "MaxVerFileSize"
-
-# type: <tag></tag>
-#~ msgid "StringList"
-#~ msgstr "StringList"
-
-# type: <tag></tag>
-#~ msgid "Pools"
-#~ msgstr "Pools"
-
-# type: <tag></tag>
-#~ msgid "HashTable"
-#~ msgstr "HashTable"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Package"
-#~ msgstr "Packages"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Name"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara>
-#, fuzzy
-#~ msgid "Name of the package."
-#~ msgstr "パッケージ名"
-
-# type: <tag></tag>
-#~ msgid "VersionList"
-#~ msgstr "VersionList"
-
-# type: <tag></tag>
-#~ msgid "CurrentVer"
-#~ msgstr "CurrentVer"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "Section"
-#~ msgstr "Sections"
-
-# type: <tag></tag>
-#~ msgid "NextPackage"
-#~ msgstr "NextPackage"
-
-# type: <tag></tag>
-#~ msgid "RevDepends"
-#~ msgstr "RevDepends"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "ProvidesList"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "SelectedState"
-#~ msgstr "DSelect での APT"
-
-# type: <tag></tag>
-#~ msgid "InstState"
-#~ msgstr "InstState"
-
-# type: <tag></tag>
-#~ msgid "CurrentState"
-#~ msgstr "CurrentState"
-
-# type: <tag></tag>
-#~ msgid "ID"
-#~ msgstr "ID"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Flags"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "PackageFile"
-#~ msgstr "PackageFileSz"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "FileName"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Archive"
-#~ msgstr "ArchiveDir"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Component"
-#~ msgstr "コメント"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Version"
-#~ msgstr "オプション"
-
-# type: <tag></tag>
-#~ msgid "Origin"
-#~ msgstr "Origin"
-
-# type: <tag></tag>
-#~ msgid "Label"
-#~ msgstr "Label"
-
-# type: <tag></tag>
-#~ msgid "NotAutomatic"
-#~ msgstr "NotAutomatic"
-
-# type: <tag></tag>
-#~ msgid "Site"
-#~ msgstr "Site"
-
-# type: <tag></tag>
-#~ msgid "Size"
-#~ msgstr "Size"
-
-# type: <tag></tag>
-#~ msgid "mtime"
-#~ msgstr "mtime"
-
-# type: <tag></tag>
-#~ msgid "VerStr"
-#~ msgstr "VerStr"
-
-# type: <tag></tag>
-#~ msgid "Arch"
-#~ msgstr "Arch"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextVer"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "DependsList"
-#~ msgstr "DependsList"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "ParentPkg"
-#~ msgstr "ParentVer"
-
-# type: <tag></tag>
-#~ msgid "InstalledSize"
-#~ msgstr "InstalledSize"
-
-# type: <tag></tag>
-#~ msgid "Hash"
-#~ msgstr "Hash"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Priority"
-#~ msgstr "priority 100"
-
-# type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid "This is the parsed priority value of the package."
-#~ msgstr "ファイル一覧ファイルを指定します。"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Dependency"
-#~ msgstr "DependencySz"
-
-# type: <tag></tag>
-#~ msgid "NextDepends"
-#~ msgstr "NextDepends"
-
-# type: <tag></tag>
-#~ msgid "NextRevDepends"
-#~ msgstr "NextRevDepends"
-
-# type: <tag></tag>
-#~ msgid "ParentVer"
-#~ msgstr "ParentVer"
-
-# type: <tag></tag>
-#~ msgid "Type"
-#~ msgstr "Type"
-
-# type: <tag></tag>
-#~ msgid "CompareOp"
-#~ msgstr "CompareOp"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Provides"
-#~ msgstr "ProvidesSz"
-
-# type: <tag></tag>
-#~ msgid "ProvideVersion"
-#~ msgstr "ProvideVersion"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextProvides"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "NextPkgProv"
-#~ msgstr "NextPkgProv"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "VerFile"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "File"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextFile"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "Offset"
-#~ msgstr "Offset"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "StringItem"
-#~ msgstr "安定版の追跡"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "String"
-#~ msgstr "安定版の追跡"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "NextItem"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "StringTable"
-#~ msgstr "安定版の追跡"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Defines"
-#~ msgstr "finger"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "Future Directions"
-#~ msgstr "Dir セクション"
-
-# type: <author></author>
-#, fuzzy
-#~ msgid "<name>Manoj Srivastava</name><email>srivasta@debian.org</email>"
-#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Procedural description"
-#~ msgstr "説明"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Set Options"
-#~ msgstr "オプション"
-
-#, fuzzy
-#~ msgid "Updates"
-#~ msgstr "update"
-
-# type: Content of: <refentry><refsect1><refsect2><title>
-#, fuzzy
-#~ msgid "Selection"
-#~ msgstr "Dir セクション"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Action"
-#~ msgstr "オプション"
-
-# type: Content of: <refentry><refnamediv><refpurpose>
-#, fuzzy
-#~ msgid "Modules and interfaces"
-#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作"
-
-# type: <tag></tag>
-#~ msgid "pdate Module"
-#~ msgstr "pdate モジュール"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "FTP methods"
-#~ msgstr "メソッド"
-
-# type: <tag></tag>
-#~ msgid "Dependency module"
-#~ msgstr "依存関係モジュール"
-
-#, fuzzy
-#~ msgid "Event generator"
-#~ msgstr "generate"
-
-# type: <author></author>
-#, fuzzy
-#~ msgid "<name>Tom Lees </name><email>tom@lpsg.demon.co.uk</email>"
-#~ msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>"
-
-# type: <copyrightsummary></copyrightsummary>
-#, fuzzy
-#~ msgid "Copyright &copy; Tom Lees, 1997."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1999."
-
-# type: Content of: <refentry><refsect1><para>
-#, fuzzy
-#~ msgid "The exact format for the \"Status:\" field is:"
-#~ msgstr "メンテナフィールドは一般的には、"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "not-installed"
-#~ msgstr "Clean-Installed"
-
-# type: <tag></tag>
-#~ msgid "unpacked"
-#~ msgstr "展開済み"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "half-configured"
-#~ msgstr "half-configured"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "installed"
-#~ msgstr "install"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "half-installed"
-#~ msgstr "Clean-Installed"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "config-files"
-#~ msgstr "config-files"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "post-inst-failed"
-#~ msgstr "オプション"
-
-#, fuzzy
-#~ msgid "removal-failed"
-#~ msgstr "remove"
-
-# type: Content of: <refentry><refnamediv><refpurpose>
-#, fuzzy
-#~ msgid "\"Documented\" command-line interfaces"
-#~ msgstr "APT パッケージ操作ユーティリティ -- キャッシュ操作"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "ldconfig"
-#~ msgstr "ldconfig"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "install-info"
-#~ msgstr "install"
-
-#, fuzzy
-#~ msgid "update-rc.d"
-#~ msgstr "update"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Assertions"
-#~ msgstr "オプション"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "APT Files"
-#~ msgstr "APT ファイル"
-
-# type: <copyrightsummary></copyrightsummary>
-#, fuzzy
-#~ msgid "Copyright &copy; Jason Gunthorpe, 1998-1999."
-#~ msgstr "Copyright &copy; Jason Gunthorpe, 1997-1998."
-
-#, fuzzy
-#~ msgid ""
-#~ "deb <var>uri</var> <var>distribution</var> <var>component</var> "
-#~ "[<var>component</var> ...]"
-#~ msgstr "deb uri distribution [component1] [component2] [...]"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid " http://www.debian.org/archive"
-#~ msgstr "deb http://archive.debian.org/debian-archive hamm main"
-
-# type: <example></example>
-#, fuzzy
-#~ msgid " ftp://ftp.debian.org/debian"
-#~ msgstr "deb ftp://ftp.debian.org/debian stable contrib"
-
-# type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid ""
-#~ "The file scheme allows an arbitrary directory in the file system to be "
-#~ "considered as a debian archive. This is useful for NFS mounts and local "
-#~ "mirrors/archives."
-#~ msgstr ""
-#~ "file スキームは、システム内の任意のディレクトリを、アーカイブとして扱える"
-#~ "ようにします。これは NFS マウントやローカルミラーで便利です。"
-
-# type: <example></example>
-#~ msgid " file:/var/debian"
-#~ msgstr " file:/var/debian"
-
-# type: <tag></tag>
-#~ msgid "smb"
-#~ msgstr "smb"
-
-# type: <tag></tag>
-#~ msgid "X-Auto"
-#~ msgstr "X-Auto"
-
-# type: <tag></tag>
-#~ msgid "X-TargetDist"
-#~ msgstr "X-TargetDist"
-
-# type: <tag></tag>
-#~ msgid "X-TargetVersion"
-#~ msgstr "X-TargetVersion"
-
-# type: <tag></tag>
-#~ msgid "Archive-[access]"
-#~ msgstr "Archive-[access]"
-
-# type: <tag></tag>
-#~ msgid "WWW-[access]"
-#~ msgstr "WWW-[access]"
-
-# type: <tag></tag>
-#~ msgid "CDImage-[access]"
-#~ msgstr "CDImage-[access]"
-
-# type: <tag></tag>
-#~ msgid "Incoming-[access]"
-#~ msgstr "Incoming-[access]"
-
-# type: <tag></tag>
-#~ msgid "nonUS-[access]"
-#~ msgstr "nonUS-[access]"
-
-# type: Content of: <refentry><refsect1><para>
-#~ msgid "This is the email address of the maintainer of the mirror."
-#~ msgstr "ミラーサイトの管理者のメールアドレスです。"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Location"
-#~ msgstr "場所"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Comment"
-#~ msgstr "コメント"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "The Release File"
-#~ msgstr "ソースオーバーライドファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Global configuration"
-#~ msgstr "共通設定"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "archive file"
-#~ msgstr "sources.list"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "source file"
-#~ msgstr "sources.list"
-
-# type: <tag></tag>
-#~ msgid "URI"
-#~ msgstr "URI"
-
-# type: <tag></tag>
-#~ msgid "method"
-#~ msgstr "メソッド"
-
-# type: <tag></tag>
-#~ msgid "method instance"
-#~ msgstr "メソッドインスタンス"
-
-# type: Content of: <refentry><refsect1><title>
-#~ msgid "Specification"
-#~ msgstr "仕様"
-
-# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para>
-#, fuzzy
-#~ msgid "601 Configuration - Sends the configuration space"
-#~ msgstr "設定箇所の内容を表示するだけです。"
-
-# type: <heading></heading>
-#, fuzzy
-#~ msgid "Header Fields"
-#~ msgstr "ヘッダ"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Filename"
-#~ msgstr "ファイル"
-
-# type: <tag></tag>
-#~ msgid "IMS-Hit"
-#~ msgstr "IMS-Hit"
-
-# type: <tag></tag>
-#~ msgid "MD5-Hash"
-#~ msgstr "MD5-Hash"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Fail"
-#~ msgstr "ファイル"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Operation failed"
-#~ msgstr "オプション"
-
-# type: <tag></tag>
-#, fuzzy
-#~ msgid "Single-Instance"
-#~ msgstr "Clean-Installed"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Local"
-#~ msgstr "オプション"
-
-# type: Content of: <refentry><refnamediv><refname>
-#, fuzzy
-#~ msgid "Send-Config"
-#~ msgstr "ldconfig"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Send configuration to the method."
-#~ msgstr "ユーザの設定"
-
-# type: Content of: <refentry><refsect1><title>
-#, fuzzy
-#~ msgid "Version string for the method"
-#~ msgstr "ユーザの設定"
-
-#, fuzzy
-#~ msgid "Notes"
-#~ msgstr "contents"
-
-#~ msgid "<literal>Debug::Vendor</literal>"
-#~ msgstr "<literal>Debug::Vendor</literal>"
+#~ msgid "<!ENTITY translation-title \"TRANSLATION\">"
+#~ msgstr "<!ENTITY translation-title \"訳者\">"
diff --git a/ftparchive/apt-ftparchive.cc b/ftparchive/apt-ftparchive.cc
index 6f9fa7ab3..73d34249b 100644
--- a/ftparchive/apt-ftparchive.cc
+++ b/ftparchive/apt-ftparchive.cc
@@ -135,6 +135,8 @@ void PackageMap::GetGeneral(Configuration &Setup,Configuration &Block)
PkgExt = Block.Find("Packages::Extensions",
Setup.Find("Default::Packages::Extensions",".deb").c_str());
+ Permissions = Setup.FindI("Default::FileMode",0644);
+
if (FLFile.empty() == false)
FLFile = flCombine(Setup.Find("Dir::FileListDir"),FLFile);
@@ -457,7 +459,7 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
string DFLFile = Setup.Find("TreeDefault::FileList", "");
string DSFLFile = Setup.Find("TreeDefault::SourceFileList", "");
- int const Permissions = Setup.FindI("Default::FileMode",0644);
+ mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
bool const LongDescription = Setup.FindB("Default::LongDescription",
_config->FindB("APT::FTPArchive::LongDescription", true));
@@ -548,6 +550,8 @@ void LoadTree(vector<PackageMap> &PkgList,Configuration &Setup)
/* */
void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
{
+ mode_t const Permissions = Setup.FindI("Default::FileMode",0644);
+
// Process 'bindirectory' type sections
const Configuration::Item *Top = Setup.Tree("bindirectory");
for (Top = (Top == 0?0:Top->Child); Top != 0;)
@@ -567,6 +571,7 @@ void LoadBinDir(vector<PackageMap> &PkgList,Configuration &Setup)
Itm.InternalPrefix = Block.Find("InternalPrefix",Top->Tag.c_str());
Itm.Contents = Block.Find("Contents");
Itm.ContentsHead = Block.Find("Contents::Header");
+ Itm.Permissions = Block.FindI("FileMode", Permissions);
Itm.GetGeneral(Setup,Block);
PkgList.push_back(Itm);
diff --git a/ftparchive/writer.cc b/ftparchive/writer.cc
index 58e32dade..c280f5ed3 100644
--- a/ftparchive/writer.cc
+++ b/ftparchive/writer.cc
@@ -708,18 +708,21 @@ bool SourcesWriter::DoPackage(string FileName)
// Add the dsc to the files hash list
string const strippedName = flNotDir(FileName);
std::ostringstream ostreamFiles;
- ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " "
- << strippedName << "\n " << Tags.FindS("Files");
+ if (Tags.Exists("Files"))
+ ostreamFiles << "\n " << string(MD5.Result()) << " " << St.st_size << " "
+ << strippedName << "\n " << Tags.FindS("Files");
string const Files = ostreamFiles.str();
std::ostringstream ostreamSha1;
- ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " "
- << strippedName << "\n " << Tags.FindS("Checksums-Sha1");
+ if (Tags.Exists("Checksums-Sha1"))
+ ostreamSha1 << "\n " << string(SHA1.Result()) << " " << St.st_size << " "
+ << strippedName << "\n " << Tags.FindS("Checksums-Sha1");
string const ChecksumsSha1 = ostreamSha1.str();
std::ostringstream ostreamSha256;
- ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " "
- << strippedName << "\n " << Tags.FindS("Checksums-Sha256");
+ if (Tags.Exists("Checksums-Sha256"))
+ ostreamSha256 << "\n " << string(SHA256.Result()) << " " << St.st_size << " "
+ << strippedName << "\n " << Tags.FindS("Checksums-Sha256");
string const ChecksumsSha256 = ostreamSha256.str();
// Strip the DirStrip prefix from the FileName and add the PathPrefix
diff --git a/methods/bzip2.cc b/methods/bzip2.cc
index 241f21c66..c668141a2 100644
--- a/methods/bzip2.cc
+++ b/methods/bzip2.cc
@@ -56,12 +56,9 @@ bool Bzip2Method::Fetch(FetchItem *Itm)
// Open the source and destination files
FileFd From(Path,FileFd::ReadOnly);
- // if the file is empty, just rename it and return
- if(From.Size() == 0)
- {
- rename(Path.c_str(), Itm->DestFile.c_str());
- return true;
- }
+ // FIXME add an error message saying that empty files can't be valid archives
+ if(From.Size() == 0)
+ return false;
int GzOut[2];
if (pipe(GzOut) < 0)
diff --git a/methods/gzip.cc b/methods/gzip.cc
index 5b9b66b50..22cae9424 100644
--- a/methods/gzip.cc
+++ b/methods/gzip.cc
@@ -48,12 +48,9 @@ bool GzipMethod::Fetch(FetchItem *Itm)
// Open the source and destination files
FileFd From(Path,FileFd::ReadOnlyGzip);
- // if the file is empty, just rename it and return
- if(From.Size() == 0)
- {
- rename(Path.c_str(), Itm->DestFile.c_str());
- return true;
- }
+ // FIXME add an error message saying that empty files can't be valid archives
+ if(From.Size() == 0)
+ return false;
FileFd To(Itm->DestFile,FileFd::WriteAtomic);
To.EraseOnFailure();
diff --git a/po/ca.po b/po/ca.po
index a2790e027..e9875fb72 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -3,19 +3,21 @@
# Antoni Bella Perez <bella5@teleline.es>, 2002, 2003.
# Matt Bonner <mateubonet@yahoo.com>, 2003.
# Jordi Mallach <jordi@debian.org>, 2004, 2005, 2006, 2008, 2009.
-#
+# Agustí Grau <fletxa@gmail.com>, 2010.
msgid ""
msgstr ""
"Project-Id-Version: apt 0.7.22\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2009-06-06 02:17+0200\n"
-"Last-Translator: Jordi Mallach <jordi@debian.org>\n"
+"PO-Revision-Date: 2010-09-02 11:51+0100\n"
+"Last-Translator: Agustí Grau <fletxa@gmail.com>\n"
"Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
"Language: ca\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
#: cmdline/apt-cache.cc:156
#, c-format
@@ -27,9 +29,8 @@ msgid "Total package names: "
msgstr "Nombre total de paquets: "
#: cmdline/apt-cache.cc:286
-#, fuzzy
msgid "Total package structures: "
-msgstr "Nombre total de paquets: "
+msgstr "Total d'estructures de paquets: "
#: cmdline/apt-cache.cc:326
msgid " Normal packages: "
@@ -97,9 +98,8 @@ msgid "Package file %s is out of sync."
msgstr "El fitxer %s del paquet està desincronitzat."
#: cmdline/apt-cache.cc:1273
-#, fuzzy
msgid "You must give at least one search pattern"
-msgstr "Heu de donar exactament un patró"
+msgstr "Heu de donar com a mínim un patró de cerca"
#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
#: cmdline/apt-cache.cc:1508
@@ -158,7 +158,6 @@ msgid "%s %s for %s compiled on %s %s\n"
msgstr "%s %s per a %s compilat el %s %s\n"
#: cmdline/apt-cache.cc:1739
-#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -215,7 +214,8 @@ msgstr ""
" dumpavail - Genera un registre llegible a stdout\n"
" unmet - Mostra dependències sense satisfer\n"
" search - Cerca en la llista de paquets per un patró d'expressió regular\n"
-" show - Mostra un registre llegible pel paquet\n"
+" show - Mostra un registre llegible pel paquet \n"
+" showauto - Mostra una llista de paquets instal·lats automàticanent\n"
" depends - Mostra informació de dependències (en cru) d'un paquet\n"
" rdepends - Mostra informació de dependències enrere d'un paquet\n"
" pkgnames - Llista els noms de tots els paquets del sistema\n"
@@ -235,18 +235,17 @@ msgstr ""
"informació.\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 2.1r1 Disc 1»"
+msgstr "Doneu un nom per a aquest disc, com per exemple «Debian 5.0.3 Disk 1»"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Inseriu un disc en la unitat i premeu Intro"
#: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount '%s' to '%s'"
-msgstr "No s'ha pogut canviar el nom de %s a %s"
+msgstr "No s'ha pogut muntar '%s' a '%s'"
#: cmdline/apt-cdrom.cc:162
msgid "Repeat this process for the rest of the CDs in your set."
@@ -447,7 +446,6 @@ msgid "DB is old, attempting to upgrade %s"
msgstr "La BD és vella, s'està intentant actualitzar %s"
#: ftparchive/cachedb.cc:72
-#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
@@ -760,19 +758,19 @@ msgid "%lu not fully installed or removed.\n"
msgstr "%lu no instal·lats o suprimits completament.\n"
#: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
+msgstr "Nota: s'està seleccionant '%s' per a la tasca '%s'\n"
#: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
+msgstr "Nota: s'està seleccionant '%s' per a l'expressió regular '%s'\n"
#: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Versió seleccionada %s (%s) per a %s\n"
+msgstr "Versió seleccionada '%s' (%s) per a '%s'\n"
#: cmdline/apt-get.cc:657
#, c-format
@@ -784,9 +782,8 @@ msgid " [Installed]"
msgstr " [Instal·lat]"
#: cmdline/apt-get.cc:677
-#, fuzzy
msgid " [Not candidate version]"
-msgstr "Versions candidates"
+msgstr "[Versió no candidata]"
#: cmdline/apt-get.cc:679
msgid "You should explicitly select one to install."
@@ -808,19 +805,19 @@ msgid "However the following packages replace it:"
msgstr "Tot i que els següents paquets el reemplacen:"
#: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' has no installation candidate"
-msgstr "El paquet %s no té candidat d'instal·lació"
+msgstr "El paquet '%s' no té candidat d'instal·lació"
#: cmdline/apt-get.cc:723
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Els paquets virtuals com '%s' no poden ser esborrats\n"
#: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
+msgstr "Nota: s'està seleccionant '%s' en comptes de '%s'\n"
#: cmdline/apt-get.cc:784
#, c-format
@@ -829,10 +826,10 @@ msgstr ""
"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
#: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-"S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
+"S'està ometent '%s', no està instal·lat i només es demana l'actualització.\n"
#: cmdline/apt-get.cc:798
#, c-format
@@ -1027,27 +1024,31 @@ msgid_plural ""
"The following packages disappeared from your system as\n"
"all files have been overwritten by other packages:"
msgstr[0] ""
+"El següent paquet ha desaparegut del vostre sistema ja\n"
+"que tots els fitxers s'han sobreescrit per altres paquets:"
msgstr[1] ""
+"Els següents paquets han desaparegut del vostre sistema ja\n"
+"que tots els fitxers s'han sobreescrit per altres paquets:"
#: cmdline/apt-get.cc:1324
msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "Nota: Això es realitzarà automàticament a propòsit del dpkg."
#: cmdline/apt-get.cc:1454
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorar la versió objectiu '%s' no disponible del paquet '%s'"
#: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "No s'ha pogut llegir la llista de paquets font %s"
+msgstr "S'està agafant '%s' com a paquet font en comptes de '%s'\n"
#. if (VerTag.empty() == false && Last == 0)
#: cmdline/apt-get.cc:1524
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorar la versió '%s' no disponible del paquet '%s'"
#: cmdline/apt-get.cc:1540
msgid "The update command takes no arguments"
@@ -1060,26 +1061,25 @@ msgstr ""
"automàtic"
#: cmdline/apt-get.cc:1653
-#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr[0] ""
-"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
+"El paquet següent s'ha instal·lat automàticament i ja no serà necessari:"
msgstr[1] ""
-"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
+"Els paquets següents s'han instal·lat automàticament i ja no són necessaris:"
#: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
msgstr[0] ""
-"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
+"El paquet %lu es va instal·lar automàticament i ja no és necessari:\n"
msgstr[1] ""
-"Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
+"Els paquets %lu es van s'instal·lar automàticament i ja no són necessaris:\n"
#: cmdline/apt-get.cc:1659
msgid "Use 'apt-get autoremove' to remove them."
@@ -1161,9 +1161,9 @@ msgid "Couldn't find package %s"
msgstr "No s'ha pogut trobar el paquet %s"
#: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
msgid "%s set to automatically installed.\n"
-msgstr "S'ha marcat %s com instal·lat manualment.\n"
+msgstr "S'ha marcat %s com instal·lat automàticament.\n"
#: cmdline/apt-get.cc:2002
msgid "Calculating upgrade... "
@@ -1201,6 +1201,9 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"Avís: L'empaquetat '%s' és mantingut pel sistema de control de versions '%s' "
+"a:\n"
+"%s\n"
#: cmdline/apt-get.cc:2246
#, c-format
@@ -1209,6 +1212,10 @@ msgid ""
"bzr get %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"Utilitzeu:\n"
+"bzr get %s\n"
+"per a recuperar les últimes actualitzacions (possiblement inèdites) del "
+"paquet.\n"
#: cmdline/apt-get.cc:2297
#, c-format
@@ -1325,7 +1332,6 @@ msgid "Supported modules:"
msgstr "Mòduls suportats:"
#: cmdline/apt-get.cc:2786
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1392,6 +1398,8 @@ msgstr ""
" clean - Esborra els fitxers d'arxiu baixats\n"
" autoclean - Esborra els fitxers d'arxiu antics baixats\n"
" check - Verifica que no hi hagi dependències trencades\n"
+" markauto - Marca els paquets donats com a instal·lats automàticament\n"
+" unmarkauto - Marca els paquets donats com a instal·lats manualment\n"
"\n"
"Opcions:\n"
" -h Aquest text d'ajuda.\n"
@@ -1419,6 +1427,10 @@ msgid ""
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"Nota: Això només és una simulació!\n"
+" l'apt-get necessita privilegis de root per a l'execució real.\n"
+" Tingueu en ment que el bloqueig està desactivat,\n"
+" per tant, no es depèn de la situació actual real."
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1499,15 +1511,14 @@ msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Voleu suprimir els paquets .deb baixats prèviament?"
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "S'han produït alguns errors en desempaquetar. Es configuraran"
+msgstr ""
+"S'han produït alguns errors en desempaquetar. Els paquets que s'han "
+"instal·lat"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr ""
-"els paquets que s'han instal·lat. Això pot resultar en errors duplicats"
+msgstr "seran configurats. Això pot provocar errors duplicats"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1556,9 +1567,9 @@ msgid "Error reading archive member header"
msgstr "S'ha produït un error en llegir la capçalera del membre de l'arxiu"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "La capçalera del membre de l'arxiu no és vàlida"
+msgstr "La capçalera %s del membre de l'arxiu no és vàlida"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -2053,20 +2064,20 @@ msgid "Temporary failure resolving '%s'"
msgstr "S'ha produït un error temporal en resoldre '%s'"
#: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
+msgstr "Ha passat alguna cosa estranya en resoldre '%s:%s' (%i - %s)"
#: methods/connect.cc:243
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "No es pot connectar amb %s %s:"
+msgstr "No es pot connectar amb %s:%s:"
#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
msgid "No keyring installed in %s."
-msgstr "S'està avortant la instal·lació."
+msgstr "No s'ha instal·lat cap clauer a %s."
#: methods/gpgv.cc:163
msgid ""
@@ -2080,10 +2091,9 @@ msgid "At least one invalid signature was encountered."
msgstr "S'ha trobat almenys una signatura invàlida."
#: methods/gpgv.cc:172
-#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-"No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el "
+"No s'ha pogut executar 'gpgv' per a verificar la firma (està instal·lat el "
"gpgv?)"
#: methods/gpgv.cc:177
@@ -2185,9 +2195,9 @@ msgid "Can't mmap an empty file"
msgstr "No es pot transferir un fitxer buit a memòria"
#: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't duplicate file descriptor %i"
-msgstr "No s'ha pogut obrir un conducte per a %s"
+msgstr "No s'ha pogut duplicar el descriptor del fitxer %i"
#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
#, c-format
@@ -2195,14 +2205,12 @@ msgid "Couldn't make mmap of %lu bytes"
msgstr "No s'ha pogut crear un mapa de memòria de %lu octets"
#: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
msgid "Unable to close mmap"
-msgstr "No es pot obrir %s"
+msgstr "No es pot tancar el mmap"
#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
msgid "Unable to synchronize mmap"
-msgstr "No es pot invocar"
+msgstr "No es pot sincronitzar el mmap"
#: apt-pkg/contrib/mmap.cc:300
#, c-format
@@ -2219,11 +2227,15 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
+"No s'ha pogut incrementar la mida del MMap ja que el limit de %lu bytes ja "
+"s'ha superat."
#: apt-pkg/contrib/mmap.cc:402
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
+"No s'ha pogut incrementar la mida del MMap ja que el creixement automàtic "
+"està deshabilitat per l'usuari."
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:371
@@ -2239,9 +2251,9 @@ msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:385
-#, fuzzy, c-format
+#, c-format
msgid "%limin %lis"
-msgstr "limin %lis"
+msgstr "%limin %lis"
#. s means seconds
#: apt-pkg/contrib/strutl.cc:390
@@ -2300,9 +2312,11 @@ msgid "Syntax error %s:%u: Unsupported directive '%s'"
msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»"
#: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt"
+msgstr ""
+"Error sintàctic %s:%u: la directiva clear requereix un arbre d'opcions com a "
+"argument"
#: apt-pkg/contrib/configuration.cc:827
#, c-format
@@ -2413,9 +2427,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "Sub-procés %s ha rebut una violació de segment."
#: apt-pkg/contrib/fileutl.cc:635
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Sub-procés %s ha rebut una violació de segment."
+msgstr "Sub-procés %s ha rebut una senyal %u."
#: apt-pkg/contrib/fileutl.cc:639
#, c-format
@@ -2433,9 +2447,9 @@ msgid "Could not open file %s"
msgstr "No s'ha pogut obrir el fitxer %s"
#: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file descriptor %d"
-msgstr "No s'ha pogut obrir un conducte per a %s"
+msgstr "No s'ha pogut obrir el descriptor del fitxer %d"
#: apt-pkg/contrib/fileutl.cc:774
#, c-format
@@ -2448,24 +2462,24 @@ msgid "write, still have %lu to write but couldn't"
msgstr "escrits, falten %lu per escriure però no s'ha pogut"
#: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
msgid "Problem closing the gzip file %s"
-msgstr "Ha hagut un problema en tancar el fitxer"
+msgstr "Ha hagut un problema en tancar el fitxer gzip %s"
#: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
msgid "Problem closing the file %s"
-msgstr "Ha hagut un problema en tancar el fitxer"
+msgstr "Ha hagut un problema en tancar el fitxer %s"
#: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr "Ha hagut un problema en sincronitzar el fitxer"
+msgstr "Ha hagut un problema en reanomenar el fitxer %s a %s"
#: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
msgid "Problem unlinking the file %s"
-msgstr "Ha hagut un problema en desenllaçar el fitxer"
+msgstr "Ha hagut un problema en desenllaçar el fitxer %s"
#: apt-pkg/contrib/fileutl.cc:938
msgid "Problem syncing the file"
@@ -2526,7 +2540,7 @@ msgstr "Trenca"
#: apt-pkg/pkgcache.cc:292
msgid "Enhances"
-msgstr ""
+msgstr "Millores"
#: apt-pkg/pkgcache.cc:303
msgid "important"
@@ -2578,6 +2592,8 @@ msgstr "No s'ha pogut escriure el fitxer d'estat temporal %s"
#, c-format
msgid "Internal error, group '%s' has no installable pseudo package"
msgstr ""
+"S'ha produït un error intern, el grup '%s' no disposa d'un pseudopaquet "
+"instal·lable"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2590,29 +2606,32 @@ msgid "Unable to parse package file %s (2)"
msgstr "No es pot analitzar el fitxer del paquet %s (2)"
#: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([opció] no reconeixible)"
#: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Línia %lu malformada en la llista de fonts %s (dist)"
+msgstr "Línia %lu malformada en la llista de fonts %s ([opció] massa curta)"
#: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([%s] no és una assignació)"
#: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
+msgstr "Línia %lu malformada en la llista de fonts %s ([%s] no té clau)"
#: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)"
+msgstr ""
+"Línia %lu malformada en la llista de fonts %s ([%s] la clau %s no té valor)"
#: apt-pkg/sourcelist.cc:128
#, c-format
@@ -2665,6 +2684,8 @@ msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"No s'ha pogut realitzar la configuració immediata de '%s'. Consulteu man 5 "
+"apt.conf, secció APT::Immediate-Configure per a més detalls. (%d)"
#: apt-pkg/packagemanager.cc:452
#, c-format
@@ -2684,6 +2705,8 @@ msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"No s'ha pogut realitzar la configuració immediata de '%s' ja desempaquetat. "
+"Consulteu man 5 apt.conf, secció APT::Immediate-Configure per a més detalls."
#: apt-pkg/pkgrecords.cc:32
#, c-format
@@ -2720,19 +2743,19 @@ msgstr ""
"s'han emprat els antics."
#: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
msgid "List directory %spartial is missing."
msgstr "Falta el directori de llistes %spartial."
#: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
msgid "Archives directory %spartial is missing."
-msgstr "Falta el directori d'arxiu %spartial."
+msgstr "Falta el directori d'arxius %spartial."
#: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock directory %s"
-msgstr "No es pot blocar el directori de la llista"
+msgstr "No es pot blocar el directori %s"
#. only show the ETA if it makes sense
#. two days
@@ -2790,9 +2813,9 @@ msgstr ""
"Potser voldreu executar apt-get update per a corregir aquests problemes"
#: apt-pkg/policy.cc:343
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera"
+msgstr "Registre no vàlid al fitxer de preferències %s, paquet sense capçalera"
#: apt-pkg/policy.cc:365
#, c-format
@@ -2834,9 +2857,9 @@ msgstr "S'ha produït un error durant el processament de %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
#: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "S'ha produït un error durant el processament de %s (NewVersion1)"
+msgstr "S'ha produït un error durant el processament de %s (NewVersion%d)"
#: apt-pkg/pkgcachegen.cc:320
#, c-format
@@ -2922,9 +2945,9 @@ msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
#. the time since then the file is invalid - formated in the same way as in
#. the download progress display (e.g. 7d 3h 42min 1s)
#: apt-pkg/acquire-item.cc:1277
-#, fuzzy, c-format
+#, c-format
msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr "El fitxer Release ha caducat, s'està ignorant %s (vàlid fins a %s)"
+msgstr "El fitxer Release ha caducat, s'està ignorant %s (invàlid des de %s)"
#: apt-pkg/acquire-item.cc:1298
#, c-format
@@ -2937,11 +2960,14 @@ msgid ""
"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used.GPG error: %s: %s\n"
msgstr ""
+"S'ha produït un error durant la verificació de la firma. El repositori no "
+"està actualitzat i serà utilitzat el fitxer d'índex anterior. error GPG: %s: "
+"%s\n"
#: apt-pkg/acquire-item.cc:1333
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "S'ha produït un error amb el GPG: %s: %s"
#: apt-pkg/acquire-item.cc:1361
#, c-format
@@ -2990,14 +3016,14 @@ msgid "No Hash entry in Release file %s"
msgstr "No hi ha una entrada Hash al fitxer Release %s"
#: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "No hi ha una entrada Hash al fitxer Release %s"
+msgstr "No hi ha una entrada 'Valid-Until' vàlida al fitxer Release %s"
#: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
msgid "Invalid 'Date' entry in Release file %s"
-msgstr "No hi ha una entrada Hash al fitxer Release %s"
+msgstr "No hi ha una entrada 'date' al fitxer Release %s"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -3062,6 +3088,8 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"No s'ha pogut localitzar cap fitxer del paquet, potser no és un disc de "
+"Debian o la arquitectura és incorrecta?"
#: apt-pkg/cdrom.cc:703
#, c-format
@@ -3116,19 +3144,19 @@ msgstr ""
"coincidents\n"
#: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
msgid "Skipping nonexistent file %s"
-msgstr "S'està obrint el fitxer de configuració %s"
+msgstr "S'està ometent el fitxer %s que no existeix"
#: apt-pkg/indexcopy.cc:538
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "No s'ha pogut trobar el registre d'autenticatió per a: %s"
#: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
msgid "Hash mismatch for: %s"
-msgstr "La suma resum no concorda"
+msgstr "El resum no coincideix per a: %s"
#: apt-pkg/cacheset.cc:337
#, c-format
@@ -3141,19 +3169,21 @@ msgid "Version '%s' for '%s' was not found"
msgstr "No s'ha trobat la versió «%s» per a «%s»"
#: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't find task '%s'"
-msgstr "No s'ha pogut trobar la tasca %s"
+msgstr "No s'ha pogut trobar la tasca '%s'"
#: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr "No s'ha pogut trobar el paquet %s"
+msgstr "No s'ha pogut trobar el paquet a través de l'expressió regular '%s'"
#: apt-pkg/cacheset.cc:467
#, c-format
msgid "Can't select versions from package '%s' as it purely virtual"
msgstr ""
+"No s'han pogut seleccionar les versions del paquet '%s' ja que és purament "
+"virtual"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
#, c-format
@@ -3161,21 +3191,29 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
+"No s'han pogut seleccionar la versió instal·lada ni la candidata del paquet "
+"'%s' ja que no estan disponibles cap de les dues"
#: apt-pkg/cacheset.cc:491
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
+"No s'ha pogut seleccionar la versió més nova del paquet '%s' ja que és "
+"purament virtual"
#: apt-pkg/cacheset.cc:499
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
+"No s'ha pogut seleccionar la versió candidata del paquet %s ja que no té "
+"candidata"
#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
+"No s'ha pogut seleccionar la versió instal·lada del paquet %s ja que no està "
+"instal·lada"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
@@ -3193,14 +3231,14 @@ msgid "Removing %s"
msgstr "S'està suprimint el paquet %s"
#: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
msgid "Completely removing %s"
-msgstr "S'ha suprimit completament el paquet %s"
+msgstr "S'ha suprimit completament %s"
#: apt-pkg/deb/dpkgpm.cc:56
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Anotant la desaparició de %s"
#: apt-pkg/deb/dpkgpm.cc:57
#, c-format
@@ -3213,9 +3251,9 @@ msgid "Directory '%s' missing"
msgstr "Manca el directori «%s»"
#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file '%s'"
-msgstr "No s'ha pogut obrir el fitxer %s"
+msgstr "No s'ha pogut obrir el fitxer '%s'"
#: apt-pkg/deb/dpkgpm.cc:812
#, c-format
@@ -3265,39 +3303,47 @@ msgstr ""
#: apt-pkg/deb/dpkgpm.cc:1070
msgid "Running dpkg"
-msgstr ""
+msgstr "S'està executant dpkg"
#: apt-pkg/deb/dpkgpm.cc:1273
msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "No s'ha escrit cap informe perquè ja s'ha superat MaxReports"
#. check if its not a follow up error
#: apt-pkg/deb/dpkgpm.cc:1278
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "S'han produït problemes de depències, es deixa sense configurar"
#: apt-pkg/deb/dpkgpm.cc:1280
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica que és un error "
+"consequent de una fallida anterior."
#: apt-pkg/deb/dpkgpm.cc:1286
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"disc ple"
#: apt-pkg/deb/dpkgpm.cc:1292
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica una fallida per "
+"falta de memòria"
#: apt-pkg/deb/dpkgpm.cc:1299
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
+"No s'ha escrit cap informe perquè el missatge d'error indica d'una fallida "
+"d'I/O del dpkg"
#: apt-pkg/deb/debsystem.cc:69
#, c-format
@@ -3305,11 +3351,13 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"No s'ha pogut bloquejar el directori d'administració (%s), hi ha cap altre "
+"procés utilitzant-lo?"
#: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "No es pot blocar el directori de la llista"
+msgstr "No es pot blocar el directori d'administració (%s), sou root?"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -3318,6 +3366,8 @@ msgstr "No es pot blocar el directori de la llista"
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
msgstr ""
+"S'ha interromput el dpkg, harieu d'executar manualment '%s' per a corregir "
+"el problema."
#: apt-pkg/deb/debsystem.cc:106
msgid "Not locked"
@@ -3328,12 +3378,12 @@ msgstr "No blocat"
#: methods/mirror.cc:200
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "No s'ha trobat el fitxer rèplica '%s'"
#: methods/mirror.cc:343
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Rèplica: %s]"
#: methods/rred.cc:465
#, c-format
@@ -3341,6 +3391,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"No s'ha pogut apedaçar %s amb el mmap ni amb la utilització de la operació "
+"del fitxer - el pedaç sembla ser incorrecte"
#: methods/rred.cc:470
#, c-format
@@ -3348,6 +3400,8 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"No s'ha pogut apedaçar %s amb el mmap (però no s'ha produït un error "
+"específic del mmap) - el pedaç sembla ser incorrecte"
#: methods/rsh.cc:329
msgid "Connection closed prematurely"
diff --git a/po/da.po b/po/da.po
index 9f3dedd1f..87d4402af 100644
--- a/po/da.po
+++ b/po/da.po
@@ -1,38 +1,37 @@
-# translation of apt_po_da.po to Danish
-# translation of da.po to Danish
-# Advanced Package Transfer - APT message translation catalog
-# Danish messages
-#
+# Danish translation apt.
+# Copyright (C) 2010 apt & nedenstående oversættere.
+# This file is distributed under the same license as the apt package.
# Claus Hindsgaul <claus_h@image.dk>, 2002,2003, 2004, 2005, 2006.
# Claus Hindsgaul <claus.hindsgaul@gmail.com>, 2006, 2007.
+# Joe Hansen <joedalton2@yahoo.dk>, 2010.
+#
msgid ""
msgstr ""
-"Project-Id-Version: apt-da\n"
+"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2007-09-06 21:40+0200\n"
-"Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
-"Language-Team: Danish\n"
+"PO-Revision-Date: 2010-09-01 23:51+0200\n"
+"Last-Translator: Joe Hansen <joedalton2@yahoo.dk>\n"
+"Language-Team: Danish <debian-l10n-danish@lists.debian.org> \n"
"Language: \n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.11.4\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: cmdline/apt-cache.cc:156
#, c-format
msgid "Package %s version %s has an unmet dep:\n"
-msgstr "<Pakken %s version %s har en uopfyldt afhngighed:\n"
+msgstr "Pakken %s version %s har en uopfyldt afhængighed:\n"
#: cmdline/apt-cache.cc:284
msgid "Total package names: "
-msgstr "Totale pakkenavne : "
+msgstr "Samlet antal pakkenavne: "
#: cmdline/apt-cache.cc:286
-#, fuzzy
msgid "Total package structures: "
-msgstr "Totale pakkenavne : "
+msgstr "Samlet antal pakkestrukturer: "
#: cmdline/apt-cache.cc:326
msgid " Normal packages: "
@@ -64,7 +63,7 @@ msgstr "Sammenlagt forskellige beskrivelser: "
#: cmdline/apt-cache.cc:336
msgid "Total dependencies: "
-msgstr "Sammenlagt afhngigheder: "
+msgstr "Sammenlagt afhængigheder: "
#: cmdline/apt-cache.cc:339
msgid "Total ver/file relations: "
@@ -80,11 +79,11 @@ msgstr "Sammenlagt 'Tilbyder'-markeringer: "
#: cmdline/apt-cache.cc:355
msgid "Total globbed strings: "
-msgstr "Totalle sgemnsterstrenge: "
+msgstr "Totalle søgemønsterstrenge: "
#: cmdline/apt-cache.cc:369
msgid "Total dependency version space: "
-msgstr "Total afhngighedsversions-plads: "
+msgstr "Total afhængighedsversions-plads: "
#: cmdline/apt-cache.cc:374
msgid "Total slack space: "
@@ -92,7 +91,7 @@ msgstr "Total 'Slack'-plads: "
#: cmdline/apt-cache.cc:382
msgid "Total space accounted for: "
-msgstr "Total plads, der kan gres rede for: "
+msgstr "Total plads, der kan gøres rede for: "
#: cmdline/apt-cache.cc:513 cmdline/apt-cache.cc:1194
#, c-format
@@ -100,9 +99,8 @@ msgid "Package file %s is out of sync."
msgstr "Pakkefilen %s er ude af trit."
#: cmdline/apt-cache.cc:1273
-#, fuzzy
msgid "You must give at least one search pattern"
-msgstr "Du skal angive mindst t filnavn"
+msgstr "Du skal angive mindst ét søgemønster"
#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
#: cmdline/apt-cache.cc:1508
@@ -115,7 +113,7 @@ msgid "Unable to locate package %s"
msgstr "Kunne ikke lokalisere pakken %s"
# Overskriften til apt-cache policy,
-# forkorter "Package" vk. CH
+# forkorter "Package" væk. CH
#: cmdline/apt-cache.cc:1533
msgid "Package files:"
msgstr "Pakkefiler:"
@@ -157,12 +155,11 @@ msgstr " Versionstabel:"
#: cmdline/apt-cache.cc:1732 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70
#: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:584
#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
-#, fuzzy, c-format
+#, c-format
msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s oversat %s %s\n"
+msgstr "%s %s for %s kompileret på %s %s\n"
#: cmdline/apt-cache.cc:1739
-#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -206,54 +203,55 @@ msgstr ""
" apt-cache [tilvalg] showpkg pakke1 [pakke2 ...]\n"
" apt-cache [tilvalg] showsrc pakke1 [pakke2 ...]\n"
"\n"
-"apt-cache er et lavniveau-vrktj, der bruge hndtere APTs\n"
-"binre mellemlager-filer og hente oplysninger fra dem.\n"
+"apt-cache er et lavniveauværktøj, brugt til at manipulere APTs\n"
+"binære mellemlagerfiler og hente oplysninger fra dem.\n"
"\n"
"Kommandoer:\n"
-" add - Tilfj en pakkefil til kilde-mellemlageret\n"
-" gencaches - Opbyg bde pakke- og kilde-mellemlageret\n"
+" add - Tilføj en pakkefil til kildemellemlageret\n"
+" gencaches - Opbyg både pakke- og kildemellemlageret\n"
" showpkg - Vis generelle oplysninger om en enkelt pakke\n"
" showsrc - Vis kildetekstposter\n"
-" stats - Vis nogle grundlggende statistikker\n"
+" stats - Vis nogle grundlæggende statistikker\n"
" dump - Vis hele filen i kort form\n"
-" dumpavail - Udls en 'available'-fil til standard-ud\n"
-" unmet - Vis uopfyldte afhngigheder\n"
-" search - Gennemsg pakkelisten med et regulrt udtryk\n"
-" show - Vis en lsbar post for pakken\n"
-" depends - Vis de r afhngighedsoplysninger for en pakke\n"
-" rdepends - Vis omvendte afhngighedsoplysninger for en pakke\n"
-" pkgnames - Vis navnene p alle pakker\n"
-" dotty - Generr pakkegrafer til GraphViz\n"
-" xvcg - Generr pakkegrafer til xvcg\n"
+" dumpavail - Udlæs en 'available'-fil til standard-ud\n"
+" unmet - Vis uopfyldte afhængigheder\n"
+" search - Gennemsøg pakkelisten med et regulært udtryk\n"
+" show - Vis en læsbar post for pakken\n"
+" showauto - Vis en liste af automatisk installerede pakker\n"
+" depends - Vis de rå afhængighedsoplysninger for en pakke\n"
+" rdepends - Vis omvendte afhængighedsoplysninger for en pakke\n"
+" pkgnames - Vis navnene på alle pakker\n"
+" dotty - Generér pakkegrafer til GraphViz\n"
+" xvcg - Generér pakkegrafer til xvcg\n"
" policy - Vis policy-indstillinger\n"
"\n"
"Tilvalg:\n"
-" -h Denne hjlpetekst.\n"
-" -p=? Pakke-mellemlageret.\n"
-" -s=? Kilde-mellemlageret.\n"
-" -q Deaktivr fremgangsindikatoren.\n"
-" -i Vis kun vigtige afhngigheder for 'unmet'-kommandoen.\n"
-" -c=? Ls denne opstningsfil\n"
-" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
+" -h Denne hjælpetekst.\n"
+" -p=? Pakkemellemlageret.\n"
+" -s=? Kildemellemlageret.\n"
+" -q Deaktivér fremgangsindikatoren.\n"
+" -i Vis kun vigtige afhængigheder for kommandoen 'unmet'.\n"
+" -c=? Læs denne opsætningsfil\n"
+" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
"Se manualsiderne for apt-cache(8) og apt.conf(5) for flere oplysninger.\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Angiv et navn for denne disk, som f.eks. 'Debian 2.1r1 Disk 1'"
+msgstr ""
+"Angiv venligst et navn for denne disk, som f.eks. 'Debian 5.0.3 Disk 1'"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
-msgstr "Indst en disk i drevet og tryk retur"
+msgstr "Indsæt en disk i drevet og tryk retur"
#: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount '%s' to '%s'"
-msgstr "Kunne ikke omdbe %s til %s"
+msgstr "Kunne ikke montere %s til %s"
#: cmdline/apt-cdrom.cc:162
msgid "Repeat this process for the rest of the CDs in your set."
-msgstr "Gentag processen for resten af cd'erne i dit st."
+msgstr "Gentag processen for resten af cd'erne i dit sæt."
#: cmdline/apt-config.cc:41
msgid "Arguments not in pairs"
@@ -276,16 +274,16 @@ msgid ""
msgstr ""
"Brug: apt-config [tilvalg] kommando\n"
"\n"
-"apt-config er et simpelt vrktj til at lse APTs opstningsfil\n"
+"apt-config er et simpelt værktøj til at læse APTs opsætningsfil\n"
"\n"
"Kommandoer:\n"
" shell - Skal-tilstand\n"
-" dump - Vis opstningen\n"
+" dump - Vis opsætningen\n"
"\n"
"Tilvalg:\n"
-" -h Denne hjlpetekst.\n"
-" -c=? Ls denne opstningsfil\n"
-" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
+" -h Denne hjælpetekst.\n"
+" -c=? Læs denne opsætningsfil\n"
+" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
@@ -307,14 +305,14 @@ msgid ""
msgstr ""
"Brug: apt-extracttemplates fil1 [fil2 ...]\n"
"\n"
-"apt-extracttemplates er et vrktj til at uddrage opstnings- og skabelon-"
+"apt-extracttemplates er et værktøj til at uddrage opsætnings- og skabelon-"
"oplysninger fra Debianpakker\n"
"\n"
"Tilvalg:\n"
-" -h Denne hjlpetekst\n"
+" -h Denne hjælpetekst\n"
" -t Angiv temp-mappe\n"
-" -c=? Ls denne opstningsfil\n"
-" -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n"
+" -c=? Læs denne opsætningsfil\n"
+" -o=? Angiv et opsætningstilvalg. F.eks. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
#, c-format
@@ -391,43 +389,43 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
"Brug: apt-ftparchive [tilvalg] kommando\n"
-"Kommandoer: packges binrsti [tvangsfil [sti]]\n"
+"Kommandoer: packges binærsti [tvangsfil [sti]]\n"
" sources kildesti [tvangsfil [sti]]\n"
" contents sti\n"
" release sti\n"
" generate config [grupper]\n"
" clean config\n"
"\n"
-"apt-ftparchive laver indeksfiler til Debianarkiver. Det understtter \n"
+"apt-ftparchive laver indeksfiler til Debianarkiver. Det understøtter \n"
"mange former for generering, lige fra fuldautomatiske til funktionelle\n"
"erstatninger for dpkg-scanpackages og dpkg-scansources\n"
"\n"
-"apt-ftparchive genererer Package-filer ud fra trer af .deb'er.\n"
-"Package-filen indeholder alle styrefelterne fra hver pakke svel\n"
-"som MD5-mnstre og filstrrelser. En tvangsfil understttes til at\n"
+"apt-ftparchive genererer Package-filer ud fra træer af .deb'er.\n"
+"Package-filen indeholder alle styrefelterne fra hver pakke såvel\n"
+"som MD5-mønstre og filstørrelser. En tvangsfil understøttes til at\n"
"gennemtvinge indholdet af Priority og Section.\n"
"\n"
-"P samme mde genererer apt-ftparchive Sources-filer ud fra trer\n"
+"På samme måde genererer apt-ftparchive Sources-filer ud fra træer\n"
"med .dsc'er. Tvangstilvalget --source-override kan bruges til at\n"
"angive en src-tvangsfil.\n"
"\n"
-"Kommandoerne 'packages' og 'sources' skal kres i roden af tret.\n"
-"binrsti skal pege p basen af rekursive sgninger og tvangsfilen\n"
+"Kommandoerne 'packages' og 'sources' skal køres i roden af træet.\n"
+"binærsti skal pege på basen af rekursive søgninger og tvangsfilen\n"
"skal indeholde tvangsflagene. Sti foranstilles eventuelle\n"
-"filnavnfelter. Et eksempel p brug fra Debianarkivet:\n"
+"filnavnfelter. Et eksempel på brug fra Debianarkivet:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
"Tilvalg:\n"
-" -h Denne hjlpetekst\n"
+" -h Denne hjælpetekst\n"
" --md5 Styr generering af MD5\n"
" -s=? Kilde-tvangsfil\n"
" -q Stille\n"
-" -d=? Vlg den valgfrie mellemlager-database\n"
-" --no-delink Aktivr \"delinking\"-fejlsporingstilstand\n"
+" -d=? Vælg den valgfrie mellemlager-database\n"
+" --no-delink Aktivér \"delinking\"-fejlsporingstilstand\n"
" --contents Bestem generering af indholdsfil\n"
-" -c=? Ls denne opstningsfil\n"
-" -o=? St en opstnings-indstilling"
+" -c=? Læs denne opsætningsfil\n"
+" -o=? Sæt en opsætnings-indstilling"
#: ftparchive/apt-ftparchive.cc:796
msgid "No selections matched"
@@ -441,26 +439,25 @@ msgstr "Visse filer mangler i pakkefilgruppen '%s'"
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "DB var delagt, filen omdbt til %s.old"
+msgstr "DB var ødelagt, filen omdøbt til %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "DB er gammel, forsger at opgradere %s"
+msgstr "DB er gammel, forsøger at opgradere %s"
#: ftparchive/cachedb.cc:72
-#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
-"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere "
-"version af apt, s fjern og genskab databasen."
+"Databaseformatet er ugyldigt. Hvis du har opgraderet fra en ældre version af "
+"apt, så fjern og genskab databasen."
#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Kunne ikke bne DB-filen %s: %s"
+msgstr "Kunne ikke åbne DB-filen %s: %s"
#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
@@ -474,17 +471,17 @@ msgstr "Arkivet har ingen kontrolindgang"
#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
-msgstr "Kunne skaffe en markr"
+msgstr "Kunne skaffe en markør"
#: ftparchive/writer.cc:73
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "A: Kunne ikke lse mappen %s\n"
+msgstr "A: Kunne ikke læse mappen %s\n"
#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "W: Kunne ikke finde finde %s\n"
+msgstr "W: Kunne ikke finde %s\n"
#: ftparchive/writer.cc:134
msgid "E: "
@@ -496,21 +493,21 @@ msgstr "A: "
#: ftparchive/writer.cc:143
msgid "E: Errors apply to file "
-msgstr "F: Fejlene vedrrer filen "
+msgstr "F: Fejlene vedrører filen "
#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
#, c-format
msgid "Failed to resolve %s"
-msgstr "Kunne ikke omstte navnet %s"
+msgstr "Kunne ikke omsætte navnet %s"
#: ftparchive/writer.cc:174
msgid "Tree walking failed"
-msgstr "Trvandring mislykkedes"
+msgstr "Trævandring mislykkedes"
#: ftparchive/writer.cc:201
#, c-format
msgid "Failed to open %s"
-msgstr "Kunne ikke bne %s"
+msgstr "Kunne ikke åbne %s"
#: ftparchive/writer.cc:260
#, c-format
@@ -525,17 +522,17 @@ msgstr "Kunne ikke 'readlink' %s"
#: ftparchive/writer.cc:272
#, c-format
msgid "Failed to unlink %s"
-msgstr "Kunne ikke frigre %s"
+msgstr "Kunne ikke frigøre %s"
#: ftparchive/writer.cc:279
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Kunne ikke lnke %s til %s"
+msgstr "*** Kunne ikke lænke %s til %s"
#: ftparchive/writer.cc:289
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " Nede DeLink-begrnsningen p %sB.\n"
+msgstr " Nåede DeLink-begrænsningen på %sB.\n"
#: ftparchive/writer.cc:393
msgid "Archive had no package field"
@@ -554,13 +551,13 @@ msgstr " pakkeansvarlig for %s er %s, ikke %s\n"
#: ftparchive/writer.cc:698
#, c-format
msgid " %s has no source override entry\n"
-msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n"
+msgstr " %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
#: ftparchive/writer.cc:702
#, c-format
msgid " %s has no binary override entry either\n"
msgstr ""
-" %s har ingen linje med tilsidesttelse af standard for binre filer\n"
+" %s har ingen linje med tilsidesættelse af standard for binøre filer\n"
#: ftparchive/contents.cc:321
#, c-format
@@ -574,7 +571,7 @@ msgstr "realloc - Kunne ikke allokere hukommelse"
#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
-msgstr "Kunne ikke bne %s"
+msgstr "Kunne ikke åbne %s"
#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
@@ -594,7 +591,7 @@ msgstr "Ugyldig gennemtvangs %s-linje %lu #3"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Kunne ikke lse gennemtvangsfilen %s"
+msgstr "Kunne ikke læse gennemtvangsfilen %s"
#: ftparchive/multicompress.cc:72
#, c-format
@@ -604,11 +601,11 @@ msgstr "Ukendt komprimeringsalgoritme '%s'"
#: ftparchive/multicompress.cc:102
#, c-format
msgid "Compressed output %s needs a compression set"
-msgstr "Komprimerede uddata %s krver et komprimeringsst"
+msgstr "Komprimerede uddata %s kræver et komprimeringssæt"
#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Kunne ikke oprette IPC-viderefrsel til underproces"
+msgstr "Kunne ikke oprette IPC-videreførsel til underproces"
#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
@@ -633,7 +630,7 @@ msgstr "Kunne ikke oprette underproces IPC"
#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
-msgstr "Kunne ikke udfre komprimeringsprogram"
+msgstr "Kunne ikke udføre komprimeringsprogram "
#: ftparchive/multicompress.cc:360
msgid "decompressor"
@@ -645,17 +642,17 @@ msgstr "IO til underproces/fil mislykkedes"
#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
-msgstr "Kunne ikke lse under beregning af MD5"
+msgstr "Kunne ikke læse under beregning af MD5"
#: ftparchive/multicompress.cc:472
#, c-format
msgid "Problem unlinking %s"
-msgstr "Problem under aflnkning af %s"
+msgstr "Problem under aflænkning af %s"
#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Kunne ikke omdbe %s til %s"
+msgstr "Kunne ikke omdøbe %s til %s"
#: cmdline/apt-get.cc:134
msgid "Y"
@@ -664,11 +661,11 @@ msgstr "J"
#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Fejl ved tolkning af regulrt udtryk - %s"
+msgstr "Fejl ved tolkning af regulært udtryk - %s"
#: cmdline/apt-get.cc:251
msgid "The following packages have unmet dependencies:"
-msgstr "Flgende pakker har uopfyldte afhngigheder:"
+msgstr "Følgende pakker har uopfyldte afhængigheder:"
#: cmdline/apt-get.cc:341
#, c-format
@@ -702,27 +699,27 @@ msgstr " eller"
#: cmdline/apt-get.cc:391
msgid "The following NEW packages will be installed:"
-msgstr "Flgende NYE pakker vil blive installeret:"
+msgstr "Følgende NYE pakker vil blive installeret:"
#: cmdline/apt-get.cc:419
msgid "The following packages will be REMOVED:"
-msgstr "Flgende pakker vil blive AFINSTALLERET:"
+msgstr "Følgende pakker vil blive AFINSTALLERET:"
#: cmdline/apt-get.cc:441
msgid "The following packages have been kept back:"
-msgstr "Flgende pakker er blevet holdt tilbage:"
+msgstr "Følgende pakker er blevet holdt tilbage:"
#: cmdline/apt-get.cc:464
msgid "The following packages will be upgraded:"
-msgstr "Flgende pakker vil blive opgraderet:"
+msgstr "Følgende pakker vil blive opgraderet:"
#: cmdline/apt-get.cc:487
msgid "The following packages will be DOWNGRADED:"
-msgstr "Flgende pakker vil blive NEDGRADERET:"
+msgstr "Følgende pakker vil blive NEDGRADERET:"
#: cmdline/apt-get.cc:507
msgid "The following held packages will be changed:"
-msgstr "Flgende tilbageholdte pakker vil blive ndret:"
+msgstr "Følgende tilbageholdte pakker vil blive ændret:"
#: cmdline/apt-get.cc:560
#, c-format
@@ -734,8 +731,8 @@ msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"ADVARSEL: Flgende essentielle pakker vil blive afinstalleret\n"
-"Dette br IKKE ske medmindre du er helt klar over, hvad du laver!"
+"ADVARSEL: Følgende essentielle pakker vil blive afinstalleret\n"
+"Dette bør IKKE ske medmindre du er helt klar over, hvad du laver!"
#: cmdline/apt-get.cc:602
#, c-format
@@ -760,22 +757,22 @@ msgstr "%lu afinstalleres og %lu opgraderes ikke.\n"
#: cmdline/apt-get.cc:614
#, c-format
msgid "%lu not fully installed or removed.\n"
-msgstr "%lu ikke fuldstndigt installerede eller afinstallerede.\n"
+msgstr "%lu ikke fuldstændigt installerede eller afinstallerede.\n"
#: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
+msgstr "Bemærk, vælger '%s' til opgave '%s'\n"
#: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n"
+msgstr "Bemærk, vælger '%s' for regulært udtryk '%s'\n"
#: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Valgte version %s (%s) af %s\n"
+msgstr "Valgte version '%s' (%s) for '%s'\n"
#: cmdline/apt-get.cc:657
#, c-format
@@ -787,13 +784,12 @@ msgid " [Installed]"
msgstr " [Installeret]"
#: cmdline/apt-get.cc:677
-#, fuzzy
msgid " [Not candidate version]"
-msgstr "Kandidatversioner"
+msgstr " [Ingen kandidatversion]"
#: cmdline/apt-get.cc:679
msgid "You should explicitly select one to install."
-msgstr "Du br eksplicit vlge en at installere."
+msgstr "Du bør eksplicit vælge en at installere."
#: cmdline/apt-get.cc:682
#, c-format
@@ -802,28 +798,28 @@ msgid ""
"This may mean that the package is missing, has been obsoleted, or\n"
"is only available from another source\n"
msgstr ""
-"Pakken %s har ingen tilgngelig version, men der refereres til den i en \n"
-"anden pakke. Det kan betyde at denne pakke blevet overfldiggjort eller \n"
+"Pakken %s har ingen tilgængelig version, men der refereres til den i en \n"
+"anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
"kun kan hentes fra andre kilder\n"
#: cmdline/apt-get.cc:700
msgid "However the following packages replace it:"
-msgstr "Dog kan flgende pakker erstatte den:"
+msgstr "Dog kan følgende pakker erstatte den:"
#: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' has no installation candidate"
-msgstr "Pakken %s har ingen installationskandidat"
+msgstr "Pakken '%s' har ingen installationskandidat"
#: cmdline/apt-get.cc:723
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Virtuelle pakker som '%s' kan ikke fjernes\n"
#: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Bemrk, at %s vlges fremfor %s\n"
+msgstr "Bemærk, vælger '%s' fremfor '%s'\n"
#: cmdline/apt-get.cc:784
#, c-format
@@ -833,11 +829,11 @@ msgstr ""
"deaktiveret.\n"
#: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-"Overspringer %s, da den allerede er installeret og opgradering er "
-"deaktiveret.\n"
+"Overspringer %s, den er ikke installeret og der er kun forespurgt efter "
+"opgraderinger.\n"
#: cmdline/apt-get.cc:798
#, c-format
@@ -850,18 +846,18 @@ msgid "%s is already the newest version.\n"
msgstr "%s er i forvejen den nyeste version.\n"
#: cmdline/apt-get.cc:822 cmdline/apt-get.cc:1979
-#, fuzzy, c-format
+#, c-format
msgid "%s set to manually installed.\n"
msgstr "%s sat til manuelt installeret.\n"
#: cmdline/apt-get.cc:859
#, c-format
msgid "Package %s is not installed, so not removed\n"
-msgstr "Pakken %s er ikke installeret, s den afinstalleres ikke\n"
+msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
#: cmdline/apt-get.cc:934
msgid "Correcting dependencies..."
-msgstr "Retter afhngigheder..."
+msgstr "Retter afhængigheder..."
#: cmdline/apt-get.cc:937
msgid " failed."
@@ -869,27 +865,27 @@ msgstr " mislykkedes."
#: cmdline/apt-get.cc:940
msgid "Unable to correct dependencies"
-msgstr "Kunne ikke rette afhngigheder"
+msgstr "Kunne ikke rette afhængigheder"
#: cmdline/apt-get.cc:943
msgid "Unable to minimize the upgrade set"
-msgstr "Kunne ikke minimere opgraderingssttet"
+msgstr "Kunne ikke minimere opgraderingssættet"
#: cmdline/apt-get.cc:945
msgid " Done"
-msgstr " Frdig"
+msgstr " Færdig"
#: cmdline/apt-get.cc:949
msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du kan muligvis rette dette ved at kre 'apt-get -f install'."
+msgstr "Du kan muligvis rette dette ved at køre 'apt-get -f install'."
#: cmdline/apt-get.cc:952
msgid "Unmet dependencies. Try using -f."
-msgstr "Uopfyldte afhngigheder. Prv med -f."
+msgstr "Uopfyldte afhængigheder. Prøv med -f."
#: cmdline/apt-get.cc:977
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ADVARSEL: Flgende pakkers autenticitet kunne ikke verificeres!"
+msgstr "ADVARSEL: Følgende pakkers autenticitet kunne ikke verificeres!"
#: cmdline/apt-get.cc:981
msgid "Authentication warning overridden.\n"
@@ -897,7 +893,7 @@ msgstr "Autentifikationsadvarsel tilsidesat.\n"
#: cmdline/apt-get.cc:988
msgid "Install these packages without verification [y/N]? "
-msgstr "Installr disse pakker uden verifikation (y/N)? "
+msgstr "Installér disse pakker uden verifikation (y/N)? "
#: cmdline/apt-get.cc:990
msgid "Some packages could not be authenticated"
@@ -909,7 +905,7 @@ msgstr "Der er problemer og -y blev brugt uden --force-yes"
#: cmdline/apt-get.cc:1040
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Intern fejl. InstallPackages blev kaldt med delagte pakker!"
+msgstr "Intern fejl. InstallPackages blev kaldt med ødelagte pakker!"
#: cmdline/apt-get.cc:1049
msgid "Packages need to be removed but remove is disabled."
@@ -917,16 +913,16 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
#: cmdline/apt-get.cc:1060
msgid "Internal error, Ordering didn't finish"
-msgstr "Intern fejl. Sortering blev ikke fuldfrt"
+msgstr "Intern fejl. Sortering blev ikke fuldført"
#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
#: apt-pkg/cachefile.cc:106
msgid "The list of sources could not be read."
-msgstr "Listen med kilder kunne ikke lses."
+msgstr "Listen med kilder kunne ikke læses."
#: cmdline/apt-get.cc:1100
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
-msgstr "Mystisk.. Strrelserne passede ikke, skriv til apt@packages.debian.org"
+msgstr "Mystisk.. Størrelserne passede ikke, skriv til apt@packages.debian.org"
#: cmdline/apt-get.cc:1105
#, c-format
@@ -939,14 +935,14 @@ msgid "Need to get %sB of archives.\n"
msgstr "%sB skal hentes fra arkiverne.\n"
#: cmdline/apt-get.cc:1113
-#, fuzzy, c-format
+#, c-format
msgid "After this operation, %sB of additional disk space will be used.\n"
-msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n"
+msgstr "Efter denne handling, vil %sB yderligere diskplads være brugt.\n"
#: cmdline/apt-get.cc:1116
-#, fuzzy, c-format
+#, c-format
msgid "After this operation, %sB disk space will be freed.\n"
-msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
+msgstr "Efter denne handling, vil %sB diskplads blive frigjort.\n"
#: cmdline/apt-get.cc:1131 cmdline/apt-get.cc:1134 cmdline/apt-get.cc:2319
#: cmdline/apt-get.cc:2322
@@ -965,7 +961,7 @@ msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
#: cmdline/apt-get.cc:1162
msgid "Yes, do as I say!"
-msgstr "Ja, gr som jeg siger!"
+msgstr "Ja, gør som jeg siger!"
#: cmdline/apt-get.cc:1164
#, c-format
@@ -974,8 +970,8 @@ msgid ""
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Du er ved at gre noget, der kan vre skadeligt\n"
-"For at fortstte, skal du skrive '%s'\n"
+"Du er ved at gøre noget, der kan være skadeligt\n"
+"For at fortsætte, skal du skrive '%s'\n"
" ?] "
#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
@@ -984,7 +980,7 @@ msgstr "Afbryder."
#: cmdline/apt-get.cc:1185
msgid "Do you want to continue [Y/n]? "
-msgstr "Vil du fortstte [J/n]? "
+msgstr "Vil du fortsætte [J/n]? "
#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
#, c-format
@@ -1004,12 +1000,12 @@ msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Kunne ikke hente nogle af arkiverne. Prv evt. at kre 'apt-get update' "
-"eller prv med --fix-missing."
+"Kunne ikke hente nogle af arkiverne. Prøv evt. at køre 'apt-get update' "
+"eller prøv med --fix-missing."
#: cmdline/apt-get.cc:1286
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing og medieskift understttes endnu ikke"
+msgstr "--fix-missing og medieskift understøttes endnu ikke"
#: cmdline/apt-get.cc:1291
msgid "Unable to correct missing packages."
@@ -1027,27 +1023,31 @@ msgid_plural ""
"The following packages disappeared from your system as\n"
"all files have been overwritten by other packages:"
msgstr[0] ""
+"Den følgende pakke forsvandt fra dit system, da\n"
+"alle filer er blevet overskrevet af andre pakker:"
msgstr[1] ""
+"De følgende pakker forsvandt fra dit system, da\n"
+"alle filer er blevet overskrevet af andre pakker:"
#: cmdline/apt-get.cc:1324
msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "Bemærk: Dette sker automatisk og med vilje af dpkg."
#: cmdline/apt-get.cc:1454
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorer utilgængelig måludgivelse '%s' af pakke '%s'"
#: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Kunne ikke finde kildepakkelisten %s"
+msgstr "Vælger '%s' som kildepakke fremfor '%s'\n"
#. if (VerTag.empty() == false && Last == 0)
#: cmdline/apt-get.cc:1524
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorer utilgængelig version '%s' af pakke '%s'"
#: cmdline/apt-get.cc:1540
msgid "The update command takes no arguments"
@@ -1060,26 +1060,24 @@ msgstr ""
"AutoRemover"
#: cmdline/apt-get.cc:1653
-#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr[0] ""
-"Flgende pakker blev installeret automatisk, og behves ikke lngere:"
+"Følgende pakke blev installeret automatisk, og behøves ikke længere:"
msgstr[1] ""
-"Flgende pakker blev installeret automatisk, og behves ikke lngere:"
+"Følgende pakker blev installeret automatisk, og behøves ikke længere:"
#: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-"Flgende pakker blev installeret automatisk, og behves ikke lngere:"
+msgstr[0] "Pakken %lu blev installeret automatisk, og behøves ikke længere.\n"
msgstr[1] ""
-"Flgende pakker blev installeret automatisk, og behves ikke lngere:"
+"Pakkerne %lu blev installeret automatisk, og behøves ikke længere.\n"
#: cmdline/apt-get.cc:1659
msgid "Use 'apt-get autoremove' to remove them."
@@ -1105,27 +1103,27 @@ msgstr ""
#.
#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
msgid "The following information may help to resolve the situation:"
-msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:"
+msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
#: cmdline/apt-get.cc:1671
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern fejl. AutoRemover delagde noget"
+msgstr "Intern fejl. AutoRemover ødelagde noget"
#: cmdline/apt-get.cc:1690
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Intern fejl, AllUpgrade delagde noget"
+msgstr "Intern fejl, AllUpgrade ødelagde noget"
#: cmdline/apt-get.cc:1779
msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':"
+msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
#: cmdline/apt-get.cc:1782
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv "
-"en lsning)."
+"Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
+"en løsning)."
#: cmdline/apt-get.cc:1794
msgid ""
@@ -1134,21 +1132,21 @@ msgid ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Nogle pakker kunne ikke installeres. Det kan betyde at du har nsket\n"
+"Nogle pakker kunne ikke installeres. Det kan betyde at du har ønsket\n"
"en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
-"pakker endnu ikke er lavet eller gjort tilgngelige."
+"pakker endnu ikke er lavet eller gjort tilgængelige."
#: cmdline/apt-get.cc:1812
msgid "Broken packages"
-msgstr "delagte pakker"
+msgstr "Ødelagte pakker"
#: cmdline/apt-get.cc:1841
msgid "The following extra packages will be installed:"
-msgstr "Flgende yderligere pakker vil blive installeret:"
+msgstr "Følgende yderligere pakker vil blive installeret:"
#: cmdline/apt-get.cc:1931
msgid "Suggested packages:"
-msgstr "Foreslede pakker:"
+msgstr "Foreslåede pakker:"
#: cmdline/apt-get.cc:1932
msgid "Recommended packages:"
@@ -1160,9 +1158,9 @@ msgid "Couldn't find package %s"
msgstr "Kunne ikke finde pakken %s"
#: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
msgid "%s set to automatically installed.\n"
-msgstr "%s sat til manuelt installeret.\n"
+msgstr "%s sat til automatisk installation.\n"
#: cmdline/apt-get.cc:2002
msgid "Calculating upgrade... "
@@ -1174,19 +1172,19 @@ msgstr "Mislykkedes"
#: cmdline/apt-get.cc:2010
msgid "Done"
-msgstr "Frdig"
+msgstr "Færdig"
#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
msgid "Internal error, problem resolver broke stuff"
-msgstr "Intern fejl. Problemlseren delagde noget"
+msgstr "Intern fejl. Problemløseren ødelagde noget"
#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
msgid "Unable to lock the download directory"
-msgstr "Kunne ikke lse nedhentningsmappen"
+msgstr "Kunne ikke låse nedhentningsmappen"
#: cmdline/apt-get.cc:2185
msgid "Must specify at least one package to fetch source for"
-msgstr "Du skal angive mindst n pakke at hente kildeteksten til"
+msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
#, c-format
@@ -1199,6 +1197,8 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"BEMÆRK: Pakning af '%s' vedligeholdes i versionskontrolsystemet '%s' på:\n"
+"%s\n"
#: cmdline/apt-get.cc:2246
#, c-format
@@ -1207,6 +1207,9 @@ msgid ""
"bzr get %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"Brug venligst:\n"
+"bzr get %s\n"
+"for at hente de seneste (muligvis ikke udgivet) opdateringer til pakken.\n"
#: cmdline/apt-get.cc:2297
#, c-format
@@ -1263,17 +1266,17 @@ msgstr "Barneprocessen fejlede"
#: cmdline/apt-get.cc:2476
msgid "Must specify at least one package to check builddeps for"
-msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for"
+msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
#: cmdline/apt-get.cc:2506
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s"
+msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
#: cmdline/apt-get.cc:2526
#, c-format
msgid "%s has no build depends.\n"
-msgstr "%s har ingen opbygningsafhngigheder.\n"
+msgstr "%s har ingen opbygningsafhængigheder.\n"
#: cmdline/apt-get.cc:2577
#, c-format
@@ -1281,7 +1284,7 @@ msgid ""
"%s dependency for %s cannot be satisfied because the package %s cannot be "
"found"
msgstr ""
-"%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
+"%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
#: cmdline/apt-get.cc:2630
#, c-format
@@ -1289,36 +1292,35 @@ msgid ""
"%s dependency for %s cannot be satisfied because no available versions of "
"package %s can satisfy version requirements"
msgstr ""
-"%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige "
+"%s-afhængigheden for %s kan ikke opfyldes, da ingen af de tilgængelige "
"udgaver af pakken %s kan tilfredsstille versions-kravene"
#: cmdline/apt-get.cc:2666
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for "
+"Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
"ny"
#: cmdline/apt-get.cc:2693
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s"
+msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
#: cmdline/apt-get.cc:2709
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes."
+msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
#: cmdline/apt-get.cc:2714
msgid "Failed to process build dependencies"
-msgstr "Kunne ikke behandler opbygningsafhngighederne"
+msgstr "Kunne ikke behandler opbygningsafhængighederne"
#: cmdline/apt-get.cc:2745
msgid "Supported modules:"
-msgstr "Understttede moduler:"
+msgstr "Understøttede moduler:"
#: cmdline/apt-get.cc:2786
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1367,38 +1369,41 @@ msgstr ""
" apt-get [tilvalg] install|remove pakke1 [pakke2 ...]\n"
" apt-get [tilvalg] source pakke1 [pakke2 ...]\n"
"\n"
-"apt-get er en simpel kommandolinjegrnseflade til at hente og\n"
+"apt-get er en simpel kommandolinjegrænseflade til at hente og\n"
"installere pakker. De hyppigst brugte kommandoer er update og\n"
"install.\n"
"\n"
"Kommandoer:\n"
" update - Hent nye lister over pakker\n"
-" upgrade - Udfr en opgradering\n"
-" install - Installr nye pakker (pakke er libc6, ikke libc6.deb)\n"
-" remove - Afinstallr pakker\n"
-" purge - Fjern og udrens pakker\n"
+" upgrade - Udfør en opgradering\n"
+" install - Installér nye pakker (pakke er libc6, ikke libc6.deb)\n"
+" remove - Afinstallér pakker\n"
+" autoremove - Afinstallér automatisk alle ubrugte pakker\n"
+" purge - Fjern pakker og konfigurationsfiler\n"
" source - Hent kildetekstarkiver\n"
-" build-dep - St opbygningsafhngigheder op for kildetekstpakker\n"
+" build-dep - Sæt opbygningsafhængigheder op for kildetekstpakker\n"
" dist-upgrade - Distributionsopgradering, se apt-get(8)\n"
-" dselect-upgrade - Flg valgene fra dselect\n"
+" dselect-upgrade - Følg valgene fra dselect\n"
" clean - Slet hentede arkivfiler\n"
" autoclean - Slet gamle hentede arkivfiler\n"
-" check - Tjek at der ikke er uopfyldte afhngigheder\n"
+" check - Tjek at der ikke er uopfyldte afhængigheder\n"
+" markauto - Marker de angivne pakker som automatisk installeret\n"
+" unmarkauto - Marker de angivne pakker som manuelt installeret\n"
"\n"
"Tilvalg:\n"
-" -h Denne hjlpetekst.\n"
+" -h Denne hjælpetekst.\n"
" -q Uddata, der kan logges - ingen fremgangsindikator\n"
" -qq Ingen uddata, kun fejl\n"
-" -d Hent kun - installr eller udpak IKKE arkiverne\n"
-" -s Gr intet. Simulr handlingen\n"
-" -y Antag 'ja'-svar til alle sprgsml uden at sprge\n"
-" -f Forsg at fortstte selvom integritetstjek fejler\n"
-" -m Forsg at fortstte selvom arkiverne ikke kan findes\n"
-" -u Vis ogs en liste over opgraderede pakker\n"
+" -d Hent kun - installér eller udpak IKKE arkiverne\n"
+" -s Gør intet. Simulér handlingen\n"
+" -y Antag 'ja'-svar til alle spørgsmål uden at spørge\n"
+" -f Forsøg at fortsætte selvom integritetstjek fejler\n"
+" -m Forsøg at fortsætte selvom arkiverne ikke kan findes\n"
+" -u Vis også en liste over opgraderede pakker\n"
" -b Byg kildetekstpakken efter at have hentet den\n"
" -V Vis detaljerede versionsnumre\n"
-" -c=? Ls denne opstningsfil\n"
-" -o=? Angiv et opstningsvalg. F.eks. -o dir::cache=/tmp\n"
+" -c=? Læs denne opsætningsfil\n"
+" -o=? Angiv et arbitrært opsætningsvalg. F.eks. -o dir::cache=/tmp\n"
"Se manualsiderne for apt-get(8), sources.list(5) og apt.conf(5)\n"
"for flere oplysninger og tilvalg.\n"
" Denne APT har \"Super Cow Powers\".\n"
@@ -1410,6 +1415,10 @@ msgid ""
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"BEMÆRK: Dette er kun en simulering!\n"
+" apt-get kræver rootprivilegier for reel kørsel.\n"
+" Husk også at låsning er deaktiveret,\n"
+" så stol ikke på relevansen for den reelle aktuelle situation!"
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1430,7 +1439,7 @@ msgstr "Fejl "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Hentede %sB p %s (%sB/s)\n"
+msgstr "Hentede %sB på %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
@@ -1444,7 +1453,7 @@ msgid ""
" '%s'\n"
"in the drive '%s' and press enter\n"
msgstr ""
-"Medieskift: Indst disken med navnet\n"
+"Medieskift: Indsæt disken med navnet\n"
" '%s'\n"
"i drevet '%s' og tryk retur\n"
@@ -1467,14 +1476,14 @@ msgid ""
msgstr ""
"Brug: apt-sortpkgs [tilvalg] fil1 [fil2 ...]\n"
"\n"
-"apt-sortpkgs er et simpelt vrktj til at sortere pakkefiler. Tilvalget -s\n"
+"apt-sortpkgs er et simpelt værktøj til at sortere pakkefiler. Tilvalget -s\n"
"bruges til at angive filens type.\n"
"\n"
"Tilvalg:\n"
-" -h Denne hjlpetekst\n"
+" -h Denne hjælpetekst\n"
" -s Benyt kildefils-sortering\n"
-" -c=? Ls denne opstningsfil\n"
-" -o=? Angiv en opstningsindstilling. F.eks. -o dir::cache=/tmp\n"
+" -c=? Læs denne opsætningsfil\n"
+" -o=? Angiv en opsætningsindstilling. F.eks. -o dir::cache=/tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1483,55 +1492,53 @@ msgstr "Ugyldig standardindstilling!"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
#: dselect/install:105 dselect/update:45
msgid "Press enter to continue."
-msgstr "Tryk retur for at fortstte."
+msgstr "Tryk retur for at fortsætte."
#: dselect/install:91
msgid "Do you want to erase any previously downloaded .deb files?"
-msgstr ""
+msgstr "Ønsker du at slette nogle tidligere hentede .deb-filer?"
# Note to translators: The following four messages belong together. It doesn't
# matter where sentences start, but it has to fit in just these four lines, and
# at only 80 characters per line, if possible.
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Der opstod fejl under udpakningen. Jeg vil opstte de"
+msgstr "Der opstod fejl under udpakningen. Pakker som blev installeret"
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "pakker, der blev installeret. Det kan give gentagne fejl"
+msgstr "vil blive konfigureret. Det kan give gentagne fejl"
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
msgstr ""
-"eller fejl, der skyldes manglende afhngigheder. Dette er o.k. Det er kun"
+"eller fejl, der skyldes manglende afhængigheder. Dette er o.k. Det er kun"
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
msgstr ""
-"fejlene over denne besked, der er vigtige. Ret dem og kr [I]nstallr igen"
+"fejlene over denne besked, der er vigtige. Ret dem og kør [I]nstallér igen"
#: dselect/update:30
msgid "Merging available information"
-msgstr "Sammenfletter tilgngelighedsoplysninger"
+msgstr "Sammenfletter tilgængelighedsoplysninger"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
-msgstr "Kunne ikke oprette viderefrsler"
+msgstr "Kunne ikke oprette videreførsler"
#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
-msgstr "Kunne ikke udfre gzip "
+msgstr "Kunne ikke udføre gzip "
#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
msgid "Corrupted archive"
-msgstr "delagt arkiv"
+msgstr "Ødelagt arkiv"
#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-tjeksum fejlede, arkivet er delagt"
+msgstr "Tar-tjeksum fejlede, arkivet er ødelagt"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
@@ -1544,12 +1551,12 @@ msgstr "Ugyldig arkivsignatur"
#: apt-inst/contrib/arfile.cc:78
msgid "Error reading archive member header"
-msgstr "Fejl under lsning af arkivelements hoved"
+msgstr "Fejl under læsning af arkivelements hoved"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Ugyldigt arkivelementhoved"
+msgstr "Ugyldigt arkivelementhoved %s"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1561,7 +1568,7 @@ msgstr "Arkivet er for kort"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "Kunne ikke lse arkivhovederne"
+msgstr "Kunne ikke læse arkivhovederne"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
@@ -1582,17 +1589,17 @@ msgstr "Intern fejl i AddDiversion"
#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Forsger at overskrive en omrokering, %s -> %s og %s/%s"
+msgstr "Forsøger at overskrive en omrokering, %s -> %s og %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
msgid "Double add of diversion %s -> %s"
-msgstr "Dobbelt tilfjelse af omrokering %s -> %s"
+msgstr "Dobbelt tilføjelse af omrokering %s -> %s"
#: apt-inst/filelist.cc:549
#, c-format
msgid "Duplicate conf file %s/%s"
-msgstr "Dobbelt opstningsfil %s/%s"
+msgstr "Dobbelt opsætningsfil %s/%s"
#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
#, c-format
@@ -1622,7 +1629,7 @@ msgstr "Mappen %s er omrokeret"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakken forsger at skrive til omrokeret ml %s/%s"
+msgstr "Pakken forsøger at skrive til omrokeret mål %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
@@ -1660,7 +1667,7 @@ msgstr "File %s/%s overskriver filen i pakken %s"
#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
-msgstr "Kunne ikke lse %s"
+msgstr "Kunne ikke læse %s"
#: apt-inst/extract.cc:491
#, c-format
@@ -1690,7 +1697,7 @@ msgstr "Mapperne info og temp skal ligge i samme filsystem"
#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
#: apt-pkg/pkgcachegen.cc:1326
msgid "Reading package lists"
-msgstr "Indlser pakkelisterne"
+msgstr "Indlæser pakkelisterne"
#: apt-inst/deb/dpkgdb.cc:176
#, c-format
@@ -1704,7 +1711,7 @@ msgstr "Intern fejl under hentning af et pakkenavn"
#: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382
msgid "Reading file listing"
-msgstr "Lser fillisten"
+msgstr "Læser fillisten"
#: apt-inst/deb/dpkgdb.cc:212
#, c-format
@@ -1713,14 +1720,14 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Kunne ikke bne listefilen '%sinfo/%s'. Hvis du ikke kan genskabe denne fil, "
-"kan du gre dem tom og med det samme geninstallere den samme version af "
+"Kunne ikke åbne listefilen '%sinfo/%s'. Hvis du ikke kan genskabe denne fil, "
+"kan du gøre dem tom og med det samme geninstallere den samme version af "
"pakken!"
#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Kunne ikke lse listefilen %sinfo/%s"
+msgstr "Kunne ikke læse listefilen %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
@@ -1729,11 +1736,11 @@ msgstr "Intern fejl under hentning af knude"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Kunne ikke bne omrokeringsfilen %sdiversions"
+msgstr "Kunne ikke åbne omrokeringsfilen %sdiversions"
#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
-msgstr "Pakkeomrokeringsfilen er delagt"
+msgstr "Pakkeomrokeringsfilen er ødelagt"
#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
#: apt-inst/deb/dpkgdb.cc:337
@@ -1743,11 +1750,11 @@ msgstr "Ugyldig linje i omrokeringsfilen: %s"
#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
-msgstr "Intern fejl under tilfjelse af omrokering"
+msgstr "Intern fejl under tilføjelse af omrokering"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
-msgstr "pkg-mellemlageret skal initialiseres frst"
+msgstr "pkg-mellemlageret skal initialiseres først"
#: apt-inst/deb/dpkgdb.cc:439
#, c-format
@@ -1770,11 +1777,11 @@ msgid "This is not a valid DEB archive, missing '%s' member"
msgstr "Dette er ikke et gyldigt DEB-arkiv, mangler '%s'-elementet"
#: apt-inst/deb/debfile.cc:50
-#, fuzzy, c-format
+#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-"Dette er ikke et gyldigt DEB-arkiv, det har intet''%s', '%s' eller '%s'-"
-"elementet"
+"Dette er ikke et gyldigt DEB-arkiv, det har intet '%s', '%s' eller '%s'-"
+"element"
#: apt-inst/deb/debfile.cc:110
#, c-format
@@ -1796,12 +1803,12 @@ msgstr "Ikke-tolkbar kontrolfil"
#: methods/bzip2.cc:68
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "Kunne ikke bne datarr for %s"
+msgstr "Kunne ikke åbne datarør for %s"
#: methods/bzip2.cc:113
#, c-format
msgid "Read error from %s process"
-msgstr "Lsefejl fra %s-process"
+msgstr "Læsefejl fra %s-process"
#: methods/bzip2.cc:145 methods/bzip2.cc:154 methods/copy.cc:43
#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
@@ -1812,20 +1819,20 @@ msgstr "Kunne ikke finde"
#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
#: methods/rred.cc:492
msgid "Failed to set modification time"
-msgstr "Kunne ikke angive ndringstidspunkt"
+msgstr "Kunne ikke angive ændringstidspunkt"
#: methods/cdrom.cc:199
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Kunne ikke lse cdrom-databasen %s"
+msgstr "Kunne ikke læse cdrom-databasen %s"
#: 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 ""
-"Brug apt-cdrom for at apt kan lre den at kende. apt-get update kan ikke "
-"bruges til at tilfje nye cd'er"
+"Brug apt-cdrom for at apt kan lære den at kende. apt-get update kan ikke "
+"bruges til at tilføje nye cd'er"
#: methods/cdrom.cc:218
msgid "Wrong CD-ROM"
@@ -1846,12 +1853,12 @@ msgstr "Fil blev ikke fundet"
#: methods/file.cc:44
msgid "Invalid URI, local URIS must not start with //"
-msgstr "Ugyldig URI, lokale URI'er m ikke starte med //"
+msgstr "Ugyldig URI, lokale URI'er må ikke starte med //"
#. Login must be before getpeername otherwise dante won't work.
#: methods/ftp.cc:168
msgid "Logging in"
-msgstr "Logget p"
+msgstr "Logget på"
#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
@@ -1864,7 +1871,7 @@ msgstr "Kunne ikke bestemme det lokale navn"
#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Serveren ngtede os forbindelse og sagde: %s"
+msgstr "Serveren nægtede os forbindelse og sagde: %s"
#: methods/ftp.cc:216
#, c-format
@@ -1881,13 +1888,13 @@ msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"Der blev angivet en proxyserver men intet logp-skript; Acquire::ftp::"
+"Der blev angivet en proxyserver men intet logpå-skript; Acquire::ftp::"
"ProxyLogin er tom."
#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Logp-skriptets kommando '%s' mislykkedes. Serveren sagde: %s"
+msgstr "Logpå-skriptets kommando '%s' mislykkedes. Serveren sagde: %s"
#: methods/ftp.cc:297
#, c-format
@@ -1896,7 +1903,7 @@ msgstr "TYPE mislykkedes. Serveren sagde: %s"
#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "Tidsudlb p forbindelsen"
+msgstr "Tidsudløb på forbindelsen"
#: methods/ftp.cc:341
msgid "Server closed the connection"
@@ -1904,7 +1911,7 @@ msgstr "Serveren lukkede forbindelsen"
#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:753 methods/rsh.cc:190
msgid "Read error"
-msgstr "Lsefejl"
+msgstr "Læsefejl"
#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
@@ -1924,7 +1931,7 @@ msgstr "Kunne ikke oprette sokkel"
#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
-msgstr "Kunne ikke forbinde datasokkel, tidsudlb p forbindelsen"
+msgstr "Kunne ikke forbinde datasokkel, tidsudløb på forbindelsen"
#: methods/ftp.cc:709
msgid "Could not connect passive socket."
@@ -1932,7 +1939,7 @@ msgstr "Kunne ikke forbinde passiv sokkel."
#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo kunne ikke f en lyttesokkel"
+msgstr "getaddrinfo kunne ikke få en lyttesokkel"
#: methods/ftp.cc:741
msgid "Could not bind a socket"
@@ -1940,7 +1947,7 @@ msgstr "Kunne ikke tilknytte en sokkel"
#: methods/ftp.cc:745
msgid "Could not listen on the socket"
-msgstr "Kunne ikke lytte p soklen"
+msgstr "Kunne ikke lytte på soklen"
#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
@@ -1962,7 +1969,7 @@ msgstr "EPRT mislykkedes. Serveren sagde: %s"
#: methods/ftp.cc:823
msgid "Data socket connect timed out"
-msgstr "Tidsudlb p datasokkel-forbindelse"
+msgstr "Tidsudløb på datasokkel-forbindelse"
#: methods/ftp.cc:830
msgid "Unable to accept connection"
@@ -1979,21 +1986,21 @@ msgstr "Kunne ikke hente fil. Serveren sagde '%s'"
#: methods/ftp.cc:897 methods/rsh.cc:321
msgid "Data socket timed out"
-msgstr "Tidsudlb ved datasokkel"
+msgstr "Tidsudløb ved datasokkel"
#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Dataoverfrsel mislykkedes, serveren sagde '%s'"
+msgstr "Dataoverførsel mislykkedes, serveren sagde '%s'"
#. Get the files information
#: methods/ftp.cc:1004
msgid "Query"
-msgstr "Foresprgsel"
+msgstr "Forespørgsel"
#: methods/ftp.cc:1116
msgid "Unable to invoke "
-msgstr "Kunne ikke udfre "
+msgstr "Kunne ikke udføre "
#: methods/connect.cc:71
#, c-format
@@ -2018,7 +2025,7 @@ msgstr "Kan ikke oprette forbindelse til %s:%s (%s)."
#: methods/connect.cc:103
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudlb"
+msgstr "Kunne ikke forbinde til %s:%s (%s) grundet tidsudløb"
#: methods/connect.cc:121
#, c-format
@@ -2035,60 +2042,59 @@ msgstr "Forbinder til %s"
#: methods/connect.cc:168 methods/connect.cc:187
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Kunne ikke omstte navnet '%s'"
+msgstr "Kunne ikke omsætte navnet '%s'"
#: methods/connect.cc:193
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Midlertidig fejl ved omstning af navnet '%s'"
+msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
#: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)"
+msgstr "Der skete noget underligt under opløsning af '%s:%s' (%i - %s)"
#: methods/connect.cc:243
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Kunne ikke forbinde til %s %s:"
+msgstr "Kunne ikke forbinde til %s:%s:"
#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
msgid "No keyring installed in %s."
-msgstr "Afbryder installationen."
+msgstr "Ingen nøglering installeret i %s."
#: methods/gpgv.cc:163
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
msgstr ""
-"Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!"
+"Intern fejl: Gyldig signatur, men kunne ikke afgøre nøgle-fingeraftryk?!"
#: methods/gpgv.cc:168
msgid "At least one invalid signature was encountered."
-msgstr "Stdte p mindst n ugyldig signatur."
+msgstr "Stødte på mindst én ugyldig signatur."
#: methods/gpgv.cc:172
-#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-"Kunne ikke kre '%s' for at verificere signaturen (er gpgv installeret?)"
+"Kunne ikke køre 'gpgv' for at verificere signaturen (er gpgv installeret?)"
#: methods/gpgv.cc:177
msgid "Unknown error executing gpgv"
-msgstr "Ukendt fejl ved krsel af gpgv"
+msgstr "Ukendt fejl ved kørsel af gpgv"
#: methods/gpgv.cc:211 methods/gpgv.cc:218
msgid "The following signatures were invalid:\n"
-msgstr "Flgende signaturer var ugyldige:\n"
+msgstr "Følgende signaturer var ugyldige:\n"
#: methods/gpgv.cc:225
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"Flgende signaturer kunne ikke verificeret, da den offentlige ngle ikke er "
-"tilgngelig:\n"
+"Følgende signaturer kunne ikke verificeret, da den offentlige nøgle ikke er "
+"tilgængelig:\n"
#: methods/http.cc:385
msgid "Waiting for headers"
@@ -2097,7 +2103,7 @@ msgstr "Afventer hoveder"
#: methods/http.cc:531
#, c-format
msgid "Got a single header line over %u chars"
-msgstr "Fandt en enkelt linje i hovedet p over %u tegn"
+msgstr "Fandt en enkelt linje i hovedet på over %u tegn"
#: methods/http.cc:539
msgid "Bad header line"
@@ -2105,20 +2111,20 @@ msgstr "Ugyldig linje i hovedet"
#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
-msgstr "http-serveren sendte et ugyldigt svarhovede"
+msgstr "Http-serveren sendte et ugyldigt svarhovede"
#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "http-serveren sendte et ugyldigt Content-Length-hovede"
+msgstr "Http-serveren sendte et ugyldigt Content-Length-hovede"
#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "http-serveren sendte et ugyldigt Content-Range-hovede"
+msgstr "Http-serveren sendte et ugyldigt Content-Range-hovede"
#: methods/http.cc:611
msgid "This HTTP server has broken range support"
msgstr ""
-"Denne http-servere har fejlagtig understttelse af intervaller ('ranges')"
+"Denne http-servere har fejlagtig understøttelse af intervaller ('ranges')"
#: methods/http.cc:635
msgid "Unknown date format"
@@ -2130,7 +2136,7 @@ msgstr "Valg mislykkedes"
#: methods/http.cc:798
msgid "Connection timed out"
-msgstr "Tidsudlb p forbindelsen"
+msgstr "Tidsudløb på forbindelsen"
#: methods/http.cc:821
msgid "Error writing to output file"
@@ -2146,16 +2152,15 @@ msgstr "Fejl ved skrivning til filen"
#: methods/http.cc:894
msgid "Error reading from server. Remote end closed connection"
-msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen"
+msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
#: methods/http.cc:896
msgid "Error reading from server"
-msgstr "Fejl ved lsning fra server"
+msgstr "Fejl ved læsning fra server"
#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:281
-#, fuzzy
msgid "Failed to truncate file"
-msgstr "Kunne ikke skrive filen %s"
+msgstr "Kunne ikke afkorte filen"
#: methods/http.cc:1154
msgid "Bad header data"
@@ -2171,27 +2176,25 @@ msgstr "Intern fejl"
#: apt-pkg/contrib/mmap.cc:77
msgid "Can't mmap an empty file"
-msgstr "Kan ikke udfre mmap for en tom fil"
+msgstr "Kan ikke udføre mmap for en tom fil"
#: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't duplicate file descriptor %i"
-msgstr "Kunne ikke bne datarr for %s"
+msgstr "Kunne ikke duplikere filbeskrivelse %i"
#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "Kunne ikke udfre mmap for %lu byte"
+msgstr "Kunne ikke udføre mmap for %lu byte"
#: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
msgid "Unable to close mmap"
-msgstr "Kunne ikke bne %s"
+msgstr "Kunne ikke lukke mmap"
#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
msgid "Unable to synchronize mmap"
-msgstr "Kunne ikke udfre "
+msgstr "Kunne ikke synkronisere mmap"
#: apt-pkg/contrib/mmap.cc:300
#, c-format
@@ -2199,6 +2202,8 @@ msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
+"Dynamisk MMap løb tør for plads. Øg venligst størrelsen på APT::Cache-Limit. "
+"Aktuel værdi: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:399
#, c-format
@@ -2206,35 +2211,39 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
+"Kunne ikke øge størrelsen på MMap da begrænsningen på %lu byte allerede er "
+"nået."
#: apt-pkg/contrib/mmap.cc:402
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
+"Kunne ikke øge størrelsen på MMap da automatisk øgning er deaktiveret af "
+"bruger."
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:371
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lih %limin %lis"
#. h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lih %limin %lis"
#. min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%limin %lis"
#. s means seconds
#: apt-pkg/contrib/strutl.cc:390
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
#: apt-pkg/contrib/strutl.cc:1119
#, c-format
@@ -2249,7 +2258,7 @@ msgstr "Ukendt type-forkortelse: '%c'"
#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
-msgstr "bner konfigurationsfilen %s"
+msgstr "Åbner konfigurationsfilen %s"
#: apt-pkg/contrib/configuration.cc:678
#, c-format
@@ -2259,12 +2268,12 @@ msgstr "Syntaksfejl %s:%u: Blokken starter uden navn."
#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksfejl %s:%u: Forkert udformet mrke"
+msgstr "Syntaksfejl %s:%u: Forkert udformet mærke"
#: apt-pkg/contrib/configuration.cc:714
#, c-format
msgid "Syntax error %s:%u: Extra junk after value"
-msgstr "Syntaksfejl %s:%u: Overskydende affald efter vrdien"
+msgstr "Syntaksfejl %s:%u: Overskydende affald efter værdien"
#: apt-pkg/contrib/configuration.cc:754
#, c-format
@@ -2274,7 +2283,7 @@ msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet"
#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaksfejl %s:%u: For mange sammenkdede inkluderinger"
+msgstr "Syntaksfejl %s:%u: For mange sammenkædede inkluderinger"
#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
@@ -2284,12 +2293,12 @@ msgstr "Syntaksfejl %s:%u: Inkluderet herfra"
#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'"
+msgstr "Syntaksfejl %s:%u: Ikke-understøttet direktiv '%s'"
#: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet"
+msgstr "Syntaksfejl %s:%u: ryd direktiv kræver et tilvalgstræ som argument"
#: apt-pkg/contrib/configuration.cc:827
#, c-format
@@ -2304,7 +2313,7 @@ msgstr "%c%s... Fejl!"
#: apt-pkg/contrib/progress.cc:155
#, c-format
msgid "%c%s... Done"
-msgstr "%c%s... Frdig"
+msgstr "%c%s... Færdig"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
@@ -2315,7 +2324,7 @@ msgstr "Kommandolinjetilvalget '%c' [fra %s] kendes ikke."
#: apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
-msgstr "Kommandolinjetilvalget %s blev ikke forstet"
+msgstr "Kommandolinjetilvalget %s blev ikke forstået"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
@@ -2325,17 +2334,17 @@ msgstr "Kommandolinjetilvalget %s er ikke boolsk"
#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186
#, c-format
msgid "Option %s requires an argument."
-msgstr "Tilvalget %s krver et parameter."
+msgstr "Tilvalget %s kræver et parameter."
#: 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 "Tilvalg %s: Opstningspostens specifikation skal have en =<vrdi>."
+msgstr "Tilvalg %s: Opsætningspostens specifikation skal have en =<værdi>."
#: apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Tilvalget %s krver et heltalligt parameter, ikke '%s'"
+msgstr "Tilvalget %s kræver et heltalligt parameter, ikke '%s'"
#: apt-pkg/contrib/cmndline.cc:267
#, c-format
@@ -2345,7 +2354,7 @@ msgstr "Tilvalget '%s' er for langt"
#: apt-pkg/contrib/cmndline.cc:300
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "%s blev ikke forstet, prv med 'true' eller 'false'."
+msgstr "%s blev ikke forstået, prøv med 'true' eller 'false'."
#: apt-pkg/contrib/cmndline.cc:350
#, c-format
@@ -2371,27 +2380,27 @@ msgstr "Kunne ikke finde cdrommen"
#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s"
+msgstr "Benytter ikke låsning for skrivebeskyttet låsefil %s"
#: apt-pkg/contrib/fileutl.cc:159
#, c-format
msgid "Could not open lock file %s"
-msgstr "Kunne ikke bne lsefilen %s"
+msgstr "Kunne ikke åbne låsefilen %s"
#: apt-pkg/contrib/fileutl.cc:177
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Benytter ikke lsning for nfs-monteret lsefil %s"
+msgstr "Benytter ikke låsning for nfs-monteret låsefil %s"
#: apt-pkg/contrib/fileutl.cc:181
#, c-format
msgid "Could not get lock %s"
-msgstr "Kunne ikke opn lsen %s"
+msgstr "Kunne ikke opnå låsen %s"
#: apt-pkg/contrib/fileutl.cc:621
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "Ventede p %s, men den var der ikke"
+msgstr "Ventede på %s, men den var der ikke"
#: apt-pkg/contrib/fileutl.cc:633
#, c-format
@@ -2399,9 +2408,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "Underprocessen %s modtog en segmenteringsfejl."
#: apt-pkg/contrib/fileutl.cc:635
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Underprocessen %s modtog en segmenteringsfejl."
+msgstr "Underprocessen %s modtog en signal %u."
#: apt-pkg/contrib/fileutl.cc:639
#, c-format
@@ -2416,17 +2425,17 @@ msgstr "Underprocessen %s afsluttedes uventet"
#: apt-pkg/contrib/fileutl.cc:697
#, c-format
msgid "Could not open file %s"
-msgstr "Kunne ikke bne filen %s"
+msgstr "Kunne ikke åbne filen %s"
#: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file descriptor %d"
-msgstr "Kunne ikke bne datarr for %s"
+msgstr "Kunne ikke åbne filbeskrivelse %d"
#: apt-pkg/contrib/fileutl.cc:774
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "ls, mangler stadig at lse %lu men der er ikke flere"
+msgstr "læs, mangler stadig at læse %lu men der er ikke flere"
#: apt-pkg/contrib/fileutl.cc:807
#, c-format
@@ -2434,24 +2443,24 @@ msgid "write, still have %lu to write but couldn't"
msgstr "skriv, mangler stadig at skrive %lu men kunne ikke"
#: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
msgid "Problem closing the gzip file %s"
-msgstr "Problem under lukning af fil"
+msgstr "Problem under lukning af gzip-filen %s"
#: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
msgid "Problem closing the file %s"
-msgstr "Problem under lukning af fil"
+msgstr "Problem under lukning af filen %s"
#: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr "Problem under synkronisering af fil"
+msgstr "Problem under omdøbning af filen %s til %s"
#: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
msgid "Problem unlinking the file %s"
-msgstr "Fejl ved frigivelse af filen"
+msgstr "Fejl ved frigivelse af filen %s"
#: apt-pkg/contrib/fileutl.cc:938
msgid "Problem syncing the file"
@@ -2463,7 +2472,7 @@ msgstr "Tomt pakke-mellemlager"
#: apt-pkg/pkgcache.cc:148
msgid "The package cache file is corrupted"
-msgstr "Pakke-mellemlagerets fil er delagt"
+msgstr "Pakke-mellemlagerets fil er ødelagt"
#: apt-pkg/pkgcache.cc:153
msgid "The package cache file is an incompatible version"
@@ -2472,7 +2481,7 @@ msgstr "Pakke-mellemlagerets fil er af en inkompatibel version"
#: apt-pkg/pkgcache.cc:158
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Denne APT understtter ikke versionssystemet '%s'"
+msgstr "Denne APT understøtter ikke versionssystemet '%s'"
#: apt-pkg/pkgcache.cc:163
msgid "The package cache was built for a different architecture"
@@ -2480,15 +2489,15 @@ msgstr "Pakke-mellemlageret er lavet til en anden arkitektur"
#: apt-pkg/pkgcache.cc:290
msgid "Depends"
-msgstr "Afhngigheder"
+msgstr "Afhængigheder"
#: apt-pkg/pkgcache.cc:290
msgid "PreDepends"
-msgstr "Pr-afhngigheder"
+msgstr "Præ-afhængigheder"
#: apt-pkg/pkgcache.cc:290
msgid "Suggests"
-msgstr "Foreslede"
+msgstr "Foreslåede"
#: apt-pkg/pkgcache.cc:291
msgid "Recommends"
@@ -2504,15 +2513,15 @@ msgstr "Erstatter"
#: apt-pkg/pkgcache.cc:292
msgid "Obsoletes"
-msgstr "Overfldiggr"
+msgstr "Overflødiggør"
#: apt-pkg/pkgcache.cc:292
msgid "Breaks"
-msgstr "delgger"
+msgstr "Ødelægger"
#: apt-pkg/pkgcache.cc:292
msgid "Enhances"
-msgstr ""
+msgstr "Forbedringer"
#: apt-pkg/pkgcache.cc:303
msgid "important"
@@ -2520,7 +2529,7 @@ msgstr "vigtig"
#: apt-pkg/pkgcache.cc:303
msgid "required"
-msgstr "krvet"
+msgstr "krævet"
#: apt-pkg/pkgcache.cc:303
msgid "standard"
@@ -2536,7 +2545,7 @@ msgstr "ekstra"
#: apt-pkg/depcache.cc:124 apt-pkg/depcache.cc:153
msgid "Building dependency tree"
-msgstr "Opbygger afhngighedstr"
+msgstr "Opbygger afhængighedstræ"
#: apt-pkg/depcache.cc:125
msgid "Candidate versions"
@@ -2544,16 +2553,16 @@ msgstr "Kandidatversioner"
#: apt-pkg/depcache.cc:154
msgid "Dependency generation"
-msgstr "Afhngighedsgenerering"
+msgstr "Afhængighedsgenerering"
#: apt-pkg/depcache.cc:174 apt-pkg/depcache.cc:207 apt-pkg/depcache.cc:211
msgid "Reading state information"
-msgstr "Lser tilstandsoplysninger"
+msgstr "Læser tilstandsoplysninger"
#: apt-pkg/depcache.cc:236
#, c-format
msgid "Failed to open StateFile %s"
-msgstr "Kunne ikke bne StateFile %s"
+msgstr "Kunne ikke åbne StateFile %s"
#: apt-pkg/depcache.cc:242
#, c-format
@@ -2561,9 +2570,9 @@ msgid "Failed to write temporary StateFile %s"
msgstr "Kunne ikke skrive den midlertidige StateFile %s"
#: apt-pkg/depcache.cc:921
-#, fuzzy, c-format
+#, c-format
msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr "Intern fejl. Kunne ikke tolke pakkeindgangen"
+msgstr "Intern fejl, gruppe '%s' har ingen installationsbar pseudopakke"
#: apt-pkg/tagfile.cc:102
#, c-format
@@ -2576,29 +2585,29 @@ msgid "Unable to parse package file %s (2)"
msgstr "Kunne ikke tolke pakkefilen %s (2)"
#: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] kunne ikke fortolkes)"
#: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Ugyldig linje %lu i kildelisten %s (dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([tilvalg] for kort)"
#: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] er ikke en opgave)"
#: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] har ingen nøgle)"
#: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
+msgstr "Ugyldig linje %lu i kildelisten %s ([%s] nøgle %s har ingen værdi)"
#: apt-pkg/sourcelist.cc:128
#, c-format
@@ -2628,7 +2637,7 @@ msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)"
#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Opening %s"
-msgstr "bner %s"
+msgstr "Åbner %s"
#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
#, c-format
@@ -2643,7 +2652,7 @@ msgstr "Ugyldig linje %u i kildelisten %s (type)"
#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s"
+msgstr "Typen '%s' er ukendt på linje %u i kildelisten %s"
#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
#, c-format
@@ -2651,6 +2660,8 @@ msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Kunne ikke udføre øjeblikkelig konfiguration på '%s'. Se venligst man 5 apt."
+"conf under APT:Immediate-Cinfigure for detaljer. (%d)"
#: apt-pkg/packagemanager.cc:452
#, c-format
@@ -2659,9 +2670,9 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"Krsel af denne installation krver midlertidig afinstallation af den "
-"essentielle pakke %s grundet en afhngighedslkke. Det er ofte en drlig "
-"id, men hvis du virkelig vil gre det, kan du aktivere valget 'APT::Force-"
+"Kørsel af denne installation kræver midlertidig afinstallation af den "
+"essentielle pakke %s grundet en afhængighedsløkke. Det er ofte en dårlig "
+"idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-"
"LoopBreak'."
#: apt-pkg/packagemanager.cc:495
@@ -2670,11 +2681,13 @@ msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"Kunne ikke udføre øjeblikkelig konfiguration på allerede udpakket '%s'. Se "
+"venligst man 5 apt.conf under APT:Immediate-Cinfigure for detaljer."
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "Indeksfiler af typen '%s' understttes ikke"
+msgstr "Indeksfiler af typen '%s' understøttes ikke"
#: apt-pkg/algorithms.cc:292
#, c-format
@@ -2694,7 +2707,7 @@ msgstr ""
#: apt-pkg/algorithms.cc:1184
msgid "Unable to correct problems, you have held broken packages."
msgstr ""
-"Kunne ikke korrigere problemerne, da du har tilbageholdt delagte pakker."
+"Kunne ikke korrigere problemerne, da du har tilbageholdt ødelagte pakker."
#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
msgid ""
@@ -2705,19 +2718,19 @@ msgstr ""
"bruges i stedet."
#: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappen %spartial mangler."
#: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivmappen %spartial mangler."
#: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock directory %s"
-msgstr "Kunne ikke lse listemappen"
+msgstr "Kunne ikke låse mappen %s"
#. only show the ETA if it makes sense
#. two days
@@ -2744,12 +2757,12 @@ msgstr "Metoden %s startede ikke korrekt"
#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Indst disken med navnet: '%s' i drevet '%s' og tryk retur."
+msgstr "Indsæt disken med navnet: '%s' i drevet '%s' og tryk retur."
#: apt-pkg/init.cc:141
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet '%s' understttes ikke"
+msgstr "Pakkesystemet '%s' understøttes ikke"
#: apt-pkg/init.cc:157
msgid "Unable to determine a suitable packaging system type"
@@ -2766,21 +2779,21 @@ msgstr "Du skal have nogle 'source'-URI'er i din sources.list"
#: apt-pkg/cachefile.cc:84
msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes."
+msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller åbnes."
#: apt-pkg/cachefile.cc:88
msgid "You may want to run apt-get update to correct these problems"
-msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'"
+msgstr "Du kan muligvis rette problemet ved at køre 'apt-get update'"
#: apt-pkg/policy.cc:343
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler"
+msgstr "Ugyldig indgang i indstillingsfilen %s, pakkehovedet mangler"
#: apt-pkg/policy.cc:365
#, c-format
msgid "Did not understand pin type %s"
-msgstr "Kunne ikke forst pin-type %s"
+msgstr "Kunne ikke forstå pin-type %s"
#: apt-pkg/policy.cc:373
msgid "No priority (or zero) specified for pin"
@@ -2817,9 +2830,9 @@ msgstr "Der skete en fejl under behandlingen af %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
#: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Der skete en fejl under behandlingen af %s (NewVersion1)"
+msgstr "Der skete en fejl under behandlingen af %s (NewVersion%d)"
#: apt-pkg/pkgcachegen.cc:320
#, c-format
@@ -2834,20 +2847,20 @@ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:360
msgid "Wow, you exceeded the number of package names this APT is capable of."
msgstr ""
-"Hold da op! Du nede over det antal pakkenavne, denne APT kan hndtere."
+"Hold da op! Du nåede over det antal pakkenavne, denne APT kan håndtere."
#: apt-pkg/pkgcachegen.cc:363
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere."
+msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
#: apt-pkg/pkgcachegen.cc:366
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Hold da op! Du nede over det antal versioner, denne APT kan hndtere."
+msgstr "Hold da op! Du nåede over det antal versioner, denne APT kan håndtere."
#: apt-pkg/pkgcachegen.cc:369
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
msgstr ""
-"Hold da op! Du nede over det antal afhngigheder, denne APT kan hndtere."
+"Hold da op! Du nåede over det antal afhængigheder, denne APT kan håndtere."
#: apt-pkg/pkgcachegen.cc:398
#, c-format
@@ -2862,7 +2875,7 @@ msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)"
#: apt-pkg/pkgcachegen.cc:418
#, c-format
msgid "Package %s %s was not found while processing file dependencies"
-msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder"
+msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhængigheder"
#: apt-pkg/pkgcachegen.cc:982
#, c-format
@@ -2880,7 +2893,7 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
#: apt-pkg/acquire-item.cc:136
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "omdbning mislykkedes, %s (%s -> %s)."
+msgstr "omdøbning mislykkedes, %s (%s -> %s)."
#: apt-pkg/acquire-item.cc:484
msgid "MD5Sum mismatch"
@@ -2888,14 +2901,13 @@ msgstr "MD5Sum stemmer ikke"
#: apt-pkg/acquire-item.cc:746 apt-pkg/acquire-item.cc:1570
#: apt-pkg/acquire-item.cc:1713
-#, fuzzy
msgid "Hash Sum mismatch"
-msgstr "MD5Sum stemmer ikke"
+msgstr "Hashsum stemmer ikke"
#: apt-pkg/acquire-item.cc:1240
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-"Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n"
+"Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formated in the same way as in
@@ -2903,12 +2915,12 @@ msgstr ""
#: apt-pkg/acquire-item.cc:1277
#, c-format
msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgstr "Udgivelsesfil udløbet, ignorerer %s (ugyldig siden %s)"
#: apt-pkg/acquire-item.cc:1298
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Konfliktdistribution: %s (forventede %s men fik %s)"
#: apt-pkg/acquire-item.cc:1324
#, c-format
@@ -2916,11 +2928,13 @@ msgid ""
"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used.GPG error: %s: %s\n"
msgstr ""
+"Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret "
+"og den forrige indeksfil vil blive brugt. GPG-fejl: %s: %s\n"
#: apt-pkg/acquire-item.cc:1333
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG-fejl: %s: %s"
#: apt-pkg/acquire-item.cc:1361
#, c-format
@@ -2929,7 +2943,7 @@ msgid ""
"to manually fix this package. (due to missing arch)"
msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
-"ndt til manuelt at reparere denne pakke. (grundet manglende arch)"
+"nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
#: apt-pkg/acquire-item.cc:1420
#, c-format
@@ -2938,7 +2952,7 @@ msgid ""
"manually fix this package."
msgstr ""
"Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
-"ndt til manuelt at reparere denne pakke."
+"nødt til manuelt at reparere denne pakke."
#: apt-pkg/acquire-item.cc:1475
#, c-format
@@ -2948,37 +2962,37 @@ msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
#: apt-pkg/acquire-item.cc:1562
msgid "Size mismatch"
-msgstr "Strrelsen stemmer ikke"
+msgstr "Størrelsen stemmer ikke"
#: apt-pkg/indexrecords.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Kunne ikke tolke pakkefilen %s (1)"
+msgstr "Kunne ikke fortolke udgivelsesfil %s"
#: apt-pkg/indexrecords.cc:60
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Bemrk, at %s vlges fremfor %s\n"
+msgstr "Ingen afsnit i udgivelsesfil %s"
#: apt-pkg/indexrecords.cc:94
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Intet hashpunkt i udgivelsesfil %s"
#: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i omrokeringsfilen: %s"
+msgstr "Ugyldigt punkt 'Valid-Until' i udgivelsesfil %s"
#: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Kunne ikke tolke pakkefilen %s (1)"
+msgstr "Ugyldigt punkt 'Date' i udgivelsesfil %s"
#: apt-pkg/vendorlist.cc:66
#, c-format
msgid "Vendor block %s contains no fingerprint"
-msgstr "Leverandrblok %s inderholder intet fingeraftryk"
+msgstr "Leverandørblok %s inderholder intet fingeraftryk"
#: apt-pkg/cdrom.cc:518
#, c-format
@@ -2996,7 +3010,7 @@ msgstr "Identificerer.. "
#: apt-pkg/cdrom.cc:552
#, c-format
msgid "Stored label: %s\n"
-msgstr "Gemt mrkat: %s \n"
+msgstr "Gemt mærkat: %s \n"
#: apt-pkg/cdrom.cc:559 apt-pkg/cdrom.cc:827
msgid "Unmounting CD-ROM...\n"
@@ -3013,7 +3027,7 @@ msgstr "Afmonterer cdrom\n"
#: apt-pkg/cdrom.cc:600
msgid "Waiting for disc...\n"
-msgstr "Venter p disken...\n"
+msgstr "Venter på disken...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:608
@@ -3025,29 +3039,30 @@ msgid "Scanning disc for index files..\n"
msgstr "Skanner disken for indeksfiler..\n"
#: apt-pkg/cdrom.cc:666
-#, fuzzy, c-format
+#, c-format
msgid ""
"Found %zu package indexes, %zu source indexes, %zu translation indexes and "
"%zu signatures\n"
msgstr ""
-"Fandt %i pakkeindekser, %i kildeindekser, %i oversttelsesindekser og %i "
+"Fandt %zu pakkeindekser, %zu kildeindekser, %zu oversættelsesindekser og %zu "
"signaturer\n"
#: apt-pkg/cdrom.cc:677
-#, fuzzy
msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
-msgstr "Kunne ikke finde nogen pakkefiler. Det er muligvis ikke en Debiandisk"
+msgstr ""
+"Kunne ikke finde nogen pakkefiler, det er muligvis ikke en Debiandisk eller "
+"den forkerte arkitektur?"
#: apt-pkg/cdrom.cc:703
#, c-format
msgid "Found label '%s'\n"
-msgstr "Fandt mrkatet '%s'\n"
+msgstr "Fandt mærkatet '%s'\n"
#: apt-pkg/cdrom.cc:732
msgid "That is not a valid name, try again.\n"
-msgstr "Det er ikke et gyldigt navn, prv igen.\n"
+msgstr "Det er ikke et gyldigt navn, prøv igen.\n"
#: apt-pkg/cdrom.cc:748
#, c-format
@@ -3068,7 +3083,7 @@ msgstr "Skriver ny kildeliste\n"
#: apt-pkg/cdrom.cc:787
msgid "Source list entries for this disc are:\n"
-msgstr "Denne disk har flgende kildeliste-indgange:\n"
+msgstr "Denne disk har følgende kildeliste-indgange:\n"
#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
#, c-format
@@ -3091,19 +3106,19 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n"
#: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
msgid "Skipping nonexistent file %s"
-msgstr "bner konfigurationsfilen %s"
+msgstr "Springer ikkeeksisterende fil over %s"
#: apt-pkg/indexcopy.cc:538
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Kan ikke finde godkendelsesregistrering for: %s"
#: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
msgid "Hash mismatch for: %s"
-msgstr "MD5Sum stemmer ikke"
+msgstr "Hashsum stemmer ikke: %s"
#: apt-pkg/cacheset.cc:337
#, c-format
@@ -3116,19 +3131,19 @@ msgid "Version '%s' for '%s' was not found"
msgstr "Versionen '%s' for '%s' blev ikke fundet"
#: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't find task '%s'"
-msgstr "Kunne ikke finde opgaven %s"
+msgstr "Kunne ikke finde opgaven '%s'"
#: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr "Kunne ikke finde pakken %s"
+msgstr "Kunne ikke finde nogle pakker med regulært udtryk '%s'"
#: apt-pkg/cacheset.cc:467
#, c-format
msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
+msgstr "Kan ikke vælge versioner fra pakke '%s' som er vitalt"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
#, c-format
@@ -3136,31 +3151,35 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
+"Kan ikke vælge installeret eller kandidatversion fra pakke '%s' da den ikke "
+"har nogen af dem"
#: apt-pkg/cacheset.cc:491
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
-msgstr ""
+msgstr "Kan ikke vælge nyeste version fra pakke '%s' som er vital"
#: apt-pkg/cacheset.cc:499
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
+"Kan ikke vælge kandidatversion fra pakke %s da den ikke har nogen kandidat"
#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
+"Kan ikke vælge installeret version fra pakke %s da den ikke er installeret"
#: apt-pkg/deb/dpkgpm.cc:52
-#, fuzzy, c-format
+#, c-format
msgid "Installing %s"
-msgstr "Installerede %s"
+msgstr "Installerer %s"
#: apt-pkg/deb/dpkgpm.cc:53 apt-pkg/deb/dpkgpm.cc:819
#, c-format
msgid "Configuring %s"
-msgstr "Stter %s op"
+msgstr "Sætter %s op"
#: apt-pkg/deb/dpkgpm.cc:54 apt-pkg/deb/dpkgpm.cc:826
#, c-format
@@ -3168,34 +3187,34 @@ msgid "Removing %s"
msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
msgid "Completely removing %s"
-msgstr "Fjernede %s helt"
+msgstr "Fjerner %s helt"
#: apt-pkg/deb/dpkgpm.cc:56
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Bemærker forsvinding af %s"
#: apt-pkg/deb/dpkgpm.cc:57
#, c-format
msgid "Running post-installation trigger %s"
-msgstr ""
+msgstr "Kører førinstallationsudløser %s"
#: apt-pkg/deb/dpkgpm.cc:643
-#, fuzzy, c-format
+#, c-format
msgid "Directory '%s' missing"
-msgstr "Listemappen %spartial mangler."
+msgstr "Mappe '%s' mangler"
#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file '%s'"
-msgstr "Kunne ikke bne filen %s"
+msgstr "Kunne ikke åbne filen '%s'"
#: apt-pkg/deb/dpkgpm.cc:812
#, c-format
msgid "Preparing %s"
-msgstr "Klargr %s"
+msgstr "Klargør %s"
#: apt-pkg/deb/dpkgpm.cc:813
#, c-format
@@ -3205,7 +3224,7 @@ msgstr "Pakker %s ud"
#: apt-pkg/deb/dpkgpm.cc:818
#, c-format
msgid "Preparing to configure %s"
-msgstr "Gr klar til at stte %s op"
+msgstr "Gør klar til at sætte %s op"
#: apt-pkg/deb/dpkgpm.cc:820
#, c-format
@@ -3215,7 +3234,7 @@ msgstr "Installerede %s"
#: apt-pkg/deb/dpkgpm.cc:825
#, c-format
msgid "Preparing for removal of %s"
-msgstr "Gr klar til afinstallation af %s"
+msgstr "Gør klar til afinstallation af %s"
#: apt-pkg/deb/dpkgpm.cc:827
#, c-format
@@ -3225,7 +3244,7 @@ msgstr "Fjernede %s"
#: apt-pkg/deb/dpkgpm.cc:832
#, c-format
msgid "Preparing to completely remove %s"
-msgstr "Gr klar til at fjerne %s helt"
+msgstr "Gør klar til at fjerne %s helt"
#: apt-pkg/deb/dpkgpm.cc:833
#, c-format
@@ -3234,43 +3253,49 @@ msgstr "Fjernede %s helt"
#: apt-pkg/deb/dpkgpm.cc:1039
msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
-msgstr ""
+msgstr "Kan ikke skrive log, openpty() mislykkedes (/dev/pts ej monteret?)\n"
#: apt-pkg/deb/dpkgpm.cc:1070
msgid "Running dpkg"
-msgstr ""
+msgstr "Kører dpkg"
#: apt-pkg/deb/dpkgpm.cc:1273
msgid "No apport report written because MaxReports is reached already"
msgstr ""
+"Ingen apportrapport skrevet da MaxReports (maks rapporter) allerede er nået"
#. check if its not a follow up error
#: apt-pkg/deb/dpkgpm.cc:1278
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "afhængighedsproblemer - efterlader ukonfigureret"
#: apt-pkg/deb/dpkgpm.cc:1280
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer, at det er en "
+"opfølgningsfejl fra en tidligere fejl."
#: apt-pkg/deb/dpkgpm.cc:1286
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en fuld disk-fejl"
#: apt-pkg/deb/dpkgpm.cc:1292
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
+"Ingen apportrapport skrevet da fejlbeskeden indikerer en ikke nok "
+"hukommelsesfejl"
#: apt-pkg/deb/dpkgpm.cc:1299
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
-msgstr ""
+msgstr "Ingen apportrapport skrevet da fejlbeskeden indikerer en dpkg I/O-fejl"
#: apt-pkg/deb/debsystem.cc:69
#, c-format
@@ -3278,11 +3303,12 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Kunne ikke låse administrationsmappen (%s), bruger en anden proces den?"
#: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kunne ikke lse listemappen"
+msgstr "Kunne ikke låse administrationsmappen (%s), er du rod (root)?"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -3290,23 +3316,23 @@ msgstr "Kunne ikke lse listemappen"
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgstr "dpkg blev afbrudt, du skal manuelt køre '%s' for at rette problemet."
#: apt-pkg/deb/debsystem.cc:106
msgid "Not locked"
-msgstr ""
+msgstr "Ikke låst"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:200
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Ingen spejlfil '%s' fundet "
#: methods/mirror.cc:343
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Spejl: %s]"
#: methods/rred.cc:465
#, c-format
@@ -3314,6 +3340,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Kunne ikke fejlrette (patch) %s med mmap og med filhandlingsbrug - "
+"fejlrettelsen ser ud til at være ødelagt."
#: methods/rred.cc:470
#, c-format
@@ -3321,328 +3349,9 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Kunne ikke fejlrette (patch) %s med mmap (men ingen mmap specifik fejl) - "
+"fejlrettelsen ser ud til at være ødelagt."
#: methods/rsh.cc:329
msgid "Connection closed prematurely"
msgstr "Forbindelsen lukkedes for hurtigt"
-
-#~ msgid "You must give exactly one pattern"
-#~ msgstr "Du skal angive njagtig t mnster"
-
-#~ msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting."
-#~ msgstr ""
-#~ "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter."
-
-#~ msgid "Error occurred while processing %s (NewVersion2)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewVersion2)"
-
-#~ msgid "Malformed line %u in source list %s (vendor id)"
-#~ msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
-
-#~ msgid "Couldn't access keyring: '%s'"
-#~ msgstr "Kunne ikke tilg ngleringent '%s'"
-
-#~ msgid "Could not patch file"
-#~ msgstr "Kunne ikke pfre filen %s en lap"
-
-#~ msgid " %4i %s\n"
-#~ msgstr " %4i %s\n"
-
-#~ msgid "%4i %s\n"
-#~ msgstr "%4i %s\n"
-
-#, fuzzy
-#~ msgid "Processing triggers for %s"
-#~ msgstr "Fejl under behandling af mappen %s"
-
-#~ msgid ""
-#~ "Since you only requested a single operation it is extremely likely that\n"
-#~ "the package is simply not installable and a bug report against\n"
-#~ "that package should be filed."
-#~ msgstr ""
-#~ "Siden du kan bad om en enkelt handling, kan pakken hjst sandsynligt "
-#~ "slet\n"
-#~ "ikke installeres og du br indsende en fejlrapport for denne pakke."
-
-#, fuzzy
-#~ msgid "Line %d too long (max %lu)"
-#~ msgstr "Linjen %d er for lang (maks %u)"
-
-#, fuzzy
-#~ msgid "Line %d too long (max %d)"
-#~ msgstr "Linjen %d er for lang (maks %u)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc1)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc1)"
-
-#, fuzzy
-#~ msgid "Error occured while processing %s (NewFileDesc2)"
-#~ msgstr "Der skete en fejl under behandlingen af %s (NewFileDesc2)"
-
-#, fuzzy
-#~ msgid "Stored label: %s \n"
-#~ msgstr "Gemt mrkat: %s \n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Found %i package indexes, %i source indexes, %i translation indexes and "
-#~ "%i signatures\n"
-#~ msgstr ""
-#~ "Fandt %i pakkeindekser, %i kildeindekser, %i oversttelsesindekser og %i "
-#~ "signaturer\n"
-
-#, fuzzy
-#~ msgid "openpty failed\n"
-#~ msgstr "Valg mislykkedes"
-
-#~ msgid "File date has changed %s"
-#~ msgstr "Filens dato er ndret %s"
-
-#~ msgid "Reading file list"
-#~ msgstr "Indlser fillisten"
-
-#~ msgid "Could not execute "
-#~ msgstr "Kunne ikke kre "
-
-#~ msgid "Preparing for remove with config %s"
-#~ msgstr "Gr klar til at fjerne %s inklusive opstning"
-
-#~ msgid "Removed with config %s"
-#~ msgstr "Fjernede %s inklusive opstning"
-
-#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Ukendt leverandr-ID '%s' p linje %u i kildelisten %s"
-
-#~ msgid ""
-#~ "Some broken packages were found while trying to process build-"
-#~ "dependencies.\n"
-#~ "You might want to run 'apt-get -f install' to correct these."
-#~ msgstr ""
-#~ "Det blev fundet delagte pakker under behandlingen af "
-#~ "opbygningsafhngighederne.\n"
-#~ "Du kan muligvis rette dette ved at kre 'apt-get -f install'."
-
-#~ msgid "Sorry, you don't have enough free space in %s to hold all the .debs."
-#~ msgstr ""
-#~ "Beklager, men du har ikke nok ledig plads i %s til at opbevare alle .deb-"
-#~ "filerne."
-
-#~ msgid "<- '"
-#~ msgstr "<- '"
-
-#~ msgid "'"
-#~ msgstr "'"
-
-#~ msgid "-> '"
-#~ msgstr "-> '"
-
-#~ msgid "Followed conf file from "
-#~ msgstr "Fulgte conf-filen fra "
-
-#~ msgid " to "
-#~ msgstr " til "
-
-#~ msgid "Extract "
-#~ msgstr "Ekstrahr "
-
-#~ msgid "Aborted, backing out"
-#~ msgstr "Afbrudt, tilbagetrkker"
-
-#~ msgid "De-replaced "
-#~ msgstr "Gen-omplaceret "
-
-#~ msgid " from "
-#~ msgstr " fra "
-
-#~ msgid "Backing out "
-#~ msgstr "Tilbagetrkker "
-
-#~ msgid " [new node]"
-#~ msgstr " [ny knude]"
-
-#~ msgid "Replaced file "
-#~ msgstr "Erstattede filen "
-
-#~ msgid "Unimplemented"
-#~ msgstr "Ikke implementeret"
-
-#~ msgid "Generating cache"
-#~ msgstr "Opretter mellemlager"
-
-#~ msgid "Problem with SelectFile"
-#~ msgstr "Problem med SelectFile"
-
-#~ msgid "Problem with MergeList"
-#~ msgstr "Problem med MergeList"
-
-#~ msgid "Regex compilation error"
-#~ msgstr "Fejl under oversttelse af regulrt udtryk"
-
-#~ msgid "Write to stdout failed"
-#~ msgstr "Skrivning til standard-ud mislykkedes"
-
-#~ msgid "Generate must be enabled for this function"
-#~ msgstr "'Generate' skal vre aktiveret for denne funktion"
-
-#~ msgid "Failed to stat %s%s"
-#~ msgstr "Kunne ikke finde %s%s"
-
-#~ msgid "Failed to open %s.new"
-#~ msgstr "Kunne ikke bne %s.new"
-
-#~ msgid "Failed to rename %s.new to %s"
-#~ msgstr "Kunne ikke omdbe %s.new til %s"
-
-#~ msgid "I found (binary):"
-#~ msgstr "Jeg fandt (binre programfiler):"
-
-#~ msgid "I found (source):"
-#~ msgstr "Jeg fandt (kildefiler):"
-
-#~ msgid "Found "
-#~ msgstr "Fandt "
-
-#~ msgid " source indexes."
-#~ msgstr " kildeindekser."
-
-#~ msgid " '"
-#~ msgstr " '"
-
-#~ msgid ""
-#~ "Usage: apt-cdrom [options] command\n"
-#~ "\n"
-#~ "apt-cdrom is a tool to add CDROM's to APT's source list. The\n"
-#~ "CDROM mount point and device information is taken from apt.conf\n"
-#~ "and /etc/fstab.\n"
-#~ "\n"
-#~ "Commands:\n"
-#~ " add - Add a CDROM\n"
-#~ " ident - Report the identity of a CDROM\n"
-#~ "\n"
-#~ "Options:\n"
-#~ " -h This help text\n"
-#~ " -d CD-ROM mount point\n"
-#~ " -r Rename a recognized CD-ROM\n"
-#~ " -m No mounting\n"
-#~ " -f Fast mode, don't check package files\n"
-#~ " -a Thorough scan mode\n"
-#~ " -c=? Read this configuration file\n"
-#~ " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
-#~ "See fstab(5)\n"
-#~ msgstr ""
-#~ "Brug: apt-cdrom [tilvalg] kommando\n"
-#~ "\n"
-#~ "apt-cdrom er et vrktj til at tilfje cdrom'er til APTs kildeliste.\n"
-#~ "cdrom-monteringspunkt og enhedsoplysninger hentes fra apt.conf\n"
-#~ "og /etc/fstab.\n"
-#~ "\n"
-#~ "Kommandoer:\n"
-#~ " add - Tilfj en cdrom\n"
-#~ " ident - Rapportr den cdroms identitet\n"
-#~ "\n"
-#~ "Tilvalg:\n"
-#~ " -h Denne hjlpetekst\n"
-#~ " -d cdrom monteringspunkt\n"
-#~ " -r Omdb en genkendt cdrom\n"
-#~ " -m Montr ikke\n"
-#~ " -f Hurtig-tilstand. Tjek ikke pakkefiler\n"
-#~ " -a Grundig skannetilstand\n"
-#~ " -c=? Ls denne opstningsfil\n"
-#~ " -o=? Angiv en opstningsfunktion, f.eks. -o dir::cache=/tmp\n"
-#~ "Se fstab(5)\n"
-
-#~ msgid "Internal error, non-zero counts"
-#~ msgstr "Intern fejl. ikke-nul optlling"
-
-#~ msgid "Couldn't wait for subprocess"
-#~ msgstr "Kunne ikke vente p underproces"
-
-#~ msgid "....\"Have you mooed today?\"..."
-#~ msgstr "....\"Har du sagt 'mu' i dag?\"..."
-
-#~ msgid " New "
-#~ msgstr " Ny "
-
-#~ msgid "B "
-#~ msgstr "B "
-
-#~ msgid " files "
-#~ msgstr " filer "
-
-#~ msgid " pkgs in "
-#~ msgstr " pakker i "
-
-#~ msgid ""
-#~ "Usage: apt-ftparchive [options] command\n"
-#~ "Commands: packges binarypath [overridefile [pathprefix]]\n"
-#~ " sources srcpath [overridefile [pathprefix]]\n"
-#~ " contents path\n"
-#~ " generate config [groups]\n"
-#~ " clean config\n"
-#~ msgstr ""
-#~ "Brug: apt-ftparchive [tilvalg] kommando\n"
-#~ "Kommandoer: packges binrsti [tvangsfil [foranstillet-sti]]\n"
-#~ " sources kildesti [tvangsfil [foranstillet-sti]]\n"
-#~ " contents sti\n"
-#~ " generate config [grupper]\n"
-#~ " clean config\n"
-
-#~ msgid ""
-#~ "Options:\n"
-#~ " -h This help text\n"
-#~ " --md5 Control MD5 generation\n"
-#~ " -s=? Source override file\n"
-#~ " -q Quiet\n"
-#~ " -d=? Select the optional caching database\n"
-#~ " --no-delink Enable delinking debug mode\n"
-#~ " --contents Control contents file generation\n"
-#~ " -c=? Read this configuration file\n"
-#~ " -o=? Set an arbitrary configuration option\n"
-#~ msgstr ""
-#~ "Tilvalg:\n"
-#~ " -h Denne hjlpetekst\n"
-#~ " --md5 Kontrollr MD5-generering\n"
-#~ " -s=? Kilde-gennemtvangsfil\n"
-#~ " -q Stille\n"
-#~ " -d=? Vlg den frivillige mellemlager-database\n"
-#~ " --no-delink Aktivr 'delinking debug'-tilstand\n"
-#~ " --contents Kontrollr generering af indholdsfil\n"
-#~ " -c=? Ls denne opstningsfil\n"
-#~ " -o=? Angiv en opstningsfunktion\n"
-
-#~ msgid "Done Packages, Starting contents."
-#~ msgstr "Frdig med Packages, starter indhold."
-
-#~ msgid "Hit contents update byte limit"
-#~ msgstr "Stdte mod indholdsopdateringens byte-begrnsning"
-
-#~ msgid "Done. "
-#~ msgstr "Frdig. "
-
-#~ msgid "B in "
-#~ msgstr "B i "
-
-#~ msgid " archives. Took "
-#~ msgstr " arkiver. Det tog "
-
-#~ msgid "B hit."
-#~ msgstr "B ramtes."
-
-#~ msgid " not "
-#~ msgstr " ikke "
-
-#~ msgid "DSC file '%s' is too large!"
-#~ msgstr "DSC-filen '%s' er for stor!"
-
-#~ msgid "Could not find a record in the DSC '%s'"
-#~ msgstr "Kunne ikke finde indgang i DSC '%s'"
-
-#~ msgid "Error parsing file record"
-#~ msgstr "Fejl under tolkning af filindgang"
-
-#~ msgid "Failed too stat %s"
-#~ msgstr "Kunne ikke finde %s"
-
-#~ msgid "Errors apply to file '%s'"
-#~ msgstr "Fejlene vedrrer filen '%s'"
diff --git a/po/nb.po b/po/nb.po
index a705fe843..d02a88049 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,27 +1,26 @@
-# Norsk Bokmal translation of messages in APT.
-#
-# The file is available under Gnu Public License version 2.
-# Get the license from http://www.gnu.org/licenses/gpl.txt
-# Copyright:
-# Lars Bahner <bahner@debian.org>, 2002-2003.
-# Axel Bojer <axelb@skolelinux.no>, 2003-2004.
-# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
-# Bjorn Steensrud <bjornst@powertech.no>, 2004.
-# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2009.
-#
+# Norsk Bokmal translation of messages in APT.
+# The file is available under Gnu Public License version 2.
+# Get the license from http://www.gnu.org/licenses/gpl.txt
+# Copyright:
+# Lars Bahner <bahner@debian.org>, 2002-2003.
+# Axel Bojer <axelb@skolelinux.no>, 2003-2004.
+# Klaus Ade Johnstad <klaus@skolelinux.no>, 2004.
+# Bjorn Steensrud <bjornst@powertech.no>, 2004.
+# Hans Fredrik Nordhaug <hans@nordhaug.priv.no>, 2003, 2005-2010.
msgid ""
msgstr ""
"Project-Id-Version: apt\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-08-23 18:41-0400\n"
-"PO-Revision-Date: 2009-02-01 18:26+0100\n"
+"PO-Revision-Date: 2010-09-01 21:10+0200\n"
"Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n"
-"Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n"
+"Language-Team: Norwegian Bokmål <i18n-nb@lister.ping.uio.no>\n"
"Language: nb\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-1\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
#: cmdline/apt-cache.cc:156
#, c-format
@@ -30,12 +29,11 @@ msgstr "Pakken %s versjon %s har et uinnfridd avhengighetsforhold:\n"
#: cmdline/apt-cache.cc:284
msgid "Total package names: "
-msgstr "Plassmengde pakkenavn: "
+msgstr "Antall pakkenavn: "
#: cmdline/apt-cache.cc:286
-#, fuzzy
msgid "Total package structures: "
-msgstr "Plassmengde pakkenavn: "
+msgstr "Antall pakkestrukturer: "
#: cmdline/apt-cache.cc:326
msgid " Normal packages: "
@@ -103,9 +101,8 @@ msgid "Package file %s is out of sync."
msgstr "Pakkefila %s er ikke oppdatert."
#: cmdline/apt-cache.cc:1273
-#, fuzzy
msgid "You must give at least one search pattern"
-msgstr "Du m oppgi nyaktig ett mnster"
+msgstr "Du må oppgi minst ett søkemønster"
#: cmdline/apt-cache.cc:1429 cmdline/apt-cache.cc:1431
#: cmdline/apt-cache.cc:1508
@@ -115,7 +112,7 @@ msgstr "Fant ingen pakker"
#: cmdline/apt-cache.cc:1503 apt-pkg/cacheset.cc:440
#, c-format
msgid "Unable to locate package %s"
-msgstr "Klarer ikke finne pakken %s"
+msgstr "Klarer ikke å finne pakken %s"
#: cmdline/apt-cache.cc:1533
msgid "Package files:"
@@ -129,7 +126,7 @@ msgstr ""
#. Show any packages have explicit pins
#: cmdline/apt-cache.cc:1554
msgid "Pinned packages:"
-msgstr "Lste pakker:"
+msgstr "Låste pakker:"
#: cmdline/apt-cache.cc:1566 cmdline/apt-cache.cc:1618
msgid "(not found)"
@@ -149,7 +146,7 @@ msgstr "(ingen)"
#: cmdline/apt-cache.cc:1615
msgid " Package pin: "
-msgstr " Pakke lst til: "
+msgstr " Pakke låst til: "
#. Show the priority tables
#: cmdline/apt-cache.cc:1624
@@ -161,10 +158,9 @@ msgstr " Versjonstabell:"
#: cmdline/apt-get.cc:2740 cmdline/apt-sortpkgs.cc:144
#, c-format
msgid "%s %s for %s compiled on %s %s\n"
-msgstr "%s %s for %s kompilert p %s %s\n"
+msgstr "%s %s for %s kompilert på %s %s\n"
#: cmdline/apt-cache.cc:1739
-#, fuzzy
msgid ""
"Usage: apt-cache [options] command\n"
" apt-cache [options] add file1 [file2 ...]\n"
@@ -203,56 +199,56 @@ msgid ""
" -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n"
"See the apt-cache(8) and apt.conf(5) manual pages for more information.\n"
msgstr ""
-"Bruk: apt-cache [innstillinger] kommando\n"
-" apt-cache [innstillinger] add fil1 [fil2 ...]\n"
-" apt-cache [innstillinger] showpkg pakke1 [pakke2 ...]\n"
-" apt-cache [innstillinger] showsrc pakke1 [pakke2 ...]\n"
+"Bruk: apt-cache [valg] kommando\n"
+" apt-cache [valg] add fil1 [fil2 ...]\n"
+" apt-cache [valg] showpkg pakke1 [pakke2 ...]\n"
+" apt-cache [valg] showsrc pakke1 [pakke2 ...]\n"
"\n"
-"apt-cache er et lavniv-verkty, som brukes til hndtere APT sine binre\n"
-"lagerfiler, og sprre dem om informasjon.\n"
+"apt-cache er et lavnivå-verktøy, som brukes til å håndtere APT sine binære\n"
+"lagerfiler, og spørre dem om informasjon.\n"
"\n"
"Kommandoer:\n"
" add - Legg en fil til kildelageret\n"
-" gencaches - Bygg lagrene for bde pakke og kildekode\n"
+" gencaches - Bygg lagrene for både pakke og kildekode\n"
" showpkg - Vis overordnet informasjon om en enkelt pakke\n"
" showsrc - Vis data om kildekoden\n"
" stats - Vis en enkel statistikk\n"
" dump - Vis fila med liste over tilgjengelige pakker i kompakt form\n"
" dumpavail - Send hele lista over tilgjengelige pakker til standard ut\n"
" unmet - Vis uinnfridde avhengighetsforhold\n"
-" search - Sk i pakkelista etter et regulrt uttrykkr\n"
+" search - Søk i pakkelista etter et regulært uttrykkr\n"
" show - Vis et lesbart oppslag for pakken\n"
-" depends - Vis r informasjon om avhengighetsforholdene for pakken\n"
+" showauto - Vis en liste med automatisk installerte pakker\n"
+" depends - Vis rå informasjon om avhengighetsforholdene for pakken\n"
" rdepends - Vis informasjon om de reverserte avhengighetsforholdene for "
"pakken\n"
-" pkgnames - List alle pakkenavn p systemet\n"
+" pkgnames - List alle pakkenavn på systemet\n"
" dotty - Lag pakke-grafer for GraphViz\n"
" xvcg - Lag pakke-grafer for xvcg\n"
" policy - Vis regelinnstillingerr\n"
"\n"
-"Innstillinger:\n"
+"Valg:\n"
" -h Denne hjelpeteksten\n"
" -p=? Pakkelageret.\n"
" -s=? Kildekodelageret.\n"
" -q Ikke vis framdrift.\n"
-" -i Vis bare viktige avhengighetsforhold for kommandoen unmet.\n"
+" -i Vis bare viktige avhengighetsforhold for kommandoen «unmet».\n"
" -c=? Les denne innstillingsfila.\n"
-" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
+" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
"Les manualsidene apt-cache(8) og apt.conf(5) for mer informasjon.\n"
#: cmdline/apt-cdrom.cc:77
-#, fuzzy
msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'"
-msgstr "Oppgi et navn for disken, eksempelvis Debian 2.1r1 disk 1"
+msgstr "Oppgi et navn for disken, for eksempel «Debian 5.0.3 Disk 1»"
#: cmdline/apt-cdrom.cc:92
msgid "Please insert a Disc in the drive and press enter"
msgstr "Sett inn en disk i lagringsenheten og trykk Enter"
#: cmdline/apt-cdrom.cc:127
-#, fuzzy, c-format
+#, c-format
msgid "Failed to mount '%s' to '%s'"
-msgstr "Klarte ikke endre navnet p %s til %s"
+msgstr "Klarte ikke montere «%s» på «%s»"
#: cmdline/apt-cdrom.cc:162
msgid "Repeat this process for the rest of the CDs in your set."
@@ -279,7 +275,7 @@ msgid ""
msgstr ""
"Bruk: apt-config [innstillinger] kommando\n"
"\n"
-"apt-config er et enkelt verkty til lese APTs innstillingsfil\n"
+"apt-config er et enkelt verktøy til å lese APTs innstillingsfil\n"
"\n"
"Kommandoer:\n"
" shell - Skallmodus\n"
@@ -288,7 +284,7 @@ msgstr ""
"Innstillinger:\n"
" -h Denne hjelpeteksten\n"
" -c=? Les denne innstillingsfila.\n"
-" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
+" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:98
#, c-format
@@ -310,7 +306,7 @@ msgid ""
msgstr ""
"Bruk: apt-extracttemplates fil1 [fil2 ...]\n"
"\n"
-"apt-extracttemplates er et verkty til hente ut informasjon om "
+"apt-extracttemplates er et verktøy til å hente ut informasjon om "
"innstillinger\n"
"og maler fra debianpakker.\n"
"\n"
@@ -318,7 +314,7 @@ msgstr ""
" -h Denne hjelpeteksten\n"
" -t Lag en midlertidig mappe\n"
" -c=? Les denne innstillingsfila.\n"
-" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
+" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:1171
#, c-format
@@ -327,7 +323,7 @@ msgstr "Kan ikke skrive til %s"
#: cmdline/apt-extracttemplates.cc:309
msgid "Cannot get debconf version. Is debconf installed?"
-msgstr "Kan ikke fastsl debconf-versjonen. Er debconf installert?"
+msgstr "Kan ikke fastslå debconf-versjonen. Er debconf installert?"
#: ftparchive/apt-ftparchive.cc:168 ftparchive/apt-ftparchive.cc:345
msgid "Package extension list is too long"
@@ -395,7 +391,7 @@ msgid ""
" -o=? Set an arbitrary configuration option"
msgstr ""
"Bruk: apt-ftparchive [innstillinger] kommando\n"
-"Kommandoer: packages binrsti [overstyringsfil [sti-prefiks]]\n"
+"Kommandoer: packages binærsti [overstyringsfil [sti-prefiks]]\n"
" sources kildesti [overstyringsfil [sti-prefiks]]\n"
" contents sti\n"
" release sti\n"
@@ -403,24 +399,24 @@ msgstr ""
" clean config\n"
"\n"
"apt-ftparchive oppretter indeksfiler for debianarkiver. Mange ulike\n"
-"metoder er stttet - fra helautomatiske til funksjonelle\n"
+"metoder er støttet - fra helautomatiske til funksjonelle\n"
"erstatninger for dpkg-scanpackages og dpkg-scansources.\n"
"\n"
-"apt-ftparchive oppretter Packages-filer fra et tre med debianpakker.\n"
-"Packages-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
+"apt-ftparchive oppretter «Packages»-filer fra et tre med debianpakker.\n"
+"«Packages»-fila inneholder alle kontrollfeltene fra hver pakke i tillegg "
"til\n"
-"MD5-nkkel og filstrrelse. Du kan bruke en overstyringsfil for tvinge\n"
+"MD5-nøkkel og filstørrelse. Du kan bruke en overstyringsfil for å tvinge\n"
"gjennom verdier for prioritet og kategori.\n"
"\n"
-"apt-ftparchive kan p samme mte opprette kildefiler fra et tre\n"
+"apt-ftparchive kan på samme måte opprette kildefiler fra et tre\n"
"med .dsc-filer. Du kan bruke en overstyringsfil med --source-override.\n"
"\n"
-"Kommandoene packages og sources skal kjres i rota av katalogtreet.\n"
-"Binrsti skal peke til toppkatalogen for det rekursive sket, og\n"
+"Kommandoene «packages» og «sources» skal kjøres i rota av katalogtreet.\n"
+"«Binærsti» skal peke til toppkatalogen for det rekursive søket, og\n"
"overstyringsfila skal inneholde innstillinger for overstyring.\n"
"Sti-prefikset blir lagt til feltene for filnavn, dersom det er oppgitt. Her "
"er\n"
-"et eksempel p bruk i debianarkivet:\n"
+"et eksempel på bruk i debianarkivet:\n"
" apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n"
" dists/potato/main/binary-i386/Packages\n"
"\n"
@@ -430,10 +426,10 @@ msgstr ""
" -s=? Overstyringsfil for kildekode.\n"
" -q Stille.\n"
" -d=? Velger om du vil bruke en mellomlagerdatabase.\n"
-" --no-delink Bruk avlusingsmodus med delinking.\n"
+" --no-delink Bruk avlusingsmodus med «delinking».\n"
" --contents Styrer opprettelse av innholdsfila.\n"
" -c=? Les denne oppsettsfila.\n"
-" -o=? Setter en vilkrlig innstilling"
+" -o=? Setter en vilkårlig innstilling"
#: ftparchive/apt-ftparchive.cc:796
msgid "No selections matched"
@@ -442,37 +438,36 @@ msgstr "Ingen utvalg passet"
#: ftparchive/apt-ftparchive.cc:874
#, c-format
msgid "Some files are missing in the package file group `%s'"
-msgstr "Enkelte filer mangler i pakkegruppa %s"
+msgstr "Enkelte filer mangler i pakkegruppa «%s»"
#: ftparchive/cachedb.cc:43
#, c-format
msgid "DB was corrupted, file renamed to %s.old"
-msgstr "Databasen er delagt. Filnavnet er endret til %s.old"
+msgstr "Databasen er ødelagt. Filnavnet er endret til %s.old"
#: ftparchive/cachedb.cc:61
#, c-format
msgid "DB is old, attempting to upgrade %s"
-msgstr "Databasen er gammel, forsker oppgradere %s"
+msgstr "Databasen er gammel, forsøker å oppgradere %s"
#: ftparchive/cachedb.cc:72
-#, fuzzy
msgid ""
"DB format is invalid. If you upgraded from an older version of apt, please "
"remove and re-create the database."
msgstr ""
"DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, "
-"fjern og s gjenopprett databasen."
+"fjern og så gjenopprett databasen."
#: ftparchive/cachedb.cc:77
#, c-format
msgid "Unable to open DB file %s: %s"
-msgstr "Klarte ikke pne Databasefila %s: %s"
+msgstr "Klarte ikke å åpne Databasefila %s: %s"
#: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190
#: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117
#, c-format
msgid "Failed to stat %s"
-msgstr "Klarte ikke f statusen p %s"
+msgstr "Klarte ikke å få statusen på %s"
#: ftparchive/cachedb.cc:242
msgid "Archive has no control record"
@@ -480,17 +475,17 @@ msgstr "Arkivet har ingen kontrollpost"
#: ftparchive/cachedb.cc:448
msgid "Unable to get a cursor"
-msgstr "Klarte ikke finne en peker"
+msgstr "Klarte ikke å finne en peker"
#: ftparchive/writer.cc:73
#, c-format
msgid "W: Unable to read directory %s\n"
-msgstr "A: Klarte ikke lese katalogen %s\n"
+msgstr "A: Klarte ikke å lese katalogen %s\n"
#: ftparchive/writer.cc:78
#, c-format
msgid "W: Unable to stat %s\n"
-msgstr "A: Klarte ikke f statusen p %s\n"
+msgstr "A: Klarte ikke å få statusen på %s\n"
#: ftparchive/writer.cc:134
msgid "E: "
@@ -507,16 +502,16 @@ msgstr "F: Det er feil ved fila"
#: ftparchive/writer.cc:161 ftparchive/writer.cc:193
#, c-format
msgid "Failed to resolve %s"
-msgstr "Klarte ikke sl opp %s"
+msgstr "Klarte ikke å slå opp %s"
#: ftparchive/writer.cc:174
msgid "Tree walking failed"
-msgstr "Klarte ikke finne fram i treet"
+msgstr "Klarte ikke å finne fram i treet"
#: ftparchive/writer.cc:201
#, c-format
msgid "Failed to open %s"
-msgstr "Klarte ikke pne %s"
+msgstr "Klarte ikke å åpne %s"
#: ftparchive/writer.cc:260
#, c-format
@@ -526,22 +521,22 @@ msgstr " DeLink %s [%s]\n"
#: ftparchive/writer.cc:268
#, c-format
msgid "Failed to readlink %s"
-msgstr "Klarte ikke lese lenken %s"
+msgstr "Klarte ikke å lese lenken %s"
#: ftparchive/writer.cc:272
#, c-format
msgid "Failed to unlink %s"
-msgstr "Klarte ikke oppheve lenken %s"
+msgstr "Klarte ikke å oppheve lenken %s"
#: ftparchive/writer.cc:279
#, c-format
msgid "*** Failed to link %s to %s"
-msgstr "*** Klarte ikke lenke %s til %s"
+msgstr "*** Klarte ikke å lenke %s til %s"
#: ftparchive/writer.cc:289
#, c-format
msgid " DeLink limit of %sB hit.\n"
-msgstr " DeLink-grensa p %s B er ndd.\n"
+msgstr " DeLink-grensa på %s B er nådd.\n"
#: ftparchive/writer.cc:393
msgid "Archive had no package field"
@@ -550,7 +545,7 @@ msgstr "Arkivet har ikke noe pakkefelt"
#: ftparchive/writer.cc:401 ftparchive/writer.cc:688
#, c-format
msgid " %s has no override entry\n"
-msgstr " %s har ingen overstyringsoppfring\n"
+msgstr " %s har ingen overstyringsoppføring\n"
#: ftparchive/writer.cc:464 ftparchive/writer.cc:790
#, c-format
@@ -560,12 +555,12 @@ msgstr " %s-vedlikeholderen er %s, ikke %s\n"
#: ftparchive/writer.cc:698
#, c-format
msgid " %s has no source override entry\n"
-msgstr " %s har ingen kildeoverstyringsoppfring\n"
+msgstr " %s har ingen kildeoverstyringsoppføring\n"
#: ftparchive/writer.cc:702
#, c-format
msgid " %s has no binary override entry either\n"
-msgstr " %s har ingen binroverstyringsoppfring heller\n"
+msgstr " %s har ingen binæroverstyringsoppføring heller\n"
#: ftparchive/contents.cc:321
#, c-format
@@ -574,12 +569,12 @@ msgstr "Intern feil, fant ikke medlemmet %s"
#: ftparchive/contents.cc:358 ftparchive/contents.cc:389
msgid "realloc - Failed to allocate memory"
-msgstr "realloc - Klarte ikke tildele minne"
+msgstr "realloc - Klarte ikke å tildele minne"
#: ftparchive/override.cc:34 ftparchive/override.cc:142
#, c-format
msgid "Unable to open %s"
-msgstr "Klarte ikke pne %s"
+msgstr "Klarte ikke å åpne %s"
#: ftparchive/override.cc:60 ftparchive/override.cc:166
#, c-format
@@ -599,12 +594,12 @@ msgstr "Ugyldig overstyring %s linje %lu #3"
#: ftparchive/override.cc:127 ftparchive/override.cc:201
#, c-format
msgid "Failed to read the override file %s"
-msgstr "Klarte ikke lese overstyringsfila %s"
+msgstr "Klarte ikke å lese overstyringsfila %s"
#: ftparchive/multicompress.cc:72
#, c-format
msgid "Unknown compression algorithm '%s'"
-msgstr "Ukjent komprimeringsalgoritme %s"
+msgstr "Ukjent komprimeringsalgoritme «%s»"
#: ftparchive/multicompress.cc:102
#, c-format
@@ -613,15 +608,15 @@ msgstr "Komprimert utdata %s trenger et komprimeringssett"
#: ftparchive/multicompress.cc:169 methods/rsh.cc:91
msgid "Failed to create IPC pipe to subprocess"
-msgstr "Klarte ikke opprette IPC-rr til underprosessen"
+msgstr "Klarte ikke å opprette IPC-rør til underprosessen"
#: ftparchive/multicompress.cc:195
msgid "Failed to create FILE*"
-msgstr "Klarte ikke opprette FILE*"
+msgstr "Klarte ikke å opprette FILE*"
#: ftparchive/multicompress.cc:198
msgid "Failed to fork"
-msgstr "Klarte ikke forgreine prosess"
+msgstr "Klarte ikke å forgreine prosess"
#: ftparchive/multicompress.cc:212
msgid "Compress child"
@@ -630,15 +625,15 @@ msgstr "Komprimer barneprosess"
#: ftparchive/multicompress.cc:235
#, c-format
msgid "Internal error, failed to create %s"
-msgstr "Intern feil, klarte ikke opprette %s"
+msgstr "Intern feil, klarte ikke å opprette %s"
#: ftparchive/multicompress.cc:286
msgid "Failed to create subprocess IPC"
-msgstr "Klarte ikke opprette underprosessen IPC"
+msgstr "Klarte ikke å opprette underprosessen IPC"
#: ftparchive/multicompress.cc:321
msgid "Failed to exec compressor "
-msgstr "Klarte ikke kjre komprimeringen"
+msgstr "Klarte ikke å kjøre komprimeringen"
#: ftparchive/multicompress.cc:360
msgid "decompressor"
@@ -646,11 +641,11 @@ msgstr "dekomprimering"
#: ftparchive/multicompress.cc:403
msgid "IO to subprocess/file failed"
-msgstr "Klarte ikke kommunisere med underprosess/fil"
+msgstr "Klarte ikke å kommunisere med underprosess/fil"
#: ftparchive/multicompress.cc:455
msgid "Failed to read while computing MD5"
-msgstr "Klarte ikke lese under utregning av MD5"
+msgstr "Klarte ikke å lese under utregning av MD5"
#: ftparchive/multicompress.cc:472
#, c-format
@@ -660,7 +655,7 @@ msgstr "Problem ved oppheving av lenken til %s"
#: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185
#, c-format
msgid "Failed to rename %s to %s"
-msgstr "Klarte ikke endre navnet p %s til %s"
+msgstr "Klarte ikke å endre navnet på %s til %s"
#: cmdline/apt-get.cc:134
msgid "Y"
@@ -669,11 +664,11 @@ msgstr "J"
#: cmdline/apt-get.cc:156 apt-pkg/cachefilter.cc:29
#, c-format
msgid "Regex compilation error - %s"
-msgstr "Kompileringsfeil i regulrt uttrykk - %s"
+msgstr "Kompileringsfeil i regulært uttrykk - %s"
#: cmdline/apt-get.cc:251
msgid "The following packages have unmet dependencies:"
-msgstr "Flgende pakker har uinnfridde avhengighetsforhold:"
+msgstr "Følgende pakker har uinnfridde avhengighetsforhold:"
#: cmdline/apt-get.cc:341
#, c-format
@@ -707,27 +702,27 @@ msgstr " eller"
#: cmdline/apt-get.cc:391
msgid "The following NEW packages will be installed:"
-msgstr "Flgende NYE pakker vil bli installert:"
+msgstr "Følgende NYE pakker vil bli installert:"
#: cmdline/apt-get.cc:419
msgid "The following packages will be REMOVED:"
-msgstr "Flgende pakker vil bli FJERNET:"
+msgstr "Følgende pakker vil bli FJERNET:"
#: cmdline/apt-get.cc:441
msgid "The following packages have been kept back:"
-msgstr "Flgende pakker er holdt tilbake:"
+msgstr "Følgende pakker er holdt tilbake:"
#: cmdline/apt-get.cc:464
msgid "The following packages will be upgraded:"
-msgstr "Flgende pakker vil bli oppgradert:"
+msgstr "Følgende pakker vil bli oppgradert:"
#: cmdline/apt-get.cc:487
msgid "The following packages will be DOWNGRADED:"
-msgstr "Flgende pakker vil bli NEDGRADERT:"
+msgstr "Følgende pakker vil bli NEDGRADERT:"
#: cmdline/apt-get.cc:507
msgid "The following held packages will be changed:"
-msgstr "Flgende pakker vil bli endret:"
+msgstr "Følgende pakker vil bli endret:"
#: cmdline/apt-get.cc:560
#, c-format
@@ -739,8 +734,8 @@ msgid ""
"WARNING: The following essential packages will be removed.\n"
"This should NOT be done unless you know exactly what you are doing!"
msgstr ""
-"ADVARSEL: Flgende essensielle pakker vil bli fjernet.\n"
-"Dette br IKKE gjres, med mindre du vet nyaktig hva du gjr!"
+"ADVARSEL: Følgende essensielle pakker vil bli fjernet.\n"
+"Dette bør IKKE gjøres, med mindre du vet nøyaktig hva du gjør!"
#: cmdline/apt-get.cc:602
#, c-format
@@ -750,7 +745,7 @@ msgstr "%lu oppgraderte, %lu nylig installerte, "
#: cmdline/apt-get.cc:606
#, c-format
msgid "%lu reinstalled, "
-msgstr "%lu installert p nytt, "
+msgstr "%lu installert på nytt, "
#: cmdline/apt-get.cc:608
#, c-format
@@ -760,7 +755,7 @@ msgstr "%lu nedgraderte, "
#: cmdline/apt-get.cc:610
#, c-format
msgid "%lu to remove and %lu not upgraded.\n"
-msgstr "%lu fjerne og %lu ikke oppgradert.\n"
+msgstr "%lu å fjerne og %lu ikke oppgradert.\n"
#: cmdline/apt-get.cc:614
#, c-format
@@ -768,19 +763,19 @@ msgid "%lu not fully installed or removed.\n"
msgstr "%lu pakker ikke fullt installert eller fjernet.\n"
#: cmdline/apt-get.cc:634
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' for task '%s'\n"
-msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
+msgstr "Merk, velger «%s» for oppgaven «%s»\n"
#: cmdline/apt-get.cc:640
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' for regex '%s'\n"
-msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n"
+msgstr "Merk, velger «%s» for det regulære uttrykket «%s»\n"
#: cmdline/apt-get.cc:647
-#, fuzzy, c-format
+#, c-format
msgid "Selected version '%s' (%s) for '%s'\n"
-msgstr "Utvalgt versjon %s (%s) for %s\n"
+msgstr "Utvalgt versjon «%s» (%s) for «%s»\n"
#: cmdline/apt-get.cc:657
#, c-format
@@ -792,13 +787,12 @@ msgid " [Installed]"
msgstr " [Installert]"
#: cmdline/apt-get.cc:677
-#, fuzzy
msgid " [Not candidate version]"
-msgstr "Versjons-kandidater"
+msgstr " [Ikke versjonskandidat]"
#: cmdline/apt-get.cc:679
msgid "You should explicitly select one to install."
-msgstr "Du m velge en pakke som skal installeres."
+msgstr "Du må velge en pakke som skal installeres."
#: cmdline/apt-get.cc:682
#, c-format
@@ -808,44 +802,45 @@ msgid ""
"is only available from another source\n"
msgstr ""
"Pakken %s er ikke tilgjengelig, men en annen pakke henviser til den.\n"
-"Dette kan bety at pakken mangler, er utgtt, eller bare finnes \n"
+"Dette kan bety at pakken mangler, er utgått, eller bare finnes \n"
"tilgjengelig fra en annen kilde.\n"
#: cmdline/apt-get.cc:700
msgid "However the following packages replace it:"
-msgstr "Flgende pakker erstatter den imidlertid:"
+msgstr "Følgende pakker erstatter den imidlertid:"
#: cmdline/apt-get.cc:712
-#, fuzzy, c-format
+#, c-format
msgid "Package '%s' has no installation candidate"
-msgstr "Pakken %s har ingen installasjonskandidat"
+msgstr "Pakken «%s» har ingen installasjonskandidat"
#: cmdline/apt-get.cc:723
#, c-format
msgid "Virtual packages like '%s' can't be removed\n"
-msgstr ""
+msgstr "Virtuelle pakker som «%s» kan ikke fjernes\n"
#: cmdline/apt-get.cc:754
-#, fuzzy, c-format
+#, c-format
msgid "Note, selecting '%s' instead of '%s'\n"
-msgstr "Merk, velger %s istedenfor %s\n"
+msgstr "Merk, velger «%s» istedenfor «%s»\n"
#: cmdline/apt-get.cc:784
#, c-format
msgid "Skipping %s, it is already installed and upgrade is not set.\n"
msgstr ""
-"Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n"
+"Omgår %s - den er allerede installert eller ikke satt til oppgradering.\n"
#: cmdline/apt-get.cc:788
-#, fuzzy, c-format
+#, c-format
msgid "Skipping %s, it is not installed and only upgrades are requested.\n"
msgstr ""
-"Omgr %s - den er allerede installert eller ikke satt til oppgradering.\n"
+"Hopper over %s siden den ikke er installert eller kun oppgraderinger er "
+"ønsket.\n"
#: cmdline/apt-get.cc:798
#, c-format
msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
-msgstr "Det er ikke mulig installere %s p nytt - den kan ikke nedlastes.\n"
+msgstr "Det er ikke mulig å installere %s på nytt - den kan ikke nedlastes.\n"
#: cmdline/apt-get.cc:803
#, c-format
@@ -864,7 +859,7 @@ msgstr "Pakken %s er ikke installert, og derfor heller ikke fjernet\n"
#: cmdline/apt-get.cc:934
msgid "Correcting dependencies..."
-msgstr "Retter p avhengighetsforhold ..."
+msgstr "Retter på avhengighetsforhold ..."
#: cmdline/apt-get.cc:937
msgid " failed."
@@ -872,27 +867,27 @@ msgstr " mislyktes."
#: cmdline/apt-get.cc:940
msgid "Unable to correct dependencies"
-msgstr "Klarer ikke rette p avhengighetsforholdene"
+msgstr "Klarer ikke å rette på avhengighetsforholdene"
#: cmdline/apt-get.cc:943
msgid "Unable to minimize the upgrade set"
-msgstr "Klarer ikke minimere oppgraderingsettet"
+msgstr "Klarer ikke å minimere oppgraderingsettet"
#: cmdline/apt-get.cc:945
msgid " Done"
-msgstr " Utfrt"
+msgstr " Utført"
#: cmdline/apt-get.cc:949
msgid "You might want to run 'apt-get -f install' to correct these."
-msgstr "Du vil kanskje kjre apt-get -f install for rette p dette."
+msgstr "Du vil kanskje kjøre «apt-get -f install» for å rette på dette."
#: cmdline/apt-get.cc:952
msgid "Unmet dependencies. Try using -f."
-msgstr "Uinnfridde avhengighetsforhold - Prv -f."
+msgstr "Uinnfridde avhengighetsforhold - Prøv «-f»."
#: cmdline/apt-get.cc:977
msgid "WARNING: The following packages cannot be authenticated!"
-msgstr "ADVARSEL: Flgende pakker ble ikke autentisert!"
+msgstr "ADVARSEL: Følgende pakker ble ikke autentisert!"
#: cmdline/apt-get.cc:981
msgid "Authentication warning overridden.\n"
@@ -908,19 +903,19 @@ msgstr "Noen pakker ble ikke autentisert"
#: cmdline/apt-get.cc:999 cmdline/apt-get.cc:1154
msgid "There are problems and -y was used without --force-yes"
-msgstr "Det oppsto problemer og -y ble brukt uten --force-yes"
+msgstr "Det oppsto problemer og «-y» ble brukt uten «--force-yes»"
#: cmdline/apt-get.cc:1040
msgid "Internal error, InstallPackages was called with broken packages!"
-msgstr "Intern feil, InstallPackages ble kalt med delagte pakker!"
+msgstr "Intern feil, InstallPackages ble kalt med ødelagte pakker!"
#: cmdline/apt-get.cc:1049
msgid "Packages need to be removed but remove is disabled."
-msgstr "Pakker trenges fjernes, men funksjonen er sltt av."
+msgstr "Pakker trenges å fjernes, men funksjonen er slått av."
#: cmdline/apt-get.cc:1060
msgid "Internal error, Ordering didn't finish"
-msgstr "Intern feil, sortering fullfrte ikke"
+msgstr "Intern feil, sortering fullførte ikke"
#: cmdline/apt-get.cc:1085 cmdline/apt-get.cc:2190 cmdline/apt-get.cc:2481
#: apt-pkg/cachefile.cc:106
@@ -930,18 +925,18 @@ msgstr "Kan ikke lese kildlista."
#: cmdline/apt-get.cc:1100
msgid "How odd.. The sizes didn't match, email apt@packages.debian.org"
msgstr ""
-"S rart ... Strrelsene stemmer ikke overens, send en e-post til "
+"Så rart ... Størrelsene stemmer ikke overens, send en e-post til "
"apt@packages.debian.org"
#: cmdline/apt-get.cc:1105
#, c-format
msgid "Need to get %sB/%sB of archives.\n"
-msgstr "M hente %sB/%sB med arkiver.\n"
+msgstr "Må hente %sB/%sB med arkiver.\n"
#: cmdline/apt-get.cc:1108
#, c-format
msgid "Need to get %sB of archives.\n"
-msgstr "M hente %sB med arkiver.\n"
+msgstr "Må hente %sB med arkiver.\n"
#: cmdline/apt-get.cc:1113
#, c-format
@@ -967,11 +962,11 @@ msgstr "Dessverre, ikke nok ledig plass i %s"
#: cmdline/apt-get.cc:1160 cmdline/apt-get.cc:1180
msgid "Trivial Only specified but this is not a trivial operation."
msgstr ""
-"Bare trivielle endringer ble angitt, men dette er ikke en triviell endring."
+"«Bare trivielle endringer» ble angitt, men dette er ikke en triviell endring."
#: cmdline/apt-get.cc:1162
msgid "Yes, do as I say!"
-msgstr "Ja, gjr som jeg sier!"
+msgstr "Ja, gjør som jeg sier!"
#: cmdline/apt-get.cc:1164
#, c-format
@@ -980,8 +975,8 @@ msgid ""
"To continue type in the phrase '%s'\n"
" ?] "
msgstr ""
-"Du er iferd med utfre en mulig skadelig handling.\n"
-"For fortsette skriv inn teksten %s\n"
+"Du er iferd med å utføre en mulig skadelig handling.\n"
+"For å fortsette skriv inn teksten «%s»\n"
" ?] "
#: cmdline/apt-get.cc:1170 cmdline/apt-get.cc:1189
@@ -995,35 +990,35 @@ msgstr "Vil du fortsette [Y/n]? "
#: cmdline/apt-get.cc:1257 cmdline/apt-get.cc:2375 apt-pkg/algorithms.cc:1434
#, c-format
msgid "Failed to fetch %s %s\n"
-msgstr "Klarte ikke skaffe %s %s\n"
+msgstr "Klarte ikke å skaffe %s %s\n"
#: cmdline/apt-get.cc:1275
msgid "Some files failed to download"
-msgstr "Noen av filene kunne ikke lastes ned"
+msgstr "Klarte ikke laste ned alle filene"
#: cmdline/apt-get.cc:1276 cmdline/apt-get.cc:2384
msgid "Download complete and in download only mode"
-msgstr "Nedlasting fullfrt med innstillinga bare nedlasting"
+msgstr "Nedlasting fullført med innstillinga «bare nedlasting»"
#: cmdline/apt-get.cc:1282
msgid ""
"Unable to fetch some archives, maybe run apt-get update or try with --fix-"
"missing?"
msgstr ""
-"Klarte ikke hente alle arkivene. Du kan prve med apt-get update eller "
-"--fix-missing."
+"Klarte ikke å hente alle arkivene. Du kan prøve med «apt-get update» eller "
+"«--fix-missing»."
#: cmdline/apt-get.cc:1286
msgid "--fix-missing and media swapping is not currently supported"
-msgstr "--fix-missing og bytte av media stttes n ikke"
+msgstr "«--fix-missing» og bytte av media støttes nå ikke"
#: cmdline/apt-get.cc:1291
msgid "Unable to correct missing packages."
-msgstr "Klarer ikke rette p manglende pakker."
+msgstr "Klarer ikke å rette på manglende pakker."
#: cmdline/apt-get.cc:1292
msgid "Aborting install."
-msgstr "Avbryter istallasjonen."
+msgstr "Avbryter installasjonen."
#: cmdline/apt-get.cc:1320
msgid ""
@@ -1033,27 +1028,31 @@ msgid_plural ""
"The following packages disappeared from your system as\n"
"all files have been overwritten by other packages:"
msgstr[0] ""
+"Den følgende pakken forsvant fra systemet ditt siden\n"
+"alle filene er overskrevet av andre pakker:"
msgstr[1] ""
+"De følgende pakkene forsvant fra systemet ditt siden\n"
+"alle filene er overskrevet av andre pakker:"
#: cmdline/apt-get.cc:1324
msgid "Note: This is done automatic and on purpose by dpkg."
-msgstr ""
+msgstr "Merk: Dette er gjort automatisk og med hensikt av dpkg."
#: cmdline/apt-get.cc:1454
#, c-format
msgid "Ignore unavailable target release '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorer utilgjengelig målutgave «%s» av pakke «%s»"
#: cmdline/apt-get.cc:1486
-#, fuzzy, c-format
+#, c-format
msgid "Picking '%s' as source package instead of '%s'\n"
-msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
+msgstr "Velger «%s» som kildepakke istedenfor «%s»\n"
#. if (VerTag.empty() == false && Last == 0)
#: cmdline/apt-get.cc:1524
#, c-format
msgid "Ignore unavailable version '%s' of package '%s'"
-msgstr ""
+msgstr "Ignorer utilgjengelig versjon «%s» av pakke «%s»"
#: cmdline/apt-get.cc:1540
msgid "The update command takes no arguments"
@@ -1064,37 +1063,34 @@ msgid "We are not supposed to delete stuff, can't start AutoRemover"
msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)"
#: cmdline/apt-get.cc:1653
-#, fuzzy
msgid ""
"The following package was automatically installed and is no longer required:"
msgid_plural ""
"The following packages were automatically installed and are no longer "
"required:"
msgstr[0] ""
-"Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
+"Følgende pakke ble automatisk installert og er ikke lenger påkrevet:"
msgstr[1] ""
-"Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
+"Følgende pakker ble automatisk installert og er ikke lenger påkrevet:"
#: cmdline/apt-get.cc:1657
-#, fuzzy, c-format
+#, c-format
msgid "%lu package was automatically installed and is no longer required.\n"
msgid_plural ""
"%lu packages were automatically installed and are no longer required.\n"
-msgstr[0] ""
-"Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
-msgstr[1] ""
-"Flgende pakker ble automatisk installert og er ikke lenger pkrevet:"
+msgstr[0] "%lu pakke ble automatisk installert og er ikke lenger påkrevet.\n"
+msgstr[1] "%lu pakker ble automatisk installert og er ikke lenger påkrevet.\n"
#: cmdline/apt-get.cc:1659
msgid "Use 'apt-get autoremove' to remove them."
-msgstr "Bruk apt-get autoremove for fjerne dem."
+msgstr "Bruk «apt-get autoremove» for å fjerne dem."
#: cmdline/apt-get.cc:1664
msgid ""
"Hmm, seems like the AutoRemover destroyed something which really\n"
"shouldn't happen. Please file a bug report against apt."
msgstr ""
-"Hmm, det ser ut som auto-fjerneren (AutoRemover) dela noe, og det skal\n"
+"Hmm, det ser ut som auto-fjerneren (AutoRemover) ødela noe, og det skal\n"
"virkelig ikke skje. Send inn en feilmelding til apt-utviklerne."
#.
@@ -1109,27 +1105,27 @@ msgstr ""
#.
#: cmdline/apt-get.cc:1667 cmdline/apt-get.cc:1809
msgid "The following information may help to resolve the situation:"
-msgstr "Flgende informasjon kan vre til hjelp med lse problemet:"
+msgstr "Følgende informasjon kan være til hjelp med å løse problemet:"
#: cmdline/apt-get.cc:1671
msgid "Internal Error, AutoRemover broke stuff"
-msgstr "Intern feil, autofjerneren (AutoRemover) dela noe"
+msgstr "Intern feil, autofjerneren (AutoRemover) ødela noe"
#: cmdline/apt-get.cc:1690
msgid "Internal error, AllUpgrade broke stuff"
-msgstr "Intern feil - AllUpgrade dela noe"
+msgstr "Intern feil - «AllUpgrade» ødela noe"
#: cmdline/apt-get.cc:1779
msgid "You might want to run 'apt-get -f install' to correct these:"
-msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:"
+msgstr "Du vil kanskje utføre «apt-get -f install» for å rette på disse:"
#: cmdline/apt-get.cc:1782
msgid ""
"Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
"solution)."
msgstr ""
-"Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller "
-"angi en lsning)."
+"Uinnfridde avhengighetsforhold. Prøv «apt-get -f install» uten pakker (eller "
+"angi en løsning)."
#: cmdline/apt-get.cc:1794
msgid ""
@@ -1138,22 +1134,22 @@ msgid ""
"distribution that some required packages have not yet been created\n"
"or been moved out of Incoming."
msgstr ""
-"Noen pakker kunne ikke installeres. Dette kan bety at du har bedt om\n"
+"Noen pakker ble ikke installeres. Dette kan bety at du har bedt om\n"
"en umulig tilstand eller, hvis du bruker den ustabile utgaven av Debian,\n"
-"at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n"
+"at visse kjernepakker ennå ikke er laget eller flyttet ut av «Incoming» for\n"
"distribusjonen."
#: cmdline/apt-get.cc:1812
msgid "Broken packages"
-msgstr "delagte pakker"
+msgstr "Ødelagte pakker"
#: cmdline/apt-get.cc:1841
msgid "The following extra packages will be installed:"
-msgstr "Flgende ekstra pakker vil bli installert."
+msgstr "Følgende ekstra pakker vil bli installert."
#: cmdline/apt-get.cc:1931
msgid "Suggested packages:"
-msgstr "Foresltte pakker:"
+msgstr "Foreslåtte pakker:"
#: cmdline/apt-get.cc:1932
msgid "Recommended packages:"
@@ -1162,12 +1158,12 @@ msgstr "Anbefalte pakker"
#: cmdline/apt-get.cc:1974
#, c-format
msgid "Couldn't find package %s"
-msgstr "Klarte ikke finne pakken %s"
+msgstr "Klarte ikke å finne pakken %s"
#: cmdline/apt-get.cc:1981
-#, fuzzy, c-format
+#, c-format
msgid "%s set to automatically installed.\n"
-msgstr "%s satt til manuell installasjon.\n"
+msgstr "%s satt til automatisk installasjon.\n"
#: cmdline/apt-get.cc:2002
msgid "Calculating upgrade... "
@@ -1179,24 +1175,24 @@ msgstr "Mislyktes"
#: cmdline/apt-get.cc:2010
msgid "Done"
-msgstr "Utfrt"
+msgstr "Utført"
#: cmdline/apt-get.cc:2077 cmdline/apt-get.cc:2085
msgid "Internal error, problem resolver broke stuff"
-msgstr "Intern feil, problemlser dela noe"
+msgstr "Intern feil, problemløser ødela noe"
#: cmdline/apt-get.cc:2109 cmdline/apt-get.cc:2142
msgid "Unable to lock the download directory"
-msgstr "Klarer ikke lse nedlastingsmappa"
+msgstr "Klarer ikke å låse nedlastingsmappa"
#: cmdline/apt-get.cc:2185
msgid "Must specify at least one package to fetch source for"
-msgstr "Du m angi minst en pakke du vil ha kildekoden til"
+msgstr "Du må angi minst en pakke du vil ha kildekoden til"
#: cmdline/apt-get.cc:2225 cmdline/apt-get.cc:2501
#, c-format
msgid "Unable to find a source package for %s"
-msgstr "Klarer ikke finne en kildekodepakke for %s"
+msgstr "Klarer ikke å finne en kildekodepakke for %s"
#: cmdline/apt-get.cc:2241
#, c-format
@@ -1204,6 +1200,8 @@ msgid ""
"NOTICE: '%s' packaging is maintained in the '%s' version control system at:\n"
"%s\n"
msgstr ""
+"MERK: «%s»-pakker blir vedlikeholdt i versjonskontrollsystemet «%s» på:\n"
+"%s\n"
#: cmdline/apt-get.cc:2246
#, c-format
@@ -1212,11 +1210,14 @@ msgid ""
"bzr get %s\n"
"to retrieve the latest (possibly unreleased) updates to the package.\n"
msgstr ""
+"Bruk:\n"
+"bzr get %s\n"
+"for å hente siste (muligens ikke utgitte) oppdateringer for pakken.\n"
#: cmdline/apt-get.cc:2297
#, c-format
msgid "Skipping already downloaded file '%s'\n"
-msgstr "Hopper over allerede nedlastet fil %s\n"
+msgstr "Hopper over allerede nedlastet fil «%s»\n"
#: cmdline/apt-get.cc:2332
#, c-format
@@ -1226,12 +1227,12 @@ msgstr "Du har ikke nok ledig plass i %s"
#: cmdline/apt-get.cc:2338
#, c-format
msgid "Need to get %sB/%sB of source archives.\n"
-msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n"
+msgstr "Trenger å skaffe %sB av %sB fra kildekodearkivet.\n"
#: cmdline/apt-get.cc:2341
#, c-format
msgid "Need to get %sB of source archives.\n"
-msgstr "Trenger skaffe %sB fra kildekodearkivet.\n"
+msgstr "Trenger å skaffe %sB fra kildekodearkivet.\n"
#: cmdline/apt-get.cc:2347
#, c-format
@@ -1240,27 +1241,27 @@ msgstr "Skaffer kildekode %s\n"
#: cmdline/apt-get.cc:2380
msgid "Failed to fetch some archives."
-msgstr "Klarte ikke skaffe alle arkivene."
+msgstr "Klarte ikke å skaffe alle arkivene."
#: cmdline/apt-get.cc:2410
#, c-format
msgid "Skipping unpack of already unpacked source in %s\n"
-msgstr "Omgr utpakking av allerede utpakket kilde i %s\n"
+msgstr "Omgår utpakking av allerede utpakket kilde i %s\n"
#: cmdline/apt-get.cc:2422
#, c-format
msgid "Unpack command '%s' failed.\n"
-msgstr "Utpakkingskommandoen %s mislyktes.\n"
+msgstr "Utpakkingskommandoen «%s» mislyktes.\n"
#: cmdline/apt-get.cc:2423
#, c-format
msgid "Check if the 'dpkg-dev' package is installed.\n"
-msgstr "Sjekk om pakken dpkg-dev er installert.\n"
+msgstr "Sjekk om pakken «dpkg-dev» er installert.\n"
#: cmdline/apt-get.cc:2440
#, c-format
msgid "Build command '%s' failed.\n"
-msgstr "Byggekommandoen %s mislyktes.\n"
+msgstr "Byggekommandoen «%s» mislyktes.\n"
#: cmdline/apt-get.cc:2460
msgid "Child process failed"
@@ -1268,12 +1269,12 @@ msgstr "Barneprosessen mislyktes"
#: cmdline/apt-get.cc:2476
msgid "Must specify at least one package to check builddeps for"
-msgstr "Du m angi minst en pakke du vil sjekke builddeps for"
+msgstr "Du må angi minst en pakke du vil sjekke «builddeps» for"
#: cmdline/apt-get.cc:2506
#, c-format
msgid "Unable to get build-dependency information for %s"
-msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s"
+msgstr "Klarer ikke å skaffe informasjon om bygge-avhengighetene for %s"
#: cmdline/apt-get.cc:2526
#, c-format
@@ -1300,29 +1301,28 @@ msgstr ""
#, c-format
msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
msgstr ""
-"Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken "
+"Klarte ikke å tilfredsstille %s avhengighet for %s: den installerte pakken "
"%s er for ny"
#: cmdline/apt-get.cc:2693
#, c-format
msgid "Failed to satisfy %s dependency for %s: %s"
-msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s"
+msgstr "Klarte ikke å tilfredsstille %s avhengighet for %s: %s"
#: cmdline/apt-get.cc:2709
#, c-format
msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s."
+msgstr "Klarte ikke å tilfredstille bygg-avhengighetene for %s."
#: cmdline/apt-get.cc:2714
msgid "Failed to process build dependencies"
-msgstr "Klarte ikke behandle forutsetningene for bygging"
+msgstr "Klarte ikke å behandle forutsetningene for bygging"
#: cmdline/apt-get.cc:2745
msgid "Supported modules:"
-msgstr "Stttede moduler:"
+msgstr "Støttede moduler:"
#: cmdline/apt-get.cc:2786
-#, fuzzy
msgid ""
"Usage: apt-get [options] command\n"
" apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1367,45 +1367,47 @@ msgid ""
"pages for more information and options.\n"
" This APT has Super Cow Powers.\n"
msgstr ""
-"Bruk: apt-get [innstillinger] kommando\n"
-" apt-get [innstillinger] install|remove pakke1 [pakke2 ...]\n"
-" apt-get [innstillinger] source pakke1 [pakke2 ...]\n"
+"Bruk: apt-get [valg] kommando\n"
+" apt-get [valg] install|remove pakke1 [pakke2 ...]\n"
+" apt-get [valg] source pakke1 [pakke2 ...]\n"
"\n"
"apt-get er et enkelt grensesnitt som kan brukes fra kommandolinja\n"
-"for laste ned og installere pakker. De mest brukte kommandoene \n"
-"er update og install.\n"
+"for å laste ned og installere pakker. De mest brukte kommandoene \n"
+"er «update» og «install».\n"
"\n"
"Kommandoer:\n"
" update - Hent nye pakkelister\n"
-" upgrade - Utfr en oppgradering\n"
-" install - Installr nye pakker (Pakke er foo, ikke foo.deb)\n"
+" upgrade - Utfør en oppgradering\n"
+" install - Installér nye pakker (Pakke er «foo», ikke «foo.deb»)\n"
" remove - Fjern pakker\n"
" autoremove - Fjern alle automatisk ubrukte pakker\n"
" purge - Fjern og rydd opp etter pakker\n"
" source - Last ned kildekode fra arkivene\n"
" build-dep - Sett opp bygge-forutsetninger for kildekodepakker\n"
-" dist-upgrade - Oppgradr utgave, les apt-get(8)\n"
-" dselect-upgrade - Flg dselect sine anbefalinger\n"
+" dist-upgrade - Oppgradér utgave, les apt-get(8)\n"
+" dselect-upgrade - Følg «dselect» sine anbefalinger\n"
" clean - Slett nedlastede arkivfiler\n"
" autoclean - Slett gamle nedlastede arkivfiler\n"
" check - Se etter om det finnes brutte avhengigheter\n"
+" markauto - Merk de oppgitte pakkene som automatisk installert\n"
+" unmarkauto - Merk de oppgitte pakkene som manuelt installert\n"
"\n"
-"Innstillinger:\n"
+"Valg:\n"
" -h Denne hjelpteksten.\n"
" -q Loggbar tilbakemelding - ikke vis framdrift\n"
" -qq Ingen tilbakemelding - bortsett fra feilmeldinger\n"
-" -d Bare nedlasting - IKKE installr eller pakk ut arkivfilene\n"
+" -d Bare nedlasting - IKKE installér eller pakk ut arkivfilene\n"
" -s Simulering - bare simuler kommandoen\n"
-" -y Anta Ja til alle foresprsler uten sprre\n"
-" -f Prv fortsette hvis integritetstesten mislykkes\n"
-" -m Prv fortsette nr pakker mangler\n"
+" -y Anta Ja til alle forespørsler uten å spørre\n"
+" -f Prøv å fortsette hvis integritetstesten mislykkes\n"
+" -m Prøv å fortsette når pakker mangler\n"
" -u Vis liste med oppgraderte pakker\n"
" -b Bygg pakken etter at kildekoden er lastet ned\n"
" -V Vis fullstendige versjonsnummere\n"
" -c=? Les denne innstillingsfila\n"
-" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
+" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
"Les manualsiden apt-get(8), sources.list(5) og apt.conf(5)\n"
-"for mer informasjon og flere innstillinger\n"
+"for mer informasjon og flere valg.\n"
" Denne APT har kraften til en Superku.\n"
#: cmdline/apt-get.cc:2958
@@ -1415,6 +1417,10 @@ msgid ""
" Keep also in mind that locking is deactivated,\n"
" so don't depend on the relevance to the real current situation!"
msgstr ""
+"MERK: Dette er kun en simulering.\n"
+" apt-get må ha root-rettigheter for reell utførelse.\n"
+" Husk også at låsing er deaktivert, så ikke regn med \n"
+" relevans i forhold til den reelle gjeldende situasjonen."
#: cmdline/acqprogress.cc:55
msgid "Hit "
@@ -1435,7 +1441,7 @@ msgstr "Feil "
#: cmdline/acqprogress.cc:135
#, c-format
msgid "Fetched %sB in %s (%sB/s)\n"
-msgstr "Hentet %sB p %s (%sB/s)\n"
+msgstr "Hentet %sB på %s (%sB/s)\n"
#: cmdline/acqprogress.cc:225
#, c-format
@@ -1450,12 +1456,12 @@ msgid ""
"in the drive '%s' and press enter\n"
msgstr ""
"Bytte av media: sett inn CD-en som er merket\n"
-" %s\n"
-"i %s og trykk Enter\n"
+" «%s»\n"
+"i «%s» og trykk «Enter»\n"
#: cmdline/apt-sortpkgs.cc:86
msgid "Unknown package record!"
-msgstr "Ukjent pakkeoppfring"
+msgstr "Ukjent pakkeoppføring"
#: cmdline/apt-sortpkgs.cc:150
msgid ""
@@ -1472,14 +1478,14 @@ msgid ""
msgstr ""
"Bruk: apt-sortpkgs [innstillinger] fil1 [fil2 ...]\n"
"\n"
-"apt-sortpkgs er et enkelt redskap til sortere pakkefiler. Innstillingen\n"
-"-s brukes til angi hvilken filtype det er.\n"
+"apt-sortpkgs er et enkelt redskap til å sortere pakkefiler. Innstillingen\n"
+"-s brukes til å angi hvilken filtype det er.\n"
"\n"
"Innstillinger:\n"
" -h Denne hjelpeteksten\n"
" -s Bruk filsortering\n"
" -c=? Les denne innstillingsfila.\n"
-" -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n"
+" -o=? Sett en vilkårlig innstilling, f.eks. -o dir::cache=/tmp\n"
#: dselect/install:32
msgid "Bad default setting!"
@@ -1488,24 +1494,22 @@ msgstr "Feil standardinnstilling!"
#: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94
#: dselect/install:105 dselect/update:45
msgid "Press enter to continue."
-msgstr "Trykk Enter og fortsett"
+msgstr "Trykk «Enter» og fortsett"
#: dselect/install:91
msgid "Do you want to erase any previously downloaded .deb files?"
msgstr "Vil du slettet alle tidligere nedlastede .deb-filer?"
-# Note to translators: The following four messages belong together. It doesn't
-# matter where sentences start, but it has to fit in just these four lines, and
-# at only 80 characters per line, if possible.
+# Note to translators: The following four messages belong together. It doesn't
+# matter where sentences start, but it has to fit in just these four lines, and
+# at only 80 characters per line, if possible.
#: dselect/install:101
-#, fuzzy
msgid "Some errors occurred while unpacking. Packages that were installed"
-msgstr "Feil oppsto ved utpakkinga. Setter n opp de installerte pakkene."
+msgstr "Feil oppstod ved utpakkinga. Setter nå opp de installerte pakkene."
#: dselect/install:102
-#, fuzzy
msgid "will be configured. This may result in duplicate errors"
-msgstr "Det kan lede til fordobling av feil eller feil forrsaket av "
+msgstr "Det kan lede til fordobling av feil eller feil forårsaket av "
#: dselect/install:103
msgid "or errors caused by missing dependencies. This is OK, only the errors"
@@ -1514,7 +1518,7 @@ msgstr "manglende forutsetninger. Det er greit, bare de nevnte feilene er"
#: dselect/install:104
msgid ""
"above this message are important. Please fix them and run [I]nstall again"
-msgstr "av betydning. Sett dem i stand dem og kjr [I]nstall igjen."
+msgstr "av betydning. Sett dem i stand dem og kjør [I]nstall igjen."
#: dselect/update:30
msgid "Merging available information"
@@ -1522,19 +1526,19 @@ msgstr "Fletter tilgjengelig informasjon"
#: apt-inst/contrib/extracttar.cc:114
msgid "Failed to create pipes"
-msgstr "Klarte ikke opprette rr"
+msgstr "Klarte ikke å opprette rør"
#: apt-inst/contrib/extracttar.cc:141
msgid "Failed to exec gzip "
-msgstr "Klarte ikke kjre gzip "
+msgstr "Klarte ikke å kjøre gzip "
#: apt-inst/contrib/extracttar.cc:178 apt-inst/contrib/extracttar.cc:204
msgid "Corrupted archive"
-msgstr "delagt arkiv"
+msgstr "Ødelagt arkiv"
#: apt-inst/contrib/extracttar.cc:193
msgid "Tar checksum failed, archive corrupted"
-msgstr "Tar-sjekksummen mislykkes, arkivet er delagt"
+msgstr "Tar-sjekksummen mislykkes, arkivet er ødelagt"
#: apt-inst/contrib/extracttar.cc:296
#, c-format
@@ -1550,9 +1554,9 @@ msgid "Error reading archive member header"
msgstr "Feil ved lesing av arkivmedlemshode"
#: apt-inst/contrib/arfile.cc:90
-#, fuzzy, c-format
+#, c-format
msgid "Invalid archive member header %s"
-msgstr "Ugyldig arkivmedlemshode"
+msgstr "Ugyldig arkivmedlemshode %s"
#: apt-inst/contrib/arfile.cc:102
msgid "Invalid archive member header"
@@ -1564,19 +1568,19 @@ msgstr "Arkivet er for kort"
#: apt-inst/contrib/arfile.cc:132
msgid "Failed to read the archive headers"
-msgstr "Klarte ikke lese arkivhodene"
+msgstr "Klarte ikke å lese arkivhodene"
#: apt-inst/filelist.cc:380
msgid "DropNode called on still linked node"
-msgstr "DropNode ble startet p et knutepunkt som enn er lenket"
+msgstr "DropNode ble startet på et knutepunkt som ennå er lenket"
#: apt-inst/filelist.cc:412
msgid "Failed to locate the hash element!"
-msgstr "Fant ikke nkkelelementet."
+msgstr "Fant ikke nøkkelelementet."
#: apt-inst/filelist.cc:459
msgid "Failed to allocate diversion"
-msgstr "Klarte ikke tildele avledning"
+msgstr "Klarte ikke å tildele avledning"
#: apt-inst/filelist.cc:464
msgid "Internal error in AddDiversion"
@@ -1585,7 +1589,7 @@ msgstr "Intern feil i AddDiversion"
#: apt-inst/filelist.cc:477
#, c-format
msgid "Trying to overwrite a diversion, %s -> %s and %s/%s"
-msgstr "Prver skrive over en avledning, %s -> %s og %s/%s"
+msgstr "Prøver å skrive over en avledning, %s -> %s og %s/%s"
#: apt-inst/filelist.cc:506
#, c-format
@@ -1600,12 +1604,12 @@ msgstr "Dobbel oppsettsfil %s/%s"
#: apt-inst/dirstream.cc:41 apt-inst/dirstream.cc:46 apt-inst/dirstream.cc:49
#, c-format
msgid "Failed to write file %s"
-msgstr "Klarte ikke skrive fila %s"
+msgstr "Klarte ikke å skrive fila %s"
#: apt-inst/dirstream.cc:92 apt-inst/dirstream.cc:100
#, c-format
msgid "Failed to close file %s"
-msgstr "Klarte ikke lukke fila %s"
+msgstr "Klarte ikke å lukke fila %s"
#: apt-inst/extract.cc:93 apt-inst/extract.cc:164
#, c-format
@@ -1625,7 +1629,7 @@ msgstr "Katalogen %s er avledet"
#: apt-inst/extract.cc:144
#, c-format
msgid "The package is trying to write to the diversion target %s/%s"
-msgstr "Pakken prver skrive til avledningsmlet %s/%s"
+msgstr "Pakken prøver å skrive til avledningsmålet %s/%s"
#: apt-inst/extract.cc:154 apt-inst/extract.cc:297
msgid "The diversion path is too long"
@@ -1663,32 +1667,32 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s"
#: methods/mirror.cc:87
#, c-format
msgid "Unable to read %s"
-msgstr "Klarer ikke lese %s"
+msgstr "Klarer ikke å lese %s"
#: apt-inst/extract.cc:491
#, c-format
msgid "Unable to stat %s"
-msgstr "Klarte ikke f statusen p %s"
+msgstr "Klarte ikke å få statusen på %s"
#: apt-inst/deb/dpkgdb.cc:51 apt-inst/deb/dpkgdb.cc:57
#, c-format
msgid "Failed to remove %s"
-msgstr "Klarte ikke fjerne %s"
+msgstr "Klarte ikke å fjerne %s"
#: apt-inst/deb/dpkgdb.cc:106 apt-inst/deb/dpkgdb.cc:108
#, c-format
msgid "Unable to create %s"
-msgstr "Klarte ikke opprette %s"
+msgstr "Klarte ikke å opprette %s"
#: apt-inst/deb/dpkgdb.cc:114
#, c-format
msgid "Failed to stat %sinfo"
-msgstr "Klarte ikke f statusen p %sinfo"
+msgstr "Klarte ikke å få statusen på %sinfo"
#: apt-inst/deb/dpkgdb.cc:119
msgid "The info and temp directories need to be on the same filesystem"
msgstr ""
-"Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet"
+"Infokatalogen og den midlertidige katalogen må være på det samme filsystemet"
#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:1070
#: apt-pkg/pkgcachegen.cc:1174 apt-pkg/pkgcachegen.cc:1180
@@ -1699,7 +1703,7 @@ msgstr "Leser pakkelister"
#: apt-inst/deb/dpkgdb.cc:176
#, c-format
msgid "Failed to change to the admin dir %sinfo"
-msgstr "Klarte ikke bytte til adminkatalogen %sinfo"
+msgstr "Klarte ikke å bytte til adminkatalogen %sinfo"
#: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351
#: apt-inst/deb/dpkgdb.cc:444
@@ -1717,14 +1721,14 @@ msgid ""
"then make it empty and immediately re-install the same version of the "
"package!"
msgstr ""
-"Klarte ikke pne listefila %sinfo/%s. Dersom du ikke kan gjenopprette "
-"denne fila, br du opprette den som en tom fil og installere den samme "
-"versjonen av pakken p nytt."
+"Klarte ikke å åpne listefila «%sinfo/%s». Dersom du ikke kan gjenopprette "
+"denne fila, bør du opprette den som en tom fil og installere den samme "
+"versjonen av pakken på nytt."
#: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238
#, c-format
msgid "Failed reading the list file %sinfo/%s"
-msgstr "Klarte ikke lese listefila %sinfo/%s"
+msgstr "Klarte ikke å lese listefila %sinfo/%s"
#: apt-inst/deb/dpkgdb.cc:262
msgid "Internal error getting a node"
@@ -1733,11 +1737,11 @@ msgstr "Intern feil ved henting av node"
#: apt-inst/deb/dpkgdb.cc:305
#, c-format
msgid "Failed to open the diversions file %sdiversions"
-msgstr "Klarte ikke pne avledningsfila %sdiversions"
+msgstr "Klarte ikke å åpne avledningsfila %sdiversions"
#: apt-inst/deb/dpkgdb.cc:320
msgid "The diversion file is corrupted"
-msgstr "Avledningsfila er delagt"
+msgstr "Avledningsfila er ødelagt"
#: apt-inst/deb/dpkgdb.cc:327 apt-inst/deb/dpkgdb.cc:332
#: apt-inst/deb/dpkgdb.cc:337
@@ -1747,21 +1751,21 @@ msgstr "Ugyldig linje i avledningsfila: %s"
#: apt-inst/deb/dpkgdb.cc:358
msgid "Internal error adding a diversion"
-msgstr "Det oppsto en intern feil nr avledningen ble lagt til"
+msgstr "Det oppsto en intern feil når avledningen ble lagt til"
#: apt-inst/deb/dpkgdb.cc:379
msgid "The pkg cache must be initialized first"
-msgstr "Pakkelageret m klargjres frst"
+msgstr "Pakkelageret må klargjøres først"
#: apt-inst/deb/dpkgdb.cc:439
#, c-format
msgid "Failed to find a Package: header, offset %lu"
-msgstr "Fant ikke Package:-linje, offset %lu"
+msgstr "Fant ikke «Package:»-linje, offset %lu"
#: apt-inst/deb/dpkgdb.cc:461
#, c-format
msgid "Bad ConfFile section in the status file. Offset %lu"
-msgstr "delagt ConfFile-del i statusfila. Offset %lu"
+msgstr "Ødelagt «ConfFile»-del i statusfila. Offset %lu"
#: apt-inst/deb/dpkgdb.cc:466
#, c-format
@@ -1771,19 +1775,19 @@ msgstr "Feil ved tolking av MD5. Offset %lu"
#: apt-inst/deb/debfile.cc:38 apt-inst/deb/debfile.cc:43
#, c-format
msgid "This is not a valid DEB archive, missing '%s' member"
-msgstr "Dette er ikke et gyldig DEB-arkiv, mangler %s-medlemmet"
+msgstr "Dette er ikke et gyldig DEB-arkiv, mangler «%s»-medlemmet"
#: apt-inst/deb/debfile.cc:50
#, c-format
msgid "This is not a valid DEB archive, it has no '%s', '%s' or '%s' member"
msgstr ""
-"Dette er ikke et gyldig DEB-arkiv, det har ikke noe %s-, %s- eller %s-"
+"Dette er ikke et gyldig DEB-arkiv, det har ikke noe «%s»-, «%s»- eller «%s»-"
"medlem"
#: apt-inst/deb/debfile.cc:110
#, c-format
msgid "Couldn't change to %s"
-msgstr "Klarte ikke bytte til %s"
+msgstr "Klarte ikke å bytte til %s"
#: apt-inst/deb/debfile.cc:140
msgid "Internal error, could not locate member"
@@ -1800,7 +1804,7 @@ msgstr "Kontrollfila kan ikke tolkes"
#: methods/bzip2.cc:68
#, c-format
msgid "Couldn't open pipe for %s"
-msgstr "Klarte ikke pne rr for %s"
+msgstr "Klarte ikke å åpne rør for %s"
#: methods/bzip2.cc:113
#, c-format
@@ -1811,25 +1815,25 @@ msgstr "Lesefeil fra %s-prosessen"
#: methods/gzip.cc:96 methods/gzip.cc:105 methods/rred.cc:486
#: methods/rred.cc:495
msgid "Failed to stat"
-msgstr "Klarte ikke f status"
+msgstr "Klarte ikke å få status"
#: methods/bzip2.cc:151 methods/copy.cc:80 methods/gzip.cc:102
#: methods/rred.cc:492
msgid "Failed to set modification time"
-msgstr "Klarte ikke sette endringstidspunkt"
+msgstr "Klarte ikke å sette endringstidspunkt"
#: methods/cdrom.cc:199
#, c-format
msgid "Unable to read the cdrom database %s"
-msgstr "Klarer ikke lese CD-databasen %s"
+msgstr "Klarer ikke å lese CD-databasen %s"
#: 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 ""
-"Bruk apt-cdrom for gjre denne CD-plata tilgjengelig for APT. Du kan "
-"ikke bruke apt-get update til legge til nye CD-plater."
+"Bruk «apt-cdrom» for å gjøre denne CD-plata tilgjengelig for APT. Du kan "
+"ikke bruke «apt-get update» til å legge til nye CD-plater."
#: methods/cdrom.cc:218
msgid "Wrong CD-ROM"
@@ -1839,7 +1843,7 @@ msgstr "Feil CD-plate"
#, c-format
msgid "Unable to unmount the CD-ROM in %s, it may still be in use."
msgstr ""
-"Klarer ikke avmontere CD-plata i %s. Det kan hende plata fremdeles er i "
+"Klarer ikke å avmontere CD-plata i %s. Det kan hende plata fremdeles er i "
"bruk."
#: methods/cdrom.cc:250
@@ -1861,16 +1865,16 @@ msgstr "Logger inn"
#: methods/ftp.cc:174
msgid "Unable to determine the peer name"
-msgstr "Klarte ikke fastsl navnet p motparten"
+msgstr "Klarte ikke å fastslå navnet på motparten"
#: methods/ftp.cc:179
msgid "Unable to determine the local name"
-msgstr "Klarte ikke fastsl det lokale navnet"
+msgstr "Klarte ikke å fastslå det lokale navnet"
#: methods/ftp.cc:210 methods/ftp.cc:238
#, c-format
msgid "The server refused the connection and said: %s"
-msgstr "Tjeneren nektet oss kople til og sa: %s"
+msgstr "Tjeneren nektet oss å kople til og sa: %s"
#: methods/ftp.cc:216
#, c-format
@@ -1887,13 +1891,13 @@ msgid ""
"A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
"is empty."
msgstr ""
-"En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet Acquire::"
-"ftp::ProxyLogin er tomt."
+"En mellomtjener er oppgitt, men ikke noe innloggingsskript. Feltet «Acquire::"
+"ftp::ProxyLogin» er tomt."
#: methods/ftp.cc:271
#, c-format
msgid "Login script command '%s' failed, server said: %s"
-msgstr "Kommandoen %s i innlogginsskriptet mislykkes, tjeneren sa: %s"
+msgstr "Kommandoen «%s» i innlogginsskriptet mislykkes, tjeneren sa: %s"
#: methods/ftp.cc:297
#, c-format
@@ -1902,7 +1906,7 @@ msgstr "TYPE mislykkes, tjeneren sa: %s"
#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
msgid "Connection timeout"
-msgstr "Tidsavbrudd p forbindelsen"
+msgstr "Tidsavbrudd på forbindelsen"
#: methods/ftp.cc:341
msgid "Server closed the connection"
@@ -1914,11 +1918,11 @@ msgstr "Lesefeil"
#: methods/ftp.cc:351 methods/rsh.cc:197
msgid "A response overflowed the buffer."
-msgstr "Et svar oversvmte bufferen."
+msgstr "Et svar oversvømte bufferen."
#: methods/ftp.cc:368 methods/ftp.cc:380
msgid "Protocol corruption"
-msgstr "Protokolldeleggelse"
+msgstr "Protokollødeleggelse"
#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:795 methods/rsh.cc:232
msgid "Write error"
@@ -1926,35 +1930,35 @@ msgstr "Skrivefeil"
#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
msgid "Could not create a socket"
-msgstr "Klarte ikke opprette en sokkel"
+msgstr "Klarte ikke å opprette en sokkel"
#: methods/ftp.cc:703
msgid "Could not connect data socket, connection timed out"
-msgstr "Klarte ikke kople til datasokkelen, tidsavbrudd p forbindelsen"
+msgstr "Klarte ikke å kople til datasokkelen, tidsavbrudd på forbindelsen"
#: methods/ftp.cc:709
msgid "Could not connect passive socket."
-msgstr "Klarte ikke koble til en passiv sokkel."
+msgstr "Klarte ikke å koble til en passiv sokkel."
#: methods/ftp.cc:727
msgid "getaddrinfo was unable to get a listening socket"
-msgstr "getaddrinfo klarte ikke opprette en lyttesokkel"
+msgstr "getaddrinfo klarte ikke å opprette en lyttesokkel"
#: methods/ftp.cc:741
msgid "Could not bind a socket"
-msgstr "Klarte ikke binde til sokkel"
+msgstr "Klarte ikke å binde til sokkel"
#: methods/ftp.cc:745
msgid "Could not listen on the socket"
-msgstr "Klarte ikke lytte til sokkel"
+msgstr "Klarte ikke å lytte til sokkel"
#: methods/ftp.cc:752
msgid "Could not determine the socket's name"
-msgstr "Klarte ikke avgjre sokkelnavnet"
+msgstr "Klarte ikke å avgjøre sokkelnavnet"
#: methods/ftp.cc:784
msgid "Unable to send PORT command"
-msgstr "Klarte ikke sende PORT-kommandoen"
+msgstr "Klarte ikke å sende PORT-kommandoen"
#: methods/ftp.cc:794
#, c-format
@@ -1968,38 +1972,38 @@ msgstr "EPRT mislykkes, tjeneren sa: %s"
#: methods/ftp.cc:823
msgid "Data socket connect timed out"
-msgstr "Tidsavbrudd p tilkoblingen til datasokkelen"
+msgstr "Tidsavbrudd på tilkoblingen til datasokkelen"
#: methods/ftp.cc:830
msgid "Unable to accept connection"
-msgstr "Klarte ikke godta tilkoblingen"
+msgstr "Klarte ikke å godta tilkoblingen"
#: methods/ftp.cc:869 methods/http.cc:1000 methods/rsh.cc:302
msgid "Problem hashing file"
-msgstr "Problem ved oppretting av nkkel for fil"
+msgstr "Problem ved oppretting av nøkkel for fil"
#: methods/ftp.cc:882
#, c-format
msgid "Unable to fetch file, server said '%s'"
-msgstr "Klarte ikke hente fila, tjeneren sa %s"
+msgstr "Klarte ikke å hente fila, tjeneren sa «%s»"
#: methods/ftp.cc:897 methods/rsh.cc:321
msgid "Data socket timed out"
-msgstr "Tidsavbrudd p datasokkelen"
+msgstr "Tidsavbrudd på datasokkelen"
#: methods/ftp.cc:927
#, c-format
msgid "Data transfer failed, server said '%s'"
-msgstr "Dataoverfringen mislykkes, tjeneren sa %s"
+msgstr "Dataoverføringen mislykkes, tjeneren sa «%s»"
#. Get the files information
#: methods/ftp.cc:1004
msgid "Query"
-msgstr "Sprring"
+msgstr "Spørring"
#: methods/ftp.cc:1116
msgid "Unable to invoke "
-msgstr "Klarte ikke starte"
+msgstr "Klarte ikke å starte"
#: methods/connect.cc:71
#, c-format
@@ -2014,22 +2018,22 @@ msgstr "[IP: %s %s]"
#: methods/connect.cc:89
#, c-format
msgid "Could not create a socket for %s (f=%u t=%u p=%u)"
-msgstr "Klarte ikke opprette en sokkel for %s (f=%u t=%u p=%u)"
+msgstr "Klarte ikke å opprette en sokkel for %s (f=%u t=%u p=%u)"
#: methods/connect.cc:95
#, c-format
msgid "Cannot initiate the connection to %s:%s (%s)."
-msgstr "Klarte ikke starte forbindelsen til %s:%s (%s)."
+msgstr "Klarte ikke å starte forbindelsen til %s:%s (%s)."
#: methods/connect.cc:103
#, c-format
msgid "Could not connect to %s:%s (%s), connection timed out"
-msgstr "Klarte ikke koble til %s:%s (%s), tidsavbrudd p forbindelsen"
+msgstr "Klarte ikke å koble til %s:%s (%s), tidsavbrudd på forbindelsen"
#: methods/connect.cc:121
#, c-format
msgid "Could not connect to %s:%s (%s)."
-msgstr "Klarte ikke koble til %s:%s (%s)."
+msgstr "Klarte ikke å koble til %s:%s (%s)."
#. We say this mainly because the pause here is for the
#. ssh connection that is still going
@@ -2041,63 +2045,62 @@ msgstr "Kobler til %s"
#: methods/connect.cc:168 methods/connect.cc:187
#, c-format
msgid "Could not resolve '%s'"
-msgstr "Klarte ikke sl opp %s"
+msgstr "Klarte ikke å slå opp «%s»"
#: methods/connect.cc:193
#, c-format
msgid "Temporary failure resolving '%s'"
-msgstr "Midlertidig feil ved oppslag av %s"
+msgstr "Midlertidig feil ved oppslag av «%s»"
#: methods/connect.cc:196
-#, fuzzy, c-format
+#, c-format
msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
-msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)"
+msgstr "Noe galt skjedde ved oppslag av «%s:%s» (%i - %s)"
#: methods/connect.cc:243
-#, fuzzy, c-format
+#, c-format
msgid "Unable to connect to %s:%s:"
-msgstr "Klarte ikke koble til %s %s:"
+msgstr "Klarte ikke koble til %s:%s:"
#. TRANSLATOR: %s is the trusted keyring parts directory
#: methods/gpgv.cc:71
-#, fuzzy, c-format
+#, c-format
msgid "No keyring installed in %s."
-msgstr "Avbryter istallasjonen."
+msgstr "Ingen nøkkelring installert i %s."
#: methods/gpgv.cc:163
msgid ""
"Internal error: Good signature, but could not determine key fingerprint?!"
-msgstr "Intern feil: God signatur, men kunne bestemme nkkelfingeravtrykk?!"
+msgstr "Intern feil: God signatur, men kunne bestemme nøkkelfingeravtrykk?!"
#: methods/gpgv.cc:168
msgid "At least one invalid signature was encountered."
msgstr "Minst en ugyldig signatur ble funnet."
#: methods/gpgv.cc:172
-#, fuzzy
msgid "Could not execute 'gpgv' to verify signature (is gpgv installed?)"
msgstr ""
-"Klarte ikke kjre %s for verifisere signaturen (er gpgv installert?)"
+"Klarte ikke kjøre «gpgv» for å verifisere signaturen (er gpgv installert?)"
#: methods/gpgv.cc:177
msgid "Unknown error executing gpgv"
-msgstr "Ukjent feil ved kjring av gpgv"
+msgstr "Ukjent feil ved kjøring av gpgv"
#: methods/gpgv.cc:211 methods/gpgv.cc:218
msgid "The following signatures were invalid:\n"
-msgstr "De flgende signaturene var ugyldige:\n"
+msgstr "De følgende signaturene var ugyldige:\n"
#: methods/gpgv.cc:225
msgid ""
"The following signatures couldn't be verified because the public key is not "
"available:\n"
msgstr ""
-"De flgende signaturene kunne ikke verifiseres fordi den offentlige nkkelen "
+"De følgende signaturene kunne ikke verifiseres fordi den offentlige nøkkelen "
"ikke er tilgjengelig:\n"
#: methods/http.cc:385
msgid "Waiting for headers"
-msgstr "Venter p hoder"
+msgstr "Venter på hoder"
#: methods/http.cc:531
#, c-format
@@ -2106,7 +2109,7 @@ msgstr "Fikk en enkel hodelinje over %u tegn"
#: methods/http.cc:539
msgid "Bad header line"
-msgstr "delagt hodelinje"
+msgstr "Ødelagt hodelinje"
#: methods/http.cc:558 methods/http.cc:565
msgid "The HTTP server sent an invalid reply header"
@@ -2114,15 +2117,15 @@ msgstr "HTTP-tjeneren sendte et ugyldig svarhode"
#: methods/http.cc:594
msgid "The HTTP server sent an invalid Content-Length header"
-msgstr "HTTP-tjeneren sendte et ugyldig Content-Length-hode"
+msgstr "HTTP-tjeneren sendte et ugyldig «Content-Length»-hode"
#: methods/http.cc:609
msgid "The HTTP server sent an invalid Content-Range header"
-msgstr "HTTP-tjeneren sendte et ugyldig Content-Range-hode"
+msgstr "HTTP-tjeneren sendte et ugyldig «Content-Range»-hode"
#: methods/http.cc:611
msgid "This HTTP server has broken range support"
-msgstr "Denne HTTP-tjeneren har delagt sttte for omrde"
+msgstr "Denne HTTP-tjeneren har ødelagt støtte for område"
#: methods/http.cc:635
msgid "Unknown date format"
@@ -2134,7 +2137,7 @@ msgstr "Utvalget mislykkes"
#: methods/http.cc:798
msgid "Connection timed out"
-msgstr "Tidsavbrudd p forbindelsen"
+msgstr "Tidsavbrudd på forbindelsen"
#: methods/http.cc:821
msgid "Error writing to output file"
@@ -2162,7 +2165,7 @@ msgstr "Klarte ikke forkorte fila %s"
#: methods/http.cc:1154
msgid "Bad header data"
-msgstr "delagte hodedata"
+msgstr "Ødelagte hodedata"
#: methods/http.cc:1171 methods/http.cc:1226
msgid "Connection failed"
@@ -2174,27 +2177,25 @@ msgstr "Intern feil"
#: apt-pkg/contrib/mmap.cc:77
msgid "Can't mmap an empty file"
-msgstr "Kan ikke utfre mmap p en tom fil"
+msgstr "Kan ikke utføre mmap på en tom fil"
#: apt-pkg/contrib/mmap.cc:89
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't duplicate file descriptor %i"
-msgstr "Klarte ikke pne rr for %s"
+msgstr "Klarte ikke duplisere fildeskriptor %i"
#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250
#, c-format
msgid "Couldn't make mmap of %lu bytes"
-msgstr "Kunne ikke lage mmap av %lu bytes"
+msgstr "Klarte ikke lage mmap av %lu bytes"
#: apt-pkg/contrib/mmap.cc:124
-#, fuzzy
msgid "Unable to close mmap"
-msgstr "Klarte ikke pne %s"
+msgstr "Klarte ikke lukke mmap"
#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180
-#, fuzzy
msgid "Unable to synchronize mmap"
-msgstr "Klarte ikke starte"
+msgstr "Klarte ikke synkronisere mmap"
#: apt-pkg/contrib/mmap.cc:300
#, c-format
@@ -2202,8 +2203,8 @@ msgid ""
"Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
"Current value: %lu. (man 5 apt.conf)"
msgstr ""
-"Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. "
-"Nvrende verdi: %lu. (man 5 apt.conf)"
+"Dynamisk MMap gikk tom for minne. Øk størrelsen på APT::Cache-Limit. "
+"Nåværende verdi: %lu. (man 5 apt.conf)"
#: apt-pkg/contrib/mmap.cc:399
#, c-format
@@ -2211,35 +2212,39 @@ msgid ""
"Unable to increase the size of the MMap as the limit of %lu bytes is already "
"reached."
msgstr ""
+"Klarte ikke øke størrelsen på MMap-en siden grensen på %lu byte allerede er "
+"nådd."
#: apt-pkg/contrib/mmap.cc:402
msgid ""
"Unable to increase size of the MMap as automatic growing is disabled by user."
msgstr ""
+"Klarte ikke øke størrelsen på MMap-en siden automatisk voksing er deaktivert "
+"av brukeren."
#. d means days, h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:371
#, c-format
msgid "%lid %lih %limin %lis"
-msgstr ""
+msgstr "%lid %lit %lim %lis"
#. h means hours, min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:378
#, c-format
msgid "%lih %limin %lis"
-msgstr ""
+msgstr "%lit %lim %lis"
#. min means minutes, s means seconds
#: apt-pkg/contrib/strutl.cc:385
#, c-format
msgid "%limin %lis"
-msgstr ""
+msgstr "%lim %lis"
#. s means seconds
#: apt-pkg/contrib/strutl.cc:390
#, c-format
msgid "%lis"
-msgstr ""
+msgstr "%lis"
#: apt-pkg/contrib/strutl.cc:1119
#, c-format
@@ -2249,12 +2254,12 @@ msgstr "Fant ikke utvalget %s"
#: apt-pkg/contrib/configuration.cc:452
#, c-format
msgid "Unrecognized type abbreviation: '%c'"
-msgstr "Ukjent typeforkortelse: %c"
+msgstr "Ukjent typeforkortelse: «%c»"
#: apt-pkg/contrib/configuration.cc:510
#, c-format
msgid "Opening configuration file %s"
-msgstr "pner oppsettsfila %s"
+msgstr "Åpner oppsettsfila %s"
#: apt-pkg/contrib/configuration.cc:678
#, c-format
@@ -2264,7 +2269,7 @@ msgstr "Syntaksfeil %s:%u: Blokka starter uten navn."
#: apt-pkg/contrib/configuration.cc:697
#, c-format
msgid "Syntax error %s:%u: Malformed tag"
-msgstr "Syntaksfeil %s:%u: Feil p taggen"
+msgstr "Syntaksfeil %s:%u: Feil på taggen"
#: apt-pkg/contrib/configuration.cc:714
#, c-format
@@ -2274,12 +2279,12 @@ msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien"
#: apt-pkg/contrib/configuration.cc:754
#, c-format
msgid "Syntax error %s:%u: Directives can only be done at the top level"
-msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet"
+msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det øverste nivået"
#: apt-pkg/contrib/configuration.cc:761
#, c-format
msgid "Syntax error %s:%u: Too many nested includes"
-msgstr "Syntaksfeil %s:%u: For mange nstede inkluderte filer"
+msgstr "Syntaksfeil %s:%u: For mange nøstede inkluderte filer"
#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770
#, c-format
@@ -2289,17 +2294,17 @@ msgstr "Syntaksfeil %s:%u: Inkludert herfra"
#: apt-pkg/contrib/configuration.cc:774
#, c-format
msgid "Syntax error %s:%u: Unsupported directive '%s'"
-msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet"
+msgstr "Syntaksfeil %s:%u: Direktivet «%s» er ikke støttet"
#: apt-pkg/contrib/configuration.cc:777
-#, fuzzy, c-format
+#, c-format
msgid "Syntax error %s:%u: clear directive requires an option tree as argument"
-msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet"
+msgstr "Syntaksfeil %s:%u: clear-direktivet krever et valgtre som argument"
#: apt-pkg/contrib/configuration.cc:827
#, c-format
msgid "Syntax error %s:%u: Extra junk at end of file"
-msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila"
+msgstr "Syntaksfeil %s:%u: Ugyldige angivelser på slutten av fila"
#: apt-pkg/contrib/progress.cc:153
#, c-format
@@ -2314,13 +2319,13 @@ msgstr "%c%s ... Ferdig"
#: apt-pkg/contrib/cmndline.cc:77
#, c-format
msgid "Command line option '%c' [from %s] is not known."
-msgstr "Kjenner ikke kommandolinjevalget %c (fra %s)."
+msgstr "Kjenner ikke kommandolinjevalget «%c» (fra %s)."
#: apt-pkg/contrib/cmndline.cc:103 apt-pkg/contrib/cmndline.cc:111
#: apt-pkg/contrib/cmndline.cc:119
#, c-format
msgid "Command line option %s is not understood"
-msgstr "Skjnner ikke kommandolinjevalget %s"
+msgstr "Skjønner ikke kommandolinjevalget %s"
#: apt-pkg/contrib/cmndline.cc:124
#, c-format
@@ -2335,22 +2340,22 @@ msgstr "Valget %s krever et argument."
#: 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 "Valg %s: Angivelsen av oppsettselementet m ha en =<verdi>."
+msgstr "Valg %s: Angivelsen av oppsettselementet må ha en =<verdi>."
#: apt-pkg/contrib/cmndline.cc:236
#, c-format
msgid "Option %s requires an integer argument, not '%s'"
-msgstr "Valget %s m ha et heltallsargument, ikke %s"
+msgstr "Valget %s må ha et heltallsargument, ikke «%s»"
#: apt-pkg/contrib/cmndline.cc:267
#, c-format
msgid "Option '%s' is too long"
-msgstr "Valget %s er for langt"
+msgstr "Valget «%s» er for langt"
#: apt-pkg/contrib/cmndline.cc:300
#, c-format
msgid "Sense %s is not understood, try true or false."
-msgstr "Skjnner ikke %s. Prv true eller false."
+msgstr "Skjønner ikke %s. Prøv «true» eller «false»."
#: apt-pkg/contrib/cmndline.cc:350
#, c-format
@@ -2360,43 +2365,43 @@ msgstr "Ugyldig operasjon %s"
#: apt-pkg/contrib/cdromutl.cc:52
#, c-format
msgid "Unable to stat the mount point %s"
-msgstr "Klarer ikke fastsette monteringspunktet %s"
+msgstr "Klarer ikke å fastsette monteringspunktet %s"
#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196
#: apt-pkg/acquire.cc:477 apt-pkg/acquire.cc:502 apt-pkg/clean.cc:39
#: methods/mirror.cc:93
#, c-format
msgid "Unable to change to %s"
-msgstr "Klarer ikke endre %s"
+msgstr "Klarer ikke å endre %s"
#: apt-pkg/contrib/cdromutl.cc:204
msgid "Failed to stat the cdrom"
-msgstr "Klarer ikke f statusen p CD-spilleren"
+msgstr "Klarer ikke å få statusen på CD-spilleren"
#: apt-pkg/contrib/fileutl.cc:154
#, c-format
msgid "Not using locking for read only lock file %s"
-msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s"
+msgstr "Bruker ikke låsing for den skrivebeskyttede låsefila %s"
#: apt-pkg/contrib/fileutl.cc:159
#, c-format
msgid "Could not open lock file %s"
-msgstr "Kunne ikke pne lsefila %s"
+msgstr "Klarte ikke åpne låsefila %s"
#: apt-pkg/contrib/fileutl.cc:177
#, c-format
msgid "Not using locking for nfs mounted lock file %s"
-msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s"
+msgstr "Bruker ikke låsing på den nfs-monterte låsefila %s"
#: apt-pkg/contrib/fileutl.cc:181
#, c-format
msgid "Could not get lock %s"
-msgstr "Fr ikke lst %s"
+msgstr "Får ikke låst %s"
#: apt-pkg/contrib/fileutl.cc:621
#, c-format
msgid "Waited for %s but it wasn't there"
-msgstr "Ventet p %s, men den ble ikke funnet"
+msgstr "Ventet på %s, men den ble ikke funnet"
#: apt-pkg/contrib/fileutl.cc:633
#, c-format
@@ -2404,9 +2409,9 @@ msgid "Sub-process %s received a segmentation fault."
msgstr "Underprosessen %s mottok et minnefeilsignal."
#: apt-pkg/contrib/fileutl.cc:635
-#, fuzzy, c-format
+#, c-format
msgid "Sub-process %s received signal %u."
-msgstr "Underprosessen %s mottok et minnefeilsignal."
+msgstr "Underprosessen %s mottok signalet %u."
#: apt-pkg/contrib/fileutl.cc:639
#, c-format
@@ -2421,42 +2426,42 @@ msgstr "Underprosessen %s avsluttet uventet"
#: apt-pkg/contrib/fileutl.cc:697
#, c-format
msgid "Could not open file %s"
-msgstr "Kunne ikke pne fila %s"
+msgstr "Klarte ikke åpne fila %s"
#: apt-pkg/contrib/fileutl.cc:714
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file descriptor %d"
-msgstr "Klarte ikke pne rr for %s"
+msgstr "Klarte ikke åpne fildeskriptor %d"
#: apt-pkg/contrib/fileutl.cc:774
#, c-format
msgid "read, still have %lu to read but none left"
-msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen"
+msgstr "lese, har fremdeles %lu igjen å lese, men ingen igjen"
#: apt-pkg/contrib/fileutl.cc:807
#, c-format
msgid "write, still have %lu to write but couldn't"
-msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke "
+msgstr "skrive, har fremdeles %lu igjen å skrive, men klarte ikke å"
#: apt-pkg/contrib/fileutl.cc:906
-#, fuzzy, c-format
+#, c-format
msgid "Problem closing the gzip file %s"
-msgstr "Problem ved lsing av fila"
+msgstr "Problem ved låsing av gzip-fila %s"
#: apt-pkg/contrib/fileutl.cc:909
-#, fuzzy, c-format
+#, c-format
msgid "Problem closing the file %s"
-msgstr "Problem ved lsing av fila"
+msgstr "Problem ved låsing av fila %s"
#: apt-pkg/contrib/fileutl.cc:914
-#, fuzzy, c-format
+#, c-format
msgid "Problem renaming the file %s to %s"
-msgstr "Problem ved oppdatering av fila"
+msgstr "Problem ved endring av navn på fila %s til %s"
#: apt-pkg/contrib/fileutl.cc:925
-#, fuzzy, c-format
+#, c-format
msgid "Problem unlinking the file %s"
-msgstr "Problem ved oppheving av lenke til fila"
+msgstr "Problem ved oppheving av lenke til fila %s"
#: apt-pkg/contrib/fileutl.cc:938
msgid "Problem syncing the file"
@@ -2468,7 +2473,7 @@ msgstr "Tomt pakkelager"
#: apt-pkg/pkgcache.cc:148
msgid "The package cache file is corrupted"
-msgstr "Pakkens lagerfil er delagt"
+msgstr "Pakkens lagerfil er ødelagt"
#: apt-pkg/pkgcache.cc:153
msgid "The package cache file is an incompatible version"
@@ -2477,7 +2482,7 @@ msgstr "Pakkens lagerfil er av feil versjon (samvirker ikke)"
#: apt-pkg/pkgcache.cc:158
#, c-format
msgid "This APT does not support the versioning system '%s'"
-msgstr "Denne APT sttter ikke versjonssystemet %s"
+msgstr "Denne APT støtter ikke versjonssystemet «%s»"
#: apt-pkg/pkgcache.cc:163
msgid "The package cache was built for a different architecture"
@@ -2493,7 +2498,7 @@ msgstr "Forutsetter"
#: apt-pkg/pkgcache.cc:290
msgid "Suggests"
-msgstr "Foreslr"
+msgstr "Foreslår"
#: apt-pkg/pkgcache.cc:291
msgid "Recommends"
@@ -2513,11 +2518,11 @@ msgstr "Nuller"
#: apt-pkg/pkgcache.cc:292
msgid "Breaks"
-msgstr "delegger"
+msgstr "Ødelegger"
#: apt-pkg/pkgcache.cc:292
msgid "Enhances"
-msgstr ""
+msgstr "Forbedrer"
#: apt-pkg/pkgcache.cc:303
msgid "important"
@@ -2525,7 +2530,7 @@ msgstr "viktig"
#: apt-pkg/pkgcache.cc:303
msgid "required"
-msgstr "pkrevet"
+msgstr "påkrevet"
#: apt-pkg/pkgcache.cc:303
msgid "standard"
@@ -2558,82 +2563,82 @@ msgstr "Leser tilstandsinformasjon"
#: apt-pkg/depcache.cc:236
#, c-format
msgid "Failed to open StateFile %s"
-msgstr "Klarte ikke pne StateFile %s"
+msgstr "Klarte ikke å åpne StateFile %s"
#: apt-pkg/depcache.cc:242
#, c-format
msgid "Failed to write temporary StateFile %s"
-msgstr "Klarte ikke skrive midlertidig StateFile %s"
+msgstr "Klarte ikke å skrive midlertidig StateFile %s"
#: apt-pkg/depcache.cc:921
#, c-format
msgid "Internal error, group '%s' has no installable pseudo package"
-msgstr ""
+msgstr "Intern feil, gruppe «%s» har ingen installerbar pseudo-pakke"
#: apt-pkg/tagfile.cc:102
#, c-format
msgid "Unable to parse package file %s (1)"
-msgstr "Klarer ikke fortolke pakkefila %s (1)"
+msgstr "Klarer ikke å fortolke pakkefila %s (1)"
#: apt-pkg/tagfile.cc:189
#, c-format
msgid "Unable to parse package file %s (2)"
-msgstr "Klarer ikke fortolke pakkefila %s (2)"
+msgstr "Klarer ikke å fortolke pakkefila %s (2)"
#: apt-pkg/sourcelist.cc:92
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] unparseable)"
-msgstr "Feil p %lu i kildelista %s (dist fortolking)"
+msgstr "Feil på linje %lu i kildelista %s ([valg] ikke tolkbar)"
#: apt-pkg/sourcelist.cc:95
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([option] too short)"
-msgstr "Feil p linje %lu i kildelista %s (dist)"
+msgstr "Feil på linje %lu i kildelista %s ([valg] for kort)"
#: apt-pkg/sourcelist.cc:106
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] is not an assignment)"
-msgstr "Feil p %lu i kildelista %s (dist fortolking)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] er ingen tilordning)"
#: apt-pkg/sourcelist.cc:112
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] has no key)"
-msgstr "Feil p %lu i kildelista %s (dist fortolking)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] har ingen nøkkel)"
#: apt-pkg/sourcelist.cc:115
-#, fuzzy, c-format
+#, c-format
msgid "Malformed line %lu in source list %s ([%s] key %s has no value)"
-msgstr "Feil p %lu i kildelista %s (dist fortolking)"
+msgstr "Feil på linje %lu i kildelista %s ([%s] nøkkel %s har ingen verdi)"
#: apt-pkg/sourcelist.cc:128
#, c-format
msgid "Malformed line %lu in source list %s (URI)"
-msgstr "Feil p linje %lu i kildelista %s (nettadresse)"
+msgstr "Feil på linje %lu i kildelista %s (nettadresse)"
#: apt-pkg/sourcelist.cc:130
#, c-format
msgid "Malformed line %lu in source list %s (dist)"
-msgstr "Feil p linje %lu i kildelista %s (dist)"
+msgstr "Feil på linje %lu i kildelista %s (dist)"
#: apt-pkg/sourcelist.cc:133
#, c-format
msgid "Malformed line %lu in source list %s (URI parse)"
-msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)"
+msgstr "Feil på %lu i kildelista %s (fortolkning av nettadressen)"
#: apt-pkg/sourcelist.cc:139
#, c-format
msgid "Malformed line %lu in source list %s (absolute dist)"
-msgstr "Feil p %lu i kildelista %s (Absolutt dist)"
+msgstr "Feil på %lu i kildelista %s (Absolutt dist)"
#: apt-pkg/sourcelist.cc:146
#, c-format
msgid "Malformed line %lu in source list %s (dist parse)"
-msgstr "Feil p %lu i kildelista %s (dist fortolking)"
+msgstr "Feil på %lu i kildelista %s (dist fortolking)"
#: apt-pkg/sourcelist.cc:244
#, c-format
msgid "Opening %s"
-msgstr "pner %s"
+msgstr "Åpner %s"
#: apt-pkg/sourcelist.cc:261 apt-pkg/cdrom.cc:438
#, c-format
@@ -2643,12 +2648,12 @@ msgstr "Linje %u i kildelista %s er for lang"
#: apt-pkg/sourcelist.cc:281
#, c-format
msgid "Malformed line %u in source list %s (type)"
-msgstr "Feil p %u i kildelista %s (type)"
+msgstr "Feil på %u i kildelista %s (type)"
#: apt-pkg/sourcelist.cc:285
#, c-format
msgid "Type '%s' is not known on line %u in source list %s"
-msgstr "Typen %s er ukjent i linje %u i kildelista %s"
+msgstr "Typen «%s» er ukjent i linje %u i kildelista %s"
#: apt-pkg/packagemanager.cc:331 apt-pkg/packagemanager.cc:616
#, c-format
@@ -2656,6 +2661,8 @@ msgid ""
"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
"under APT::Immediate-Configure for details. (%d)"
msgstr ""
+"Klarte ikke gjennomføre umiddelbar konfigurasjon av «%s». Se man 5 apt.conf "
+"under APT::Immediate-Configure for detaljer. (%d)"
#: apt-pkg/packagemanager.cc:452
#, c-format
@@ -2664,9 +2671,9 @@ msgid ""
"package %s due to a Conflicts/Pre-Depends loop. This is often bad, but if "
"you really want to do it, activate the APT::Force-LoopBreak option."
msgstr ""
-"Den forestende installasjon m midlertidig fjerne den meget viktige pakken "
-"%s pga. en konflikt/forutsettelses-lkke. Dette er ofte stygt, men hvis du "
-"virkelig vil det, s bruk innstillingen APT::Force-LoopBreak."
+"Den forestående installasjon må midlertidig fjerne den meget viktige pakken "
+"%s pga. en konflikt/forutsettelses-løkke. Dette er ofte stygt, men hvis du "
+"virkelig vil det, så bruk innstillingen APT::Force-LoopBreak."
#: apt-pkg/packagemanager.cc:495
#, c-format
@@ -2674,18 +2681,20 @@ msgid ""
"Could not perform immediate configuration on already unpacked '%s'.Please "
"see man 5 apt.conf under APT::Immediate-Configure for details."
msgstr ""
+"Klarte ikke gjennomføre umiddelbar konfigurasjon av allerede utpakket «%s». "
+"Se man 5 apt.conf under APT::Immediate-Configure for detaljer."
#: apt-pkg/pkgrecords.cc:32
#, c-format
msgid "Index file type '%s' is not supported"
-msgstr "Oversiktsfil av typen %s stttes ikke"
+msgstr "Oversiktsfil av typen «%s» støttes ikke"
#: apt-pkg/algorithms.cc:292
#, c-format
msgid ""
"The package %s needs to be reinstalled, but I can't find an archive for it."
msgstr ""
-"Pakka %s trenger installeres p nytt, men jeg finner ikke lageret for den."
+"Pakka %s trenger å installeres på nytt, men jeg finner ikke lageret for den."
#: apt-pkg/algorithms.cc:1182
msgid ""
@@ -2697,37 +2706,37 @@ msgstr ""
#: apt-pkg/algorithms.cc:1184
msgid "Unable to correct problems, you have held broken packages."
-msgstr "Klarer ikke rette problemene, noen delagte pakker er holdt tilbake."
+msgstr "Klarer ikke å rette problemene, noen ødelagte pakker er holdt tilbake."
#: apt-pkg/algorithms.cc:1460 apt-pkg/algorithms.cc:1462
msgid ""
"Some index files failed to download, they have been ignored, or old ones "
"used instead."
msgstr ""
-"Klarte ikke laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
+"Klarte ikke å laste ned alle oversiktfilene. De ble ignorerte, eller gamle "
"ble brukt isteden. "
#: apt-pkg/acquire.cc:79
-#, fuzzy, c-format
+#, c-format
msgid "List directory %spartial is missing."
msgstr "Listemappa %spartial mangler."
#: apt-pkg/acquire.cc:83
-#, fuzzy, c-format
+#, c-format
msgid "Archives directory %spartial is missing."
msgstr "Arkivmappa %spartial mangler."
#: apt-pkg/acquire.cc:91
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock directory %s"
-msgstr "Kan ikke lse listemappa"
+msgstr "Klarte ikke låse mappa %s"
#. only show the ETA if it makes sense
#. two days
#: apt-pkg/acquire.cc:878
#, c-format
msgid "Retrieving file %li of %li (%s remaining)"
-msgstr "Henter fil %li av %li (%s gjenvrende)"
+msgstr "Henter fil %li av %li (%s gjenværende)"
#: apt-pkg/acquire.cc:880
#, c-format
@@ -2747,12 +2756,12 @@ msgstr "Metoden %s startet ikke korrekt"
#: apt-pkg/acquire-worker.cc:413
#, c-format
msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
-msgstr "Sett inn disken merket %s i lagringsenheten %s og trykk Enter."
+msgstr "Sett inn disken merket «%s» i lagringsenheten «%s» og trykk Enter."
#: apt-pkg/init.cc:141
#, c-format
msgid "Packaging system '%s' is not supported"
-msgstr "Pakkesystemet %s stttes ikke"
+msgstr "Pakkesystemet «%s» støttes ikke"
#: apt-pkg/init.cc:157
msgid "Unable to determine a suitable packaging system type"
@@ -2766,21 +2775,21 @@ msgstr "Klarer ikke finne informasjonom %s."
#: apt-pkg/srcrecords.cc:44
msgid "You must put some 'source' URIs in your sources.list"
msgstr ""
-"Beklager, du m legge inn noen kilder (nettadresser) i din sources.list."
+"Beklager, du må legge inn noen kilder (nettadresser) i din «sources.list»."
#: apt-pkg/cachefile.cc:84
msgid "The package lists or status file could not be parsed or opened."
-msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller pnes."
+msgstr "Pakkelista eller tilstandsfila kunne ikke fortolkes eller åpnes."
#: apt-pkg/cachefile.cc:88
msgid "You may want to run apt-get update to correct these problems"
msgstr ""
-"Det kan hende du vil kjre apt-get update for rette p disse problemene"
+"Det kan hende du vil kjøre «apt-get update» for å rette på disse problemene"
#: apt-pkg/policy.cc:343
-#, fuzzy, c-format
+#, c-format
msgid "Invalid record in the preferences file %s, no Package header"
-msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode"
+msgstr "Ugyldig oppslag i foretrekksfila %s, manglende pakkehode"
#: apt-pkg/policy.cc:365
#, c-format
@@ -2822,9 +2831,9 @@ msgstr "Feil oppsto under behandling av %s (NewFileVer1)"
#: apt-pkg/pkgcachegen.cc:306 apt-pkg/pkgcachegen.cc:316
#: apt-pkg/pkgcachegen.cc:324
-#, fuzzy, c-format
+#, c-format
msgid "Error occurred while processing %s (NewVersion%d)"
-msgstr "Feil oppsto under behandling av %s (NewVersion1)"
+msgstr "Feil oppsto under behandling av %s (NewVersion%d)"
#: apt-pkg/pkgcachegen.cc:320
#, c-format
@@ -2838,19 +2847,19 @@ msgstr "Feil oppsto under behandling av %s (NewFileDesc2)"
#: apt-pkg/pkgcachegen.cc:360
msgid "Wow, you exceeded the number of package names this APT is capable of."
-msgstr "Jss, du har overgtt antallet pakkenavn denne APT klarer."
+msgstr "Jøss, du har overgått antallet pakkenavn denne APT klarer."
#: apt-pkg/pkgcachegen.cc:363
msgid "Wow, you exceeded the number of versions this APT is capable of."
-msgstr "Jss, du har overgtt antallet versjoner denne APT klarer."
+msgstr "Jøss, du har overgått antallet versjoner denne APT klarer."
#: apt-pkg/pkgcachegen.cc:366
msgid "Wow, you exceeded the number of descriptions this APT is capable of."
-msgstr "Jss, du har overgtt antallet beskrivelser denne APT klarer."
+msgstr "Jøss, du har overgått antallet beskrivelser denne APT klarer."
#: apt-pkg/pkgcachegen.cc:369
msgid "Wow, you exceeded the number of dependencies this APT is capable of."
-msgstr "Jss, du har overgtt antallet avhengighetsforhold denne APT klarer."
+msgstr "Jøss, du har overgått antallet avhengighetsforhold denne APT klarer."
#: apt-pkg/pkgcachegen.cc:398
#, c-format
@@ -2870,7 +2879,7 @@ msgstr "Fant ikke pakken %s %s ved behandling av filkrav"
#: apt-pkg/pkgcachegen.cc:982
#, c-format
msgid "Couldn't stat source package list %s"
-msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker"
+msgstr "Klarte ikke finne informasjon om %s - lista over kildekodepakker"
#: apt-pkg/pkgcachegen.cc:1087
msgid "Collecting File Provides"
@@ -2883,7 +2892,7 @@ msgstr "IO-feil ved lagring av kildekode-lager"
#: apt-pkg/acquire-item.cc:136
#, c-format
msgid "rename failed, %s (%s -> %s)."
-msgstr "klarte ikke endre navnet, %s (%s -> %s)."
+msgstr "klarte ikke å endre navnet, %s (%s -> %s)."
#: apt-pkg/acquire-item.cc:484
msgid "MD5Sum mismatch"
@@ -2897,7 +2906,7 @@ msgstr "Hashsummen stemmer ikke"
#: apt-pkg/acquire-item.cc:1240
msgid "There is no public key available for the following key IDs:\n"
msgstr ""
-"Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n"
+"Det er ingen offentlig nøkkel tilgjengelig for de følgende nøkkel-ID-ene:\n"
#. TRANSLATOR: The first %s is the URL of the bad Release file, the second is
#. the time since then the file is invalid - formated in the same way as in
@@ -2905,12 +2914,12 @@ msgstr ""
#: apt-pkg/acquire-item.cc:1277
#, c-format
msgid "Release file expired, ignoring %s (invalid since %s)"
-msgstr ""
+msgstr "Utgavefil har utgått, ignorerer %s (ugyldg siden %s)"
#: apt-pkg/acquire-item.cc:1298
#, c-format
msgid "Conflicting distribution: %s (expected %s but got %s)"
-msgstr ""
+msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)"
#: apt-pkg/acquire-item.cc:1324
#, c-format
@@ -2918,11 +2927,13 @@ msgid ""
"A error occurred during the signature verification. The repository is not "
"updated and the previous index files will be used.GPG error: %s: %s\n"
msgstr ""
+"En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den "
+"forrige indeksfilen vil bli brukt. GPG-feil: %s: %s\n"
#: apt-pkg/acquire-item.cc:1333
#, c-format
msgid "GPG error: %s: %s"
-msgstr ""
+msgstr "GPG-feil: %s: %s"
#: apt-pkg/acquire-item.cc:1361
#, c-format
@@ -2930,7 +2941,7 @@ msgid ""
"I wasn't able to locate a file for the %s package. This might mean you need "
"to manually fix this package. (due to missing arch)"
msgstr ""
-"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken "
+"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne pakken "
"selv (fordi arkitekturen mangler)."
#: apt-pkg/acquire-item.cc:1420
@@ -2939,43 +2950,43 @@ msgid ""
"I wasn't able to locate file for the %s package. This might mean you need to "
"manually fix this package."
msgstr ""
-"Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne "
+"Klarte ikke å finne en fil for pakken %s. Det kan bety at du må ordne denne "
"pakken selv."
#: apt-pkg/acquire-item.cc:1475
#, c-format
msgid ""
"The package index files are corrupted. No Filename: field for package %s."
-msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s."
+msgstr "Oversiktsfilene er ødelagte. Feltet «Filename:» mangler for pakken %s."
#: apt-pkg/acquire-item.cc:1562
msgid "Size mismatch"
-msgstr "Feil strrelse"
+msgstr "Feil størrelse"
#: apt-pkg/indexrecords.cc:53
-#, fuzzy, c-format
+#, c-format
msgid "Unable to parse Release file %s"
-msgstr "Klarer ikke fortolke pakkefila %s (1)"
+msgstr "Klarer ikke å fortolke Release-fila %s"
#: apt-pkg/indexrecords.cc:60
-#, fuzzy, c-format
+#, c-format
msgid "No sections in Release file %s"
-msgstr "Merk, velger %s istedenfor %s\n"
+msgstr "Ingen avsnitt i Release-fila %s"
#: apt-pkg/indexrecords.cc:94
#, c-format
msgid "No Hash entry in Release file %s"
-msgstr ""
+msgstr "Ingen sjekksumoppføring i Release-fila %s"
#: apt-pkg/indexrecords.cc:107
-#, fuzzy, c-format
+#, c-format
msgid "Invalid 'Valid-Until' entry in Release file %s"
-msgstr "Ugyldig linje i avledningsfila: %s"
+msgstr "Ugyldig «Valid-Until»-oppføring i Release-fila %s"
#: apt-pkg/indexrecords.cc:122
-#, fuzzy, c-format
+#, c-format
msgid "Invalid 'Date' entry in Release file %s"
-msgstr "Klarer ikke fortolke pakkefila %s (1)"
+msgstr "Ugyldig «Date»-oppføring i Release-fila %s"
#: apt-pkg/vendorlist.cc:66
#, c-format
@@ -3015,7 +3026,7 @@ msgstr "Avmonterer CD-ROM\n"
#: apt-pkg/cdrom.cc:600
msgid "Waiting for disc...\n"
-msgstr "Venter p CD-en...\n"
+msgstr "Venter på CD-en...\n"
#. Mount the new CDROM
#: apt-pkg/cdrom.cc:608
@@ -3040,15 +3051,17 @@ msgid ""
"Unable to locate any package files, perhaps this is not a Debian Disc or the "
"wrong architecture?"
msgstr ""
+"Klarte ikke finne noen Package-filer. Kanskje dette ikke er en Debian Disc "
+"eller du har valgt feil arkitektur?"
#: apt-pkg/cdrom.cc:703
#, c-format
msgid "Found label '%s'\n"
-msgstr "Fant merkelapp %s\n"
+msgstr "Fant merkelapp «%s»\n"
#: apt-pkg/cdrom.cc:732
msgid "That is not a valid name, try again.\n"
-msgstr "Det er ikke et gyldig navn, prv igjen.\n"
+msgstr "Det er ikke et gyldig navn, prøv igjen.\n"
#: apt-pkg/cdrom.cc:748
#, c-format
@@ -3057,7 +3070,7 @@ msgid ""
"'%s'\n"
msgstr ""
"CD-en er kalt: \n"
-"%s\n"
+"«%s»\n"
#: apt-pkg/cdrom.cc:752
msgid "Copying package lists..."
@@ -3069,7 +3082,7 @@ msgstr "Skriver ny kildeliste\n"
#: apt-pkg/cdrom.cc:787
msgid "Source list entries for this disc are:\n"
-msgstr "Kildelisteoppfringer for denne CD-en er:\n"
+msgstr "Kildelisteoppføringer for denne CD-en er:\n"
#: apt-pkg/indexcopy.cc:265 apt-pkg/indexcopy.cc:902
#, c-format
@@ -3092,44 +3105,44 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n"
#: apt-pkg/indexcopy.cc:532
-#, fuzzy, c-format
+#, c-format
msgid "Skipping nonexistent file %s"
-msgstr "pner oppsettsfila %s"
+msgstr "Hopper over den ikke-eksisterende fila %s"
#: apt-pkg/indexcopy.cc:538
#, c-format
msgid "Can't find authentication record for: %s"
-msgstr ""
+msgstr "Klarte ikke finne autentiseringsoppføring for: %s"
#: apt-pkg/indexcopy.cc:544
-#, fuzzy, c-format
+#, c-format
msgid "Hash mismatch for: %s"
-msgstr "Hashsummen stemmer ikke"
+msgstr "Hashsummen stemmer ikke for: %s"
#: apt-pkg/cacheset.cc:337
#, c-format
msgid "Release '%s' for '%s' was not found"
-msgstr "Utgave %s av %s ble ikke funnet"
+msgstr "Utgave «%s» av «%s» ble ikke funnet"
#: apt-pkg/cacheset.cc:340
#, c-format
msgid "Version '%s' for '%s' was not found"
-msgstr "Versjon %s av %s ble ikke funnet"
+msgstr "Versjon «%s» av «%s» ble ikke funnet"
#: apt-pkg/cacheset.cc:447
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't find task '%s'"
-msgstr "Klarte ikke finne oppgave %s"
+msgstr "Klarte ikke å finne oppgave «%s»"
#: apt-pkg/cacheset.cc:454
-#, fuzzy, c-format
+#, c-format
msgid "Couldn't find any package by regex '%s'"
-msgstr "Klarte ikke finne pakken %s"
+msgstr "Klarte ikke finne noen pakken med regex «%s»"
#: apt-pkg/cacheset.cc:467
#, c-format
msgid "Can't select versions from package '%s' as it purely virtual"
-msgstr ""
+msgstr "Klarte ikke velge versjoner fra pakken «%s» siden den er kun virtuell"
#: apt-pkg/cacheset.cc:475 apt-pkg/cacheset.cc:483
#, c-format
@@ -3137,21 +3150,28 @@ msgid ""
"Can't select installed nor candidate version from package '%s' as it has "
"neither of them"
msgstr ""
+"Klarte ikke velge installert eller kandidatversjon fra pakken «%s» siden den "
+"har ingen av dem"
#: apt-pkg/cacheset.cc:491
#, c-format
msgid "Can't select newest version from package '%s' as it is purely virtual"
msgstr ""
+"Klarte ikke velge nyeste versjon fra pakken «%s» siden den er kun virtuell"
#: apt-pkg/cacheset.cc:499
#, c-format
msgid "Can't select candidate version from package %s as it has no candidate"
msgstr ""
+"Klarte ikke velge kandidatversjon fra pakken «%s» siden den ikke har noen "
+"kandidat"
#: apt-pkg/cacheset.cc:507
#, c-format
msgid "Can't select installed version from package %s as it is not installed"
msgstr ""
+"Klarte ikke velge installert versjon fra pakken «%s» siden den ikke er "
+"installert"
#: apt-pkg/deb/dpkgpm.cc:52
#, c-format
@@ -3169,29 +3189,29 @@ msgid "Removing %s"
msgstr "Fjerner %s"
#: apt-pkg/deb/dpkgpm.cc:55
-#, fuzzy, c-format
+#, c-format
msgid "Completely removing %s"
-msgstr "Fjernet %s fullstendig"
+msgstr "Fjerner %s fullstendig"
#: apt-pkg/deb/dpkgpm.cc:56
#, c-format
msgid "Noting disappearance of %s"
-msgstr ""
+msgstr "Legger merke til at %s forsvinner"
#: apt-pkg/deb/dpkgpm.cc:57
#, c-format
msgid "Running post-installation trigger %s"
-msgstr "Kjrer etter-installasjonsutlser %s"
+msgstr "Kjører etter-installasjonsutløser %s"
#: apt-pkg/deb/dpkgpm.cc:643
#, c-format
msgid "Directory '%s' missing"
-msgstr "Mappa %s mangler"
+msgstr "Mappa «%s» mangler"
#: apt-pkg/deb/dpkgpm.cc:658 apt-pkg/deb/dpkgpm.cc:671
-#, fuzzy, c-format
+#, c-format
msgid "Could not open file '%s'"
-msgstr "Kunne ikke pne fila %s"
+msgstr "Klarte ikke åpne fila «%s»"
#: apt-pkg/deb/dpkgpm.cc:812
#, c-format
@@ -3226,7 +3246,7 @@ msgstr "Fjernet %s"
#: apt-pkg/deb/dpkgpm.cc:832
#, c-format
msgid "Preparing to completely remove %s"
-msgstr "Forbereder fullstendig slette %s"
+msgstr "Forbereder å fullstendig slette %s"
#: apt-pkg/deb/dpkgpm.cc:833
#, c-format
@@ -3239,39 +3259,46 @@ msgstr "Klarte ikke skrive logg, openpty() feilet (/dev/pts ikke montert?)\n"
#: apt-pkg/deb/dpkgpm.cc:1070
msgid "Running dpkg"
-msgstr ""
+msgstr "Kjører dpkg"
#: apt-pkg/deb/dpkgpm.cc:1273
msgid "No apport report written because MaxReports is reached already"
-msgstr ""
+msgstr "Ingen apport-rapport skrevet for MaxReports allerede er nådd"
#. check if its not a follow up error
#: apt-pkg/deb/dpkgpm.cc:1278
msgid "dependency problems - leaving unconfigured"
-msgstr ""
+msgstr "avhengighetsproblemer - lar den være uoppsatt"
#: apt-pkg/deb/dpkgpm.cc:1280
msgid ""
"No apport report written because the error message indicates its a followup "
"error from a previous failure."
msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer at den er en "
+"følgefeil fra en tidligere feil."
#: apt-pkg/deb/dpkgpm.cc:1286
msgid ""
"No apport report written because the error message indicates a disk full "
"error"
msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «full disk»-"
+"feil"
#: apt-pkg/deb/dpkgpm.cc:1292
msgid ""
"No apport report written because the error message indicates a out of memory "
"error"
msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «tom for "
+"minne»-feil"
#: apt-pkg/deb/dpkgpm.cc:1299
msgid ""
"No apport report written because the error message indicates a dpkg I/O error"
msgstr ""
+"Ingen apport-rapport skrevet fordi feilmeldingen indikerer en «dpkg I/O»-feil"
#: apt-pkg/deb/debsystem.cc:69
#, c-format
@@ -3279,11 +3306,12 @@ msgid ""
"Unable to lock the administration directory (%s), is another process using "
"it?"
msgstr ""
+"Klarte ikke låse den administrative mappen (%s). Bruker en annen prosess den?"
#: apt-pkg/deb/debsystem.cc:72
-#, fuzzy, c-format
+#, c-format
msgid "Unable to lock the administration directory (%s), are you root?"
-msgstr "Kan ikke lse listemappa"
+msgstr "Klarte ikke låse den administrative mappen (%s). Er du root?"
#. TRANSLATORS: the %s contains the recovery command, usually
#. dpkg --configure -a
@@ -3291,23 +3319,23 @@ msgstr "Kan ikke lse listemappa"
#, c-format
msgid ""
"dpkg was interrupted, you must manually run '%s' to correct the problem. "
-msgstr ""
+msgstr "dpkg ble avbrutt. Du må kjøre «%s» manuelt for å rette problemet,"
#: apt-pkg/deb/debsystem.cc:106
msgid "Not locked"
-msgstr ""
+msgstr "Ikke låst"
#. FIXME: fallback to a default mirror here instead
#. and provide a config option to define that default
#: methods/mirror.cc:200
#, c-format
msgid "No mirror file '%s' found "
-msgstr ""
+msgstr "Ingen speilfil «%s» funnet"
#: methods/mirror.cc:343
#, c-format
msgid "[Mirror: %s]"
-msgstr ""
+msgstr "[Speil: %s]"
#: methods/rred.cc:465
#, c-format
@@ -3315,6 +3343,8 @@ msgid ""
"Could not patch %s with mmap and with file operation usage - the patch seems "
"to be corrupt."
msgstr ""
+"Klarte ikke rette %s med mmap og med filoperasjonbruk - programrettelsen ser "
+"ut til å være korrupt."
#: methods/rred.cc:470
#, c-format
@@ -3322,6 +3352,8 @@ msgid ""
"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
"to be corrupt."
msgstr ""
+"Klarte ikke rette %s med mmap (men ingen mmap-spesifikk feil) - "
+"programrettelsen ser ut til å være korrupt."
#: methods/rsh.cc:329
msgid "Connection closed prematurely"
@@ -3334,13 +3366,13 @@ msgstr "Forbindelsen ble uventet stengt"
#~ msgstr "Feil oppsto under behandling av %s (NewVersion2)"
#~ msgid "Malformed line %u in source list %s (vendor id)"
-#~ msgstr "Feil p %u i kildelista %s (selgers id)"
+#~ msgstr "Feil på %u i kildelista %s (selgers id)"
#~ msgid "Couldn't access keyring: '%s'"
-#~ msgstr "Klarte ikke sl opp i nkkelring; %s"
+#~ msgstr "Klarte ikke å slå opp i nøkkelring; «%s»"
#~ msgid "Could not patch file"
-#~ msgstr "Kunne ikke pne fila %s"
+#~ msgstr "Kunne ikke åpne fila %s"
#~ msgid " %4i %s\n"
#~ msgstr " %4i %s\n"
@@ -3349,7 +3381,7 @@ msgstr "Forbindelsen ble uventet stengt"
#~ msgstr "%4i %s\n"
#~ msgid "Processing triggers for %s"
-#~ msgstr "Behandler utlsere for %s"
+#~ msgstr "Behandler utløsere for %s"
#~ msgid "Dynamic MMap ran out of room"
#~ msgstr "Dynamisk MMap gikk tom for minne"
@@ -3361,7 +3393,7 @@ msgstr "Forbindelsen ble uventet stengt"
#~ msgstr ""
#~ "Ettersom du bare bestilte et enkelt inngrep er det overveiende "
#~ "sannsynlig\n"
-#~ "at pakken helt enkelt ikke kan installeres, og du br fylle ut en "
+#~ "at pakken helt enkelt ikke kan installeres, og du bør fylle ut en "
#~ "feilmelding."
#~ msgid "Line %d too long (max %lu)"
@@ -3400,7 +3432,7 @@ msgstr "Forbindelsen ble uventet stengt"
#~ msgstr "Leser filliste"
#~ msgid "Could not execute "
-#~ msgstr "Fr ikke lst %s"
+#~ msgstr "Får ikke låst %s"
#~ msgid "Unknown vendor ID '%s' in line %u of source list %s"
-#~ msgstr "Ukjent selger ID %s i linje %u i kildelista %s"
+#~ msgstr "Ukjent selger ID «%s» i linje %u i kildelista %s"
diff --git a/share/apt-auth-failure.note b/share/apt-auth-failure.note
new file mode 100644
index 000000000..3e8a9e71d
--- /dev/null
+++ b/share/apt-auth-failure.note
@@ -0,0 +1,11 @@
+_Name: Apt Authentication issue
+Priority: High
+Terminal: False
+Command: gksu -- synaptic --non-interactive --update-at-startup --hide-main-window
+GettextDomain: apt
+_Description: Problem during package list update.
+ The package list update failed with a authentication failure.
+ This usually happens behind a network proxy server. Please try
+ to click on the "Run this action now" button to correct the problem or
+ update the list manually by running Update Manager and clicking
+ on "Check".
diff --git a/share/ubuntu-archive.gpg b/share/ubuntu-archive.gpg
new file mode 100644
index 000000000..2ce60d454
--- /dev/null
+++ b/share/ubuntu-archive.gpg
Binary files differ
diff --git a/test/integration/framework b/test/integration/framework
index d832bedbe..8a5973d4b 100644
--- a/test/integration/framework
+++ b/test/integration/framework
@@ -72,6 +72,7 @@ aptconfig() { runapt apt-config $*; }
aptcache() { runapt apt-cache $*; }
aptget() { runapt apt-get $*; }
aptftparchive() { runapt apt-ftparchive $*; }
+aptkey() { runapt apt-key $*; }
dpkg() {
$(which dpkg) --root=${TMPWORKINGDIRECTORY}/rootdir --force-not-root --force-bad-path --log=${TMPWORKINGDIRECTORY}/rootdir/var/log/dpkg.log $*
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-14 01:22:18 +0000