merged from the mvo branch (and contains all non-abi break changes from donkult)

.bzrignore

@@ -9,7 +9,8 @@ autom4te.cache/
 build/
 configure
 
-# generated apt man pages
+# generated files in the progress to build all
+# apt man pages and other documentation
 doc/*.1
 doc/*.5
 doc/*.8
@@ -17,15 +18,5 @@ doc/*/*.1
 doc/*/*.5
 doc/*/*.8
 doc/*/apt.ent
-
-# ignore xml man page files generated by po4a
-# older translation methods translate in this files
-# so we can not ignore it for all translations now
-doc/ja/*.xml
-doc/fr/*.xml
-
-# FIXME: files generated by deprecated sgml man pages
-doc/es/manpage.links
-doc/es/manpage.refs
-doc/pt_BR/manpage.links
-doc/pt_BR/manpage.refs
+doc/*/*.xml
+doc/*/*.sgml

apt-inst/makefile

@@ -11,8 +11,7 @@ include ../buildlib/defaults.mak
 
 # The library name
 LIBRARY=apt-inst
-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=1.1
+MAJOR=1.2
 MINOR=0
 SLIBS=$(PTHREADLIB) -lapt-pkg
 APT_DOMAIN:=libapt-inst$(MAJOR)

apt-pkg/contrib/strutl.h

@@ -68,15 +68,15 @@ int tolower_ascii(int c);
 #define APT_MKSTRCMP(name,func) \
 inline int name(const char *A,const char *B) {return func(A,A+strlen(A),B,B+strlen(B));}; \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(string A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
-inline int name(string A,string B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
-inline int name(string A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);}; 
+inline int name(const string& A,const char *B) {return func(A.c_str(),A.c_str()+A.length(),B,B+strlen(B));}; \
+inline int name(const string& A,const string& B) {return func(A.c_str(),A.c_str()+A.length(),B.c_str(),B.c_str()+B.length());}; \
+inline int name(const string& A,const char *B,const char *BEnd) {return func(A.c_str(),A.c_str()+A.length(),B,BEnd);};
 
 #define APT_MKSTRCMP2(name,func) \
 inline int name(const char *A,const char *AEnd,const char *B) {return func(A,AEnd,B,B+strlen(B));}; \
-inline int name(string A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
-inline int name(string A,string B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
-inline int name(string A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);}; 
+inline int name(const string& A,const char *B) {return func(A.begin(),A.end(),B,B+strlen(B));}; \
+inline int name(const string& A,const string& B) {return func(A.begin(),A.end(),B.begin(),B.end());}; \
+inline int name(const string& A,const char *B,const char *BEnd) {return func(A.begin(),A.end(),B,BEnd);};
 
 int stringcmp(const char *A,const char *AEnd,const char *B,const char *BEnd);
 int stringcasecmp(const char *A,const char *AEnd,const char *B,const char *BEnd);

apt-pkg/deb/debsrcrecords.cc

@@ -135,9 +135,15 @@ bool debSrcRecordParser::Files(vector<pkgSrcRecords::File> &List)
 	 string::size_type Tmp = F.Path.rfind('.',Pos);
 	 if (Tmp == string::npos)
 	    break;
+	 if (F.Type == "tar") {
+	    // source v3 has extension 'debian.tar.*' instead of 'diff.*'
+	    if (string(F.Path, Tmp+1, Pos-Tmp) == "debian")
+	       F.Type = "diff";
+	    break;
+	 }
 	 F.Type = string(F.Path,Tmp+1,Pos-Tmp);
 	 
-	 if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma")
+	 if (F.Type == "gz" || F.Type == "bz2" || F.Type == "lzma" || F.Type == "tar")
 	 {
 	    Pos = Tmp-1;
 	    continue;

apt-pkg/init.h

@@ -16,10 +16,14 @@
 #include <apt-pkg/configuration.h>
 #include <apt-pkg/pkgsystem.h>
 
-// See the makefile
+// These lines are extracted by the makefiles and the buildsystem
+// Increasing MAJOR or MINOR results in the need of recompiling all
+// 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_MINOR 8
-#define APT_PKG_RELEASE 1
+#define APT_PKG_RELEASE 0
     
 extern const char *pkgVersion;
 extern const char *pkgLibVersion;

apt-pkg/makefile

@@ -9,14 +9,13 @@ HEADER_TARGETDIRS = apt-pkg
 # Bring in the default rules
 include ../buildlib/defaults.mak
 
-# The library name, don't forget to update init.h and the copy in 
-# methods/makefile - FIXME
+# The library name and version (indirectly used from init.h)
+include ../buildlib/libversion.mak
 LIBRARY=apt-pkg
-LIBEXT=$(GLIBC_VER)$(LIBSTDCPP_VER)
-MAJOR=4.8
-MINOR=1
+MAJOR=$(LIBAPTPKG_MAJOR)
+MINOR=$(LIBAPTPKG_RELEASE)
 SLIBS=$(PTHREADLIB) $(INTLLIBS) -lutil -ldl
-APT_DOMAIN:=libapt-pkg$(MAJOR)
+APT_DOMAIN:=libapt-pkg$(LIBAPTPKG_MAJOR)
 
 # Source code for the contributed non-core things
 SOURCE = contrib/mmap.cc contrib/error.cc contrib/strutl.cc \

apt-pkg/packagemanager.cc

@@ -143,10 +143,6 @@ void pkgPackageManager::ImmediateAdd(PkgIterator I, bool UseInstallVer, unsigned
    for ( /* nothing */  ; D.end() == false; D++)
       if (D->Type == pkgCache::Dep::Depends || D->Type == pkgCache::Dep::PreDepends)
       {
-	 // ignore dependencies if no instal/upgrade/remove is going to happen
-	 if (D.TargetPkg() == 0 || Cache[D.TargetPkg()].Keep())
-	      continue;
-
 	 if(!List->IsFlag(D.TargetPkg(), pkgOrderList::Immediate))
 	 {
 	    if(Debug)
@@ -325,8 +321,9 @@ bool pkgPackageManager::SmartConfigure(PkgIterator Pkg)
 
    // Sanity Check
    if (List->IsFlag(Pkg,pkgOrderList::Configured) == false)
-      return _error->Error("Internal error, could not immediate configure %s",Pkg.Name());
-   
+      return _error->Error(_("Could not perform immediate configuration on '%s'."
+			"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),1);
+
    return true;
 }
 									/*}}}*/
@@ -478,7 +475,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
       List->Flag(Pkg,pkgOrderList::UnPacked,pkgOrderList::States);
       if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
 	 if (SmartConfigure(Pkg) == false)
-	    return _error->Error("Internal Error, Could not perform immediate configuration (1) on %s",Pkg.Name());
+	    return _error->Error(_("Could not perform immediate configuration on already unpacked '%s'."
+			"Please see man 5 apt.conf under APT::Immediate-Configure for details."),Pkg.Name());
       return true;
    }
 
@@ -585,7 +583,8 @@ bool pkgPackageManager::SmartUnPack(PkgIterator Pkg)
    // Perform immedate configuration of the package.
    if (List->IsFlag(Pkg,pkgOrderList::Immediate) == true)
       if (SmartConfigure(Pkg) == false)
-	 return _error->Error("Internal Error, Could not perform immediate configuration (2) on %s",Pkg.Name());
+	 return _error->Error(_("Could not perform immediate configuration on '%s'."
+			"Please see man 5 apt.conf under APT::Immediate-Configure for details. (%d)"),Pkg.Name(),2);
    
    return true;
 }

buildlib/config.h.in

@@ -22,6 +22,7 @@
 /* These two are used by the statvfs shim for glibc2.0 and bsd */
 /* Define if we have sys/vfs.h */
 #undef HAVE_VFS_H
+#undef HAVE_STRUCT_STATFS_F_TYPE
 
 /* Define if we have sys/mount.h */
 #undef HAVE_MOUNT_H

buildlib/configure.mak

@@ -15,7 +15,13 @@ BUILDDIR=build
 .PHONY: startup
 startup: configure $(BUILDDIR)/config.status $(addprefix $(BUILDDIR)/,$(CONVERTED))
 
-configure: aclocal.m4 configure.in
+# use the files provided from the system instead of carry around
+# and use (most of the time outdated) copycats
+buildlib/config.sub:
+	ln -sf /usr/share/misc/config.sub buildlib/config.sub
+buildlib/config.guess:
+	ln -sf /usr/share/misc/config.guess buildlib/config.guess	
+configure: aclocal.m4 configure.in buildlib/config.guess buildlib/config.sub
 	autoconf
 
 aclocal.m4: $(wildcard buildlib/*.m4)

buildlib/defaults.mak

@@ -81,10 +81,7 @@ MANPAGE_H = $(BASE)/buildlib/manpage.mak
 PROGRAM_H = $(BASE)/buildlib/program.mak
 PYTHON_H = $(BASE)/buildlib/python.mak
 COPY_H = $(BASE)/buildlib/copy.mak
-YODL_MANPAGE_H = $(BASE)/buildlib/yodl_manpage.mak
-SGML_MANPAGE_H = $(BASE)/buildlib/sgml_manpage.mak
 PO4A_MANPAGE_H = $(BASE)/buildlib/po4a_manpage.mak
-XML_MANPAGE_H = $(BASE)/buildlib/xml_manpage.mak
 FAIL_H = $(BASE)/buildlib/fail.mak
 PODOMAIN_H = $(BASE)/buildlib/podomain.mak
 

buildlib/environment.mak.in

@@ -9,8 +9,6 @@ CPPFLAGS+= @CPPFLAGS@ @DEFS@ -D_REENTRANT -Wall
 CXX = @CXX@
 CXXFLAGS+= @CXXFLAGS@
 NUM_PROCS = @NUM_PROCS@
-GLIBC_VER = @GLIBC_VER@
-LIBSTDCPP_VER = @LIBSTDCPP_VER@
 
 # Linker stuff
 PICFLAGS+= -fPIC -DPIC
@@ -30,13 +28,7 @@ DEBIANDOC_TEXT = @DEBIANDOC_TEXT@
 
 DOXYGEN = @DOXYGEN@
 
-# SGML for the man pages
-DOCBOOK2MAN := @DOCBOOK2MAN@
-
-# XML for the man pages
-XMLTO := @XMLTO@
-
-# po4a for the man pages
+# xsltproc for the man pages
 XSLTPROC := @XSLTPROC@
 
 # po4a for the man pages

buildlib/library.mak

@@ -5,7 +5,7 @@
 # Input
 # $(SOURCE) - The source code to use
 # $(HEADERS) - Exported header files and private header files
-# $(LIBRARY) - The name of the library without lib or .so 
+# $(LIBRARY) - The name of the library without lib or .so
 # $(MAJOR) - The major version number of this library
 # $(MINOR) - The minor version number of this library
 # $(APT_DOMAIN) - The text domain for this library
@@ -16,11 +16,11 @@
 # See defaults.mak for information about LOCAL
 
 # Some local definitions
-LOCAL := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
+LOCAL := lib$(LIBRARY).so.$(MAJOR).$(MINOR)
 $(LOCAL)-OBJS := $(addprefix $(OBJ)/,$(addsuffix .opic,$(notdir $(basename $(SOURCE)))))
 $(LOCAL)-DEP := $(addprefix $(DEP)/,$(addsuffix .opic.d,$(notdir $(basename $(SOURCE)))))
 $(LOCAL)-HEADERS := $(addprefix $(INCLUDE)/,$(HEADERS))
-$(LOCAL)-SONAME := lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
+$(LOCAL)-SONAME := lib$(LIBRARY).so.$(MAJOR)
 $(LOCAL)-SLIBS := $(SLIBS)
 $(LOCAL)-LIBRARY := $(LIBRARY)
 
@@ -29,7 +29,7 @@ include $(PODOMAIN_H)
 
 # Install the command hooks
 headers: $($(LOCAL)-HEADERS)
-library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR)
+library: $(LIB)/lib$(LIBRARY).so $(LIB)/lib$(LIBRARY).so.$(MAJOR)
 clean: clean/$(LOCAL)
 veryclean: veryclean/$(LOCAL)
 
@@ -44,14 +44,14 @@ veryclean/$(LOCAL): clean/$(LOCAL)
 	-rm -f $($(@F)-HEADERS) $(LIB)/lib$($(@F)-LIBRARY)*.so*
 
 # Build rules for the two symlinks
-.PHONY: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
-$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR): $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
+.PHONY: $(LIB)/lib$(LIBRARY).so.$(MAJOR) $(LIB)/lib$(LIBRARY).so
+$(LIB)/lib$(LIBRARY).so.$(MAJOR): $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
 	ln -sf $(<F) $@
-$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR)
+$(LIB)/lib$(LIBRARY).so: $(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR)
 	ln -sf $(<F) $@
 
 # The binary build rule
-$(LIB)/lib$(LIBRARY)$(LIBEXT).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
+$(LIB)/lib$(LIBRARY).so.$(MAJOR).$(MINOR): $($(LOCAL)-HEADERS) $($(LOCAL)-OBJS)
 	-rm -f $(LIB)/lib$($(@F)-LIBRARY)*.so* 2> /dev/null
 	echo Building shared library $@
 	$(CXX) $(CXXFLAGS) $(LDFLAGS) $(PICFLAGS) $(LFLAGS) $(LFLAGS_SO)\

buildlib/libversion.mak

@@ -0,0 +1,14 @@
+# -*- make -*-
+# Version number of libapt-pkg.
+# Please increase MAJOR with each ABI break,
+# with each non-ABI break to the lib, please increase RELEASE.
+# The versionnumber is extracted from apt-pkg/init.h - see also there.
+LIBAPTPKG_MAJOR=$(shell awk -v ORS='.' '/^\#define APT_PKG_M/ {print $$3}' $(BASE)/apt-pkg/init.h | sed 's/\.$$//')
+LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/init.h | cut -d ' ' -f 3)
+
+# Version number of libapt-inst
+# Please increase MAJOR with each ABI break,
+# with each non-ABI break to the lib, please increase MINOR.
+# The versionnumber is extracted from apt-inst/makefile - see also there.
+LIBAPTINST_MAJOR=$(shell egrep '^MAJOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)
+LIBAPTINST_MINOR=$(shell egrep '^MINOR=' $(BASE)/apt-inst/makefile |cut -d '=' -f 2)

buildlib/po4a_manpage.mak

@@ -28,19 +28,21 @@ veryclean: veryclean/$(LOCAL)
 $($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
 	echo Creating man page $@
 	$(XSLTPROC) -o $@ $(STYLESHEET) $< # why xsltproc doesn't respect the -o flag here???
+	test -f $(subst .$(LC),,$@) || echo FIXME: xsltproc respect the -o flag now, workaround can be removed
 	mv -f $(subst .$(LC),,$@) $@
 
 # Clean rule
 .PHONY: veryclean/$(LOCAL)
 veryclean/$(LOCAL):
 	-rm -rf $($(@F)-LIST) apt.ent apt.$(LC).8 \
-		$(addsuffix .xml,$($(@F)-LIST))
+		$(addsuffix .xml,$($(@F)-LIST)) \
+		offline.$(LC).sgml guide.$(LC).sgml
 
 HAVE_PO4A=yes
 endif
 
 # take care of the rest
-SOURCE := $(SOURCE) apt.$(LC).8
+SOURCE := $(SOURCE) $(wildcard apt.$(LC).8)
 INCLUDES :=
 
 ifndef HAVE_PO4A
@@ -52,3 +54,8 @@ endif
 ifneq ($(words $(SOURCE)),0)
 include $(MANPAGE_H)
 endif
+
+# Debian Doc SGML Documents
+SOURCE := $(wildcard *.$(LC).sgml)
+DEBIANDOC_HTML_OPTIONS=-l $(LC)
+include $(DEBIANDOC_H)

buildlib/sgml_manpage.mak

@@ -1,45 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in DocBook SGMLL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the sgml files are called apt-cache.8.sgml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef DOCBOOK2MAN
-
-LOCAL := sgml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.sgml $(INCLUDES)
-	echo Creating man page $@
-	$(DOCBOOK2MAN) $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-HAVE_SGML=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_SGML
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif

buildlib/tools.m4

@@ -89,56 +89,6 @@ AC_DEFUN(ah_NUM_PROCS,
 	AC_SUBST(NUM_PROCS)
 ])
 
-AC_DEFUN(rc_GLIBC_VER,
-	[AC_MSG_CHECKING([glibc version])
-	AC_CACHE_VAL(ac_cv_glibc_ver,
-	dummy=if$$
-	cat <<_GLIBC_>$dummy.c
-#include <features.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) { printf("libc6.%d",__GLIBC_MINOR__); exit(0); }
-_GLIBC_
-	${CC-cc} $dummy.c -o $dummy > /dev/null 2>&1
-	if test "$?" = 0; then
-		GLIBC_VER=`./$dummy`
-		AC_MSG_RESULT([$GLIBC_VER])
-		ac_cv_glibc_ver=$GLIBC_VER
-	else
-		AC_MSG_WARN([cannot determine GNU C library minor version number])
-	fi
-	rm -f $dummy $dummy.c
-	)
-	GLIBC_VER="-$ac_cv_glibc_ver"
-	AC_SUBST(GLIBC_VER)
-])
-
-AC_DEFUN(rc_LIBSTDCPP_VER,
-	[AC_MSG_CHECKING([libstdc++ version])
-	dummy=if$$
-	cat <<_LIBSTDCPP_>$dummy.cc
-#include <features.h>
-#include <stdio.h>
-#include <stdlib.h>
-int main(int argc, char **argv) { exit(0); }
-_LIBSTDCPP_
-	${CXX-c++} $dummy.cc -o $dummy > /dev/null 2>&1
-
-	if test "$?" = 0; then
-		soname=`objdump -p ./$dummy |grep NEEDED|grep libstd`
-                LIBSTDCPP_VER=`echo $soname | sed -e 's/.*NEEDED.*libstdc++\(-libc.*\(-.*\)\)\?.so.\(.*\)/\3\2/'`
-	fi
-	rm -f $dummy $dummy.cc
-
-	if test -z "$LIBSTDCPP_VER"; then
-		AC_MSG_WARN([cannot determine standard C++ library version number])
-	else
-		AC_MSG_RESULT([$LIBSTDCPP_VER])
-		LIBSTDCPP_VER="-$LIBSTDCPP_VER"
-	fi
-	AC_SUBST(LIBSTDCPP_VER)
-])
-
 AC_DEFUN(ah_GCC3DEP,[
 	AC_MSG_CHECKING(if $CXX -MD works)
 	touch gcc3dep.cc

buildlib/xml_manpage.mak

@@ -1,45 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in DocBook XML format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means xmlto is only needed if compiling from Arch
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the XML files are called apt-cache.8.xml
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef XMLTO
-
-LOCAL := xml-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
-	echo Creating man page $@
-	$(XMLTO) man $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-HAVE_XMLTO=yes
-endif
-
-INCLUDES :=
-
-ifndef HAVE_XMLTO
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif

buildlib/yodl_manpage.mak

@@ -1,42 +0,0 @@
-# -*- make -*-
-
-# This handles man pages in YODL format. We convert to the respective
-# output in the source directory then copy over to the final dest. This
-# means yodl is only needed if compiling from CVS
-
-# Input
-# $(SOURCE) - The documents to use, in the form foo.sect, ie apt-cache.8
-#             the yodl files are called apt-cache.8.yo
-
-# See defaults.mak for information about LOCAL
-
-# Some local definitions
-ifdef YODL_MAN
-
-LOCAL := yodl-manpage-$(firstword $(SOURCE))
-$(LOCAL)-LIST := $(SOURCE)
-
-# Install generation hooks
-doc: $($(LOCAL)-LIST)
-veryclean: veryclean/$(LOCAL)
-
-$($(LOCAL)-LIST) :: % : %.yo
-	echo Creating man page $@
-	yodl2man -o $@ $<
-
-# Clean rule
-.PHONY: veryclean/$(LOCAL)
-veryclean/$(LOCAL):
-	-rm -rf $($(@F)-LIST)
-
-else
-
-# Strip from the source list any man pages we dont have compiled already
-SOURCE := $(wildcard $(SOURCE))
-
-endif
-
-# Chain to the manpage rule
-ifneq ($(words $(SOURCE)),0)
-include $(MANPAGE_H)
-endif

cmdline/apt-get.cc

@@ -862,10 +862,14 @@ bool InstallPackages(CacheFile &Cache,bool ShwKept,bool Ask = true,
    {
       struct statvfs Buf;
       string OutputDir = _config->FindDir("Dir::Cache::Archives");
-      if (statvfs(OutputDir.c_str(),&Buf) != 0)
-	 return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-			      OutputDir.c_str());
-      if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+      if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+	 if (errno == EOVERFLOW)
+	    return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
+				 OutputDir.c_str());
+	 else
+	    return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
+				 OutputDir.c_str());
+      } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
       {
          struct statfs Stat;
          if (statfs(OutputDir.c_str(),&Stat) != 0
@@ -1243,136 +1247,142 @@ pkgSrcRecords::Parser *FindSrc(const char *Name,pkgRecords &Recs,
 			       pkgSrcRecords &SrcRecs,string &Src,
 			       pkgDepCache &Cache)
 {
-   // We want to pull the version off the package specification..
    string VerTag;
-   string DefRel;
+   string DefRel = _config->Find("APT::Default-Release");
    string TmpSrc = Name;
-   const size_t found = TmpSrc.find_last_of("/=");
 
-   // honor default release
-   if (found != string::npos && TmpSrc[found] == '/')
-   {
-      DefRel = TmpSrc.substr(found+1);
+   // extract the version/release from the pkgname
+   const size_t found = TmpSrc.find_last_of("/=");
+   if (found != string::npos) {
+      if (TmpSrc[found] == '/')
+	 DefRel = TmpSrc.substr(found+1);
+      else
+	 VerTag = TmpSrc.substr(found+1);
       TmpSrc = TmpSrc.substr(0,found);
    }
-   else
-      DefRel = _config->Find("APT::Default-Release");
 
-   pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
-
-   if (found != string::npos && TmpSrc[found] == '=')
+   /* Lookup the version of the package we would install if we were to
+      install a version and determine the source package name, then look
+      in the archive for a source package of the same name. */
+   bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
+   const pkgCache::PkgIterator Pkg = Cache.FindPkg(TmpSrc);
+   if (MatchSrcOnly == false && Pkg.end() == false) 
    {
-      VerTag = TmpSrc.substr(found+1);
-      TmpSrc = TmpSrc.substr(0,found);
-   } 
-   else  if(!Pkg.end() && DefRel.empty() == false)
-   {
-      // we have a default release, try to locate the pkg. we do it like
-      // this because GetCandidateVer() will not "downgrade", that means
-      // "apt-get source -t stable apt" won't work on a unstable system
-      for (pkgCache::VerIterator Ver = Pkg.VersionList(); Ver.end() == false; 
-	   Ver++)
+      if(VerTag.empty() == false || DefRel.empty() == false) 
       {
-	 for (pkgCache::VerFileIterator VF = Ver.FileList(); VF.end() == false;
-	      VF++)
+	 // we have a default release, try to locate the pkg. we do it like
+	 // this because GetCandidateVer() will not "downgrade", that means
+	 // "apt-get source -t stable apt" won't work on a unstable system
+	 for (pkgCache::VerIterator Ver = Pkg.VersionList();
+	      Ver.end() == false; Ver++) 
 	 {
-	    /* If this is the status file, and the current version is not the
-	       version in the status file (ie it is not installed, or somesuch)
-	       then it is not a candidate for installation, ever. This weeds
-	       out bogus entries that may be due to config-file states, or
-	       other. */
-	    if ((VF.File()->Flags & pkgCache::Flag::NotSource) == 
-		pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
-	    continue;
-	    
-	    if((VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
-		(VF.File().Codename() != 0 && VF.File().Codename() == DefRel))
+	    for (pkgCache::VerFileIterator VF = Ver.FileList();
+		 VF.end() == false; VF++) 
 	    {
-	       pkgRecords::Parser &Parse = Recs.Lookup(VF);
-	       VerTag = Parse.SourceVer();
-	       if (VerTag.empty())
-		  VerTag = Ver.VerStr();
-	       break;
+	       /* If this is the status file, and the current version is not the
+		  version in the status file (ie it is not installed, or somesuch)
+		  then it is not a candidate for installation, ever. This weeds
+		  out bogus entries that may be due to config-file states, or
+		  other. */
+	       if ((VF.File()->Flags & pkgCache::Flag::NotSource) ==
+		   pkgCache::Flag::NotSource && Pkg.CurrentVer() != Ver)
+		  continue;
+
+	       // We match against a concrete version (or a part of this version)
+	       if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.VerStr(), VerTag.size()) != 0)
+		  continue;
+
+	       // or we match against a release
+	       if(VerTag.empty() == false ||
+		  (VF.File().Archive() != 0 && VF.File().Archive() == DefRel) ||
+		  (VF.File().Codename() != 0 && VF.File().Codename() == DefRel)) 
+	       {
+		  pkgRecords::Parser &Parse = Recs.Lookup(VF);
+		  Src = Parse.SourcePkg();
+		  if (VerTag.empty() == true)
+		     VerTag = Parse.SourceVer();
+		  break;
+	       }
 	    }
 	 }
+	 if (Src.empty() == true) 
+	 {
+	    if (VerTag.empty() == false)
+	       _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+	    else
+	       _error->Warning(_("Ignore unavailable target release '%s' of package '%s'"), DefRel.c_str(), TmpSrc.c_str());
+	    VerTag.clear();
+	    DefRel.clear();
+	 }
       }
-   }
-
-   /* Lookup the version of the package we would install if we were to
-      install a version and determine the source package name, then look
-      in the archive for a source package of the same name. */
-   bool MatchSrcOnly = _config->FindB("APT::Get::Only-Source");
-   if (MatchSrcOnly == false)
-   {
-      if (Pkg.end() == false)
+      if (VerTag.empty() == true && DefRel.empty() == true) 
       {
+	 // if we don't have a version or default release, use the CandidateVer to find the Source
 	 pkgCache::VerIterator Ver = Cache.GetCandidateVer(Pkg);
-	 if (Ver.end() == false)
+	 if (Ver.end() == false) 
 	 {
 	    pkgRecords::Parser &Parse = Recs.Lookup(Ver.FileList());
 	    Src = Parse.SourcePkg();
+	    VerTag = Parse.SourceVer();
 	 }
-      }   
+      }
+   }
+
+   if (Src.empty() == true)
+      Src = TmpSrc;
+   else 
+   {
+      /* if we have a source pkg name, make sure to only search
+	 for srcpkg names, otherwise apt gets confused if there
+	 is a binary package "pkg1" and a source package "pkg1"
+	 with the same name but that comes from different packages */
+      MatchSrcOnly = true;
+      if (Src != TmpSrc) 
+      {
+	 ioprintf(c1out, _("Picking '%s' as source package instead of '%s'\n"), Src.c_str(), TmpSrc.c_str());
+      }
    }
 
    // The best hit
    pkgSrcRecords::Parser *Last = 0;
    unsigned long Offset = 0;
    string Version;
-   bool IsMatch = false;
 
-   // No source package name..
-   if (Src.empty() == true)
-      Src = TmpSrc;
-   else 
-      // if we have a source pkg name, make sure to only search
-      // for srcpkg names, otherwise apt gets confused if there
-      // is a binary package "pkg1" and a source package "pkg1"
-      // with the same name but that comes from different packages
-      MatchSrcOnly = true;
-   
-   // If we are matching by version then we need exact matches to be happy
-   if (VerTag.empty() == false)
-      IsMatch = true;
-   
    /* Iterate over all of the hits, which includes the resulting
       binary packages in the search */
    pkgSrcRecords::Parser *Parse;
-   SrcRecs.Restart();
-   while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0)
+   while (true) 
    {
-      string Ver = Parse->Version();
-
-      // show name mismatches
-      if (IsMatch == true && Parse->Package() != Src)       
-	 ioprintf(c1out,  _("No source package '%s' picking '%s' instead\n"), Src.c_str(), Parse->Package().c_str());
-      
-      if (VerTag.empty() == false)
+      SrcRecs.Restart();
+      while ((Parse = SrcRecs.Find(Src.c_str(), MatchSrcOnly)) != 0) 
       {
-	 /* Don't want to fall through because we are doing exact version 
-	    matching. */
-	 if (Cache.VS().CmpVersion(VerTag,Ver) != 0)
+	 const string Ver = Parse->Version();
+
+	 // Ignore all versions which doesn't fit
+	 if (VerTag.empty() == false && strncmp(VerTag.c_str(), Ver.c_str(), VerTag.size()) != 0)
 	    continue;
-	 
-	 Last = Parse;
-	 Offset = Parse->Offset();
-	 break;
+
+	 // Newer version or an exact match? Save the hit
+	 if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0) {
+	    Last = Parse;
+	    Offset = Parse->Offset();
+	    Version = Ver;
+	 }
+
+	 // was the version check above an exact match? If so, we don't need to look further
+	 if (VerTag.empty() == false && VerTag.size() == Ver.size())
+	    break;
       }
-				  
-      // Newer version or an exact match
-      if (Last == 0 || Cache.VS().CmpVersion(Version,Ver) < 0 || 
-	  (Parse->Package() == Src && IsMatch == false))
-      {
-	 IsMatch = Parse->Package() == Src;
-	 Last = Parse;
-	 Offset = Parse->Offset();
-	 Version = Ver;
-      }      
+      if (Last != 0 || VerTag.empty() == true)
+	 break;
+      //if (VerTag.empty() == false && Last == 0)
+      _error->Warning(_("Ignore unavailable version '%s' of package '%s'"), VerTag.c_str(), TmpSrc.c_str());
+      VerTag.clear();
    }
-   
+
    if (Last == 0 || Last->Jump(Offset) == false)
       return 0;
-   
+
    return Last;
 }
 									/*}}}*/
@@ -2234,10 +2244,14 @@ bool DoSource(CommandLine &CmdL)
    // Check for enough free space
    struct statvfs Buf;
    string OutputDir = ".";
-   if (statvfs(OutputDir.c_str(),&Buf) != 0)
-      return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
-			   OutputDir.c_str());
-   if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
+   if (statvfs(OutputDir.c_str(),&Buf) != 0) {
+      if (errno == EOVERFLOW)
+	 return _error->WarningE("statvfs",_("Couldn't determine free space in %s"),
+				OutputDir.c_str());
+      else
+	 return _error->Errno("statvfs",_("Couldn't determine free space in %s"),
+				OutputDir.c_str());
+   } else if (unsigned(Buf.f_bfree) < (FetchBytes - FetchPBytes)/Buf.f_bsize)
      {
        struct statfs Stat;
        if (statfs(OutputDir.c_str(),&Stat) != 0
@@ -2797,6 +2811,7 @@ int main(int argc,const char *argv[])					/*{{{*/
       {0,"force-yes","APT::Get::force-yes",0},
       {0,"print-uris","APT::Get::Print-URIs",0},
       {0,"diff-only","APT::Get::Diff-Only",0},
+      {0,"debian-only","APT::Get::Diff-Only",0},
       {0,"tar-only","APT::Get::Tar-Only",0},
       {0,"dsc-only","APT::Get::Dsc-Only",0},
       {0,"purge","APT::Get::Purge",0},

cmdline/apt-mark

@@ -2,13 +2,14 @@
 
 from optparse import OptionParser
 
+import sys
+import os.path
+    
 try:
     import apt_pkg
 except ImportError:
     print "Error importing apt_pkg, is python-apt installed?"
-    
-import sys
-import os.path
+    sys.exit(1)
     
 actions = { "markauto" : 1,
             "unmarkauto": 0
@@ -31,8 +32,12 @@ def mark_unmark_automatic(filename, action, pkgs):
     " mark or unmark automatic flag"
     # open the statefile
     if os.path.exists(STATE_FILE):
-        tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
-        outfile = open(STATE_FILE+".tmp","w")
+        try:
+            tagfile = apt_pkg.ParseTagFile(open(STATE_FILE))
+            outfile = open(STATE_FILE+".tmp","w")
+        except IOError, msg:
+            print "%s, are you root?" % (msg)
+            sys.exit(1)
         while tagfile.Step():
             pkgname = tagfile.Section.get("Package")
             autoInst = tagfile.Section.get("Auto-Installed")

configure.in

@@ -184,12 +184,6 @@ AC_PATH_PROG(DEBIANDOC_TEXT,debiandoc2text)
 dnl Check for doxygen
 AC_PATH_PROG(DOXYGEN, doxygen)
 
-dnl Check for the SGML tools needed to build man pages
-AC_PATH_PROG(DOCBOOK2MAN,docbook2man)
-
-dnl Check for the XML tools needed to build man pages
-AC_PATH_PROG(XMLTO,xmlto)
-
 dnl Check for the XSLTProc tool needed to build man pages together with po4a
 AC_PATH_PROG(XSLTPROC,xsltproc)
 
@@ -202,12 +196,7 @@ AC_PATH_PROG([DOT], [dot], [])
 DOTDIR=$(dirname $DOT)
 AC_SUBST(DOTDIR)
 
-dnl Check for YODL
-dnl AC_CHECK_PROG(YODL_MAN,yodl2man,"yes","")
-
 ah_NUM_PROCS
-rc_GLIBC_VER
-rc_LIBSTDCPP_VER
 ah_GCC3DEP
 
 dnl It used to be that the user could select translations and that could get

debian/NEWS

@@ -1,6 +1,6 @@
 apt (0.7.24) unstable; urgency=low
 
-  * Allready included in the last version but now with better documentation
+  * Already included in the last version but now with better documentation
     is the possibility to add/prefer different compression types while
     downloading archive informations, which can decrease the time needed for
     update on slow machines. See apt.conf (5) manpage for details.

debian/changelog

@@ -23,9 +23,6 @@ apt (0.7.25) UNRELEASED; urgency=low
     Closes: #559277
   
   [ Michael Vogt ]
-  * apt-pkg/packagemanager.cc:
-    - fix overly aggressive immediate config propergation
-      (thanks to David Kalnischkies)
   * apt-pkg/packagemanager.cc:
     - add output about pre-depends configuring when debug::pkgPackageManager
       is used
@@ -35,7 +32,8 @@ apt (0.7.25) UNRELEASED; urgency=low
   * 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.
+    in a machine definition). Based on the maemo git branch (Closes: #518473)
+    (thanks also to Jussi Hakala and Julian Andres Klode)
   * apt-pkg/deb/dpkgpm.cc:
     - add "purge" to list of known actions
 
@@ -48,6 +46,61 @@ apt (0.7.25) UNRELEASED; urgency=low
     - Emit a warning if removed keys keyring is missing and skip associated
       checks (LP: #218971)
 
+  [ David Kalnischkies ]
+  * apt-pkg/packagemanager.cc:
+    - better debug output for ImmediateAdd with depth and why
+    - improve the message shown for failing immediate configuration
+  * doc/guide.it.sgml: moved to doc/it/guide.it.sgml
+  * doc/po4a.conf: activate translation of guide.sgml and offline.sgml
+  * doc/apt.conf.5.xml:
+    - provide a few more details about APT::Immediate-Configure
+  * doc/sources.list.5.xml:
+    - add note about additional apt-transport-methods
+  * doc/apt-mark.8.xml:
+    - correct showauto synopsis, thanks Andrew Schulman (Closes: #551440)
+  * cmdline/apt-get.cc:
+    - source should displays his final pkg pick (Closes: #249383, #550952)
+    - source doesn't need the complete version for match (Closes: #245250)
+    - source ignores versions/releases if not available (Closes: #377424)
+    - only warn if (free) space overflows (Closes: #522238)
+    - add --debian-only as alias for --diff-only
+  * methods/connect.cc:
+    - display also strerror of "wicked" getaddrinfo errors
+  * buildlib/configure.mak, buildlib/config.{sub,guess}:
+    - remove (outdated) config.{sub,guess} and use the ones provided
+      by the new added build-dependency autotools-dev instead
+  * configure.in, buildlib/{xml,yodl,sgml}_manpage.mak:
+    - remove the now obsolete manpage buildsystems
+  * doc/{pl,pt_BR,es,it}/*.{sgml,xml}:
+    - convert all remaining translation to the po4a system
+  * debian/control:
+    - drop build-dependency on docbook-utils and xmlto
+    - add build-dependency on autotools-dev
+    - bump policy to 3.8.3 as we have no outdated manpages anymore
+  * debian/NEWS:
+    - fix a typo in 0.7.24: Allready -> Already (Closes: #557674)
+  * cmdline/apt-mark:
+    - print an error if a new state file can't be created,
+      thanks Carl Chenet! (Closes: #521289)
+    - print an error and exit if python-apt is not installed,
+      thanks Carl Chenet! (Closes: #521284)
+  * ftparchive/writer.{cc,h}:
+    - add APT::FTPArchive::LongDescription to be able to disable them
+  * apt-pkg/deb/debsrcrecords.cc:
+    - use "diff" filetype for .debian.tar.* files (Closes: #554898)
+
+  [ Chris Leick ]
+  * doc/ various manpages:
+    - correct various errors, typos and oddities (Closes: #552535)
+  * doc/apt-secure.8.xml:
+    - replace literal with emphasis tags in Archive configuration
+
+  [ Eugene V. Lyubimkin ]
+  * apt-pkg/contib/strutl.h
+    - Avoid extra inner copy in APT_MKSTRCMP and APT_MKSTRCMP2.
+  * build infrastructure:
+    - Bumped libapt version, excluded eglibc from SONAME. (Closes: #448249)
+
   [ Julian Andres Klode ]
   * doc/apt.conf.5.xml:
     - Deprecate unquoted values, string concatenation and explain what should
@@ -55,15 +108,12 @@ apt (0.7.25) UNRELEASED; urgency=low
     - Restrict option names to alphanumerical characters and "/-:._+".
     - Deprecate #include, we have apt.conf.d nowadays which should be
       sufficient.
-  * methods/https.cc:
-    - Add support for authentication using netrc (Closes: #518473), patch
-      by Jussi Hakala <jussi.hakala@hut.fi>.
   * ftparchive/apt-ftparchive.cc:
     - Call setlocale() so translations are actually used.
   * debian/apt.conf.autoremove:
     - Add kfreebsd-image-* to the list (Closes: #558803)
 
- -- Michael Vogt <michael.vogt@ubuntu.com>  Tue, 29 Sep 2009 15:51:34 +0200
+ -- Michael Vogt <mvo@debian.org>  Thu, 10 Dec 2009 22:02:38 +0100
 
 apt (0.7.24) unstable; urgency=low
 

debian/control

@@ -5,18 +5,16 @@ 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>
-Standards-Version: 3.8.2.0
-Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, docbook-utils (>= 0.6.12), xsltproc, docbook-xsl, xmlto, po4a (>= 0.34-2)
+Standards-Version: 3.8.3
+Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev
 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/
 
 Package: apt
 Architecture: any
 Depends: ${shlibs:Depends}, debian-archive-keyring
-Priority: important
 Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7)
 Provides: ${libapt-pkg:provides}
 Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt
-Section: admin
 Description: Advanced front-end for dpkg
  This is Debian's next generation front-end for the dpkg package manager.
  It provides the apt-get utility and APT dselect method that provides a 
@@ -55,10 +53,8 @@ Description: Documentation for APT development
 Package: apt-utils
 Architecture: any
 Depends: ${shlibs:Depends}
-Priority: important
 Provides: ${libapt-inst:provides}
 Replaces: apt (<< 0.5.9)
-Section: admin
 Description: APT utility programs
  This package contains some APT utility programs such as apt-ftparchive,
  apt-sortpkgs and apt-extracttemplates.
@@ -71,7 +67,6 @@ Package: apt-transport-https
 Architecture: any
 Depends: ${shlibs:Depends}
 Priority: optional
-Section: admin
 Description: APT https transport
  This package contains a APT https transport. It makes it possible to
  use 'deb https://foo distro main' lines in the sources.list.

debian/rules

@@ -75,25 +75,24 @@ APT_UTILS=ftparchive sortpkgs extracttemplates
 #export DH_VERBOSE=1
 
 # Find the libapt-pkg major version for use in other control files
-export LIBAPTPKG_MAJOR:=$(shell egrep '^MAJOR=' apt-pkg/makefile |cut -d '=' -f 2)
-export LIBAPTINST_MAJOR:=$(shell egrep '^MAJOR=' apt-inst/makefile |cut -d '=' -f 2)
+include buildlib/libversion.mak
 
 # Determine which package we should provide in the control files
-LIBAPTPKG_PROVIDE=libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTPKG_MAJOR)
-LIBAPTINST_PROVIDE=libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER)-$(LIBAPTINST_MAJOR)
+LIBAPTPKG_PROVIDE=libapt-pkg-$(LIBAPTPKG_MAJOR)
+LIBAPTINST_PROVIDE=libapt-inst-$(LIBAPTINST_MAJOR)
 
 debian/shlibs.local: apt-pkg/makefile
 	# We have 3 shlibs.local files.. One for 'apt', one for 'apt-utils' and
 	# one for the rest of the packages. This ensures that each package gets
 	# the right overrides.. 
 	rm -rf $@ $@.apt $@.apt-utils
-	echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR)" > $@.apt
+	echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt
 
-	echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
-	echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR)" >> $@.apt-utils
+	echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils
+	echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils
 
-	echo "libapt-pkg$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
-	echo "libapt-inst$(GLIBC_VER)$(LIBSTDCPP_VER) $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
+	echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@
+	echo "libapt-inst $(LIBAPTINST_MAJOR) $(LIBAPTINST_PROVIDE)" >> $@
 
 build: build/build-stamp	
 build-doc: build/build-doc-stamp	

doc/apt-cache.8.xml

@@ -151,7 +151,7 @@ Reverse Provides:
    
        <listitem><para><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
+       be an 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.</para>
        </listitem>

doc/apt-extracttemplates.1.xml

@@ -60,7 +60,7 @@
      <varlistentry><term><option>-t</option></term><term><option>--tempdir</option></term>
      <listitem><para>
      Temporary directory in which to write extracted debconf template files
-     and config scripts
+     and config scripts.
      Configuration Item: <literal>APT::ExtractTemplates::TempDir</literal></para></listitem>
      </varlistentry>
 

doc/apt-ftparchive.1.xml

@@ -15,7 +15,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>29 February 2004</date>
+   <date>17 August 2009</date>
  </refentryinfo>
  
  <refmeta>
@@ -158,7 +158,7 @@
      <para>
      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 
+     directories are prepended certain relative paths defined in later 
      sections to produce a complete an absolute path.</para>
      <variablelist>     
       <varlistentry><term>ArchiveDir</term>
@@ -543,7 +543,16 @@ for i in Sections do
      Make the caching databases read only. 
      Configuration Item: <literal>APT::FTPArchive::ReadOnlyDB</literal>.</para></listitem>
      </varlistentry>   
-   
+
+     <varlistentry><term><option>APT::FTPArchive::LongDescription</option></term>
+     <listitem><para>
+     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>.
+     </para></listitem>
+     </varlistentry>
+
      &apt-commonoptions;
      
    </variablelist>

doc/apt-get.8.xml

@@ -263,7 +263,7 @@
      you will properly get another (newer, older or none) source version than
      the one you have installed or could install.</para>
 
-     <para>If the <option>--compile</option> options is specified
+     <para>If the <option>--compile</option> option is specified
      then the package will be compiled to a binary .deb using
      <command>dpkg-buildpackage</command>, if <option>--download-only</option>
      is specified then the source package will not be unpacked.</para>
@@ -391,7 +391,7 @@
 
      <para>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
+     Remove (Remv), Unpack (Inst). Square brackets indicate broken packages
      and empty set of square brackets meaning breaks that are of no consequence
      (rare).</para></listitem>
      </varlistentry>

doc/apt-mark.8.xml

@@ -80,7 +80,7 @@
 
        <varlistentry><term>showauto</term>
 	 <listitem><para><literal>showauto</literal> is used to print a
-     list of manually installed packages with each package on a new line.
+     list of automatically installed packages with each package on a new line.
        </para></listitem>
        </varlistentry>
      </variablelist>

doc/apt-secure.8.xml

@@ -68,7 +68,7 @@
    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
+   trust the archive maintainer. It's the archive maintainer
    responsibility to ensure that the archive integrity is correct.
    </para>
 
@@ -94,7 +94,7 @@
    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
+   once a year) and distributed through the FTP server. This key is
    also on the Debian keyring.
    </para>
 
@@ -157,15 +157,15 @@
    </para>
 
      <itemizedlist>
-       <listitem><para><literal>Create a toplevel Release
-       file</literal>.  if it does not exist already. You can do this
+       <listitem><para><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).</para></listitem>
    
-      <listitem><para><literal>Sign it</literal>. You can do this by running
+      <listitem><para><emphasis>Sign it</emphasis>. You can do this by running
       <command>gpg -abs -o Release.gpg Release</command>.</para></listitem>
 
-      <listitem><para><literal>Publish the key fingerprint</literal>,
+      <listitem><para><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.</para></listitem>

doc/apt.conf.5.xml

@@ -48,9 +48,9 @@
    loading even more config files.</para>
 
    <para>The configuration file is organized in a tree with options organized into
-   functional groups. option specification is given with a double colon
+   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 
+   the APT tool group, for the Get tool. Options do not inherit from their 
    parent groups.</para> 
 
    <para>Syntactically the configuration language is modeled after what the ISC tools
@@ -58,7 +58,7 @@
    <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 
+   <literal>APT::Get::Assume-Yes "true";</literal>. The trailing 
    semicolon and the quotes are required. The value must be on one line, and
    there is no kind of string concatenation. It must not include inside quotes.
    The behavior of the backslash "\" and escaped characters inside a value is
@@ -156,11 +156,26 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      </varlistentry>
 
      <varlistentry><term>Immediate-Configure</term>
-     <listitem><para>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.</para></listitem>
+     <listitem><para>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.</para></listitem>
      </varlistentry>
 
      <varlistentry><term>Force-LoopBreak</term>
@@ -250,7 +265,7 @@ DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
      this applies to all things including connection timeout and data timeout.</para>
 
      <para>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)
+     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
@@ -521,9 +536,9 @@ DPkg::TriggersPending "true";</literallayout></para>
 
      <variablelist>
        <varlistentry><term>DPkg::NoTriggers</term>
-       <listitem><para>Add the no triggers flag to all dpkg calls (expect the ConfigurePending call).
+       <listitem><para>Add the no triggers flag to all dpkg calls (except the ConfigurePending call).
        See &dpkg; if you are interested in what this actually means. In short: dpkg will not run the
-       triggers then this flag is present unless it is explicit called to do so in an extra call.
+       triggers when this flag is present unless it is explicitly called to do so in an extra call.
        Note that this option exists (undocumented) also in older apt versions with a slightly different
        meaning: Previously these option only append --no-triggers to the configure calls to dpkg -
        now apt will add these flag also to the unpack and remove calls.</para></listitem>
@@ -534,8 +549,8 @@ DPkg::TriggersPending "true";</literallayout></para>
        The "<literal>smart</literal>" way is it to configure only packages which need to be configured before
        another package can be unpacked (Pre-Depends) and let the rest configure by dpkg with a call generated
        by the next option. "<literal>no</literal>" on the other hand will not configure anything and totally
-       relay on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
-       Setting this option to another than the all value will implicit activate also the next option per
+       rely on dpkg for configuration (which will at the moment fail if a Pre-Depends is encountered).
+       Setting this option to another than the all value will implicitly activate also the next option per
        default as otherwise the system could end in an unconfigured status which could be unbootable!
        </para></listitem>
        </varlistentry>
@@ -543,7 +558,7 @@ DPkg::TriggersPending "true";</literallayout></para>
        <listitem><para>If this option is set apt will call <command>dpkg --configure --pending</command>
        to let dpkg handle all required configurations and triggers. This option is activated automatic
        per default if the previous option is not set to <literal>all</literal>, but deactivating could be useful
-       if you want to run APT multiple times in a row - e.g. in an installer. In this sceneries you could
+       if you want to run APT multiple times in a row - e.g. in an installer. In these sceneries you could
        deactivate this option in all but the last run.</para></listitem>
        </varlistentry>
        <varlistentry><term>DPkg::TriggersPending</term>

doc/apt.ent

@@ -78,7 +78,7 @@
 
 <!ENTITY dpkg "<citerefentry>
     <refentrytitle><command>dpkg</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
@@ -96,19 +96,19 @@
 
 <!ENTITY dpkg-scanpackages "<citerefentry>
     <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
 <!ENTITY dpkg-scansources "<citerefentry>
     <refentrytitle><command>dpkg-scansources</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 
 <!ENTITY dselect "<citerefentry>
     <refentrytitle><command>dselect</command></refentrytitle>
-    <manvolnum>8</manvolnum>
+    <manvolnum>1</manvolnum>
   </citerefentry>"
 >
 

doc/de/addendum/xml_de.add

@@ -0,0 +1,6 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>Übersetzung</title>
+   <para>Die deutsche Übersetzung wurde 2009 von Chris Leick <email>c.leick@vollbio.de</email> angefertigt
+   in Zusammenarbeit mit dem Debian German-l10n-Team <email>debian-l10n-german@lists.debian.org</email>.</para>
+ </refsect1>
+

doc/de/makefile

@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/de
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Language Code of this translation
+LC=de
+
+include $(PO4A_MANPAGE_H)

doc/es/addendum/xml_es.add

@@ -0,0 +1,9 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>Translation</title>
+   <para>The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),
+   Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),
+   Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),
+   Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)
+   and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)
+   under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.
+ </refsect1>

doc/es/apt-cache.es.8.sgml

@@ -1,454 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.6 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt-cache.8.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-cache</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-cache</>
-    <refpurpose>utilidad de manejo de paquetes APT -- manipulador de caché</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-cache</>
-      <arg><option>-hvsn</></arg>
-      <arg><option>-o=<replaceable/cadena de configuración/</></arg>
-      <arg><option>-c=<replaceable/fichero/</></arg>
-      <group choice=req>
-         <arg>add <arg choice="plain" rep="repeat"><replaceable>fichero</replaceable></arg></arg>
-         <arg>gencaches</>
-         <arg>showpkg <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>showsrc <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>stats</>
-         <arg>dump</>
-         <arg>dumpavail</>
-         <arg>unmet</>
-         <arg>search <arg choice="plain"><replaceable>expresión regular</replaceable></arg></arg>
-         <arg>show <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>depends <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>rdepends <arg choice="plain" rep="repeat"><replaceable>pkg</replaceable></arg></arg>
-         <arg>pkgnames <arg choice="plain"><replaceable>prefijo</replaceable></arg></arg>
-         <arg>dotty <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>policy <arg choice="plain" rep="repeat"><replaceable>paquetes</replaceable></arg></arg>
-         <arg>madison <arg choice="plain" rep="repeat"><replaceable>paquetes</replaceable></arg></arg>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
- <RefSect1><Title>Descripción</>
-   <para>
-   <command/apt-cache/ realiza una serie de operaciones sobre la caché de
-   paquetes de APT. <command/apt-cache/ no modifica el estado del sistema
-   pero proporciona operaciones de búsqueda en la información de los 
-   paquetes, de las cuales se puede obtener información muy útil. 
-
-   <para>
-   A menos que se proporcionen las opciones <option/-h/, o <option/--help/, se
-   debe de proporcionar una de las siguientes órdenes: 
-
-   <VariableList>
-     <VarListEntry><Term>add <replaceable/fichero(s)/</Term>
-     <ListItem><Para>
-     <literal/add/ añade el nombre del paquete a los ficheros de
-     índices de la caché de paquetes. Sólo para depuración.
-     </VarListEntry>
-     
-     <VarListEntry><Term>gencaches</Term>
-     <ListItem><Para>
-     <literal/gencaches/ realiza la misma operación que 
-     <command/apt-get check/. Construye las cachés de paquetes fuente y de
-     paquetes binarios, usando la lista de recursos en &sources-list;
-     junto con la información en <filename>/var/lib/dpkg/status</>.
-     </VarListEntry>
-
-     <VarListEntry><Term>showpkg <replaceable/paquete(s)/</Term>
-     <ListItem><Para>
-     <literal/showpkg/ muestra información acerca de los paquetes
-     listados en la línea de órdenes. Los argumentos restantes se
-     consideran nombres de paquetes. Por cada paquete se mostrarán las
-     versiones disponibles y los paquetes que dependen de él (reverse
-     dependencies), así como los paquetes de que depende (forward dependencies),
-     (los cuales deben de ser instalados para instalar el paquete).  
-     Por ejemplo, <command>apt-cache showpkg libreadline2</> mostrará algo
-     similar a lo siguiente:
-     
-<informalexample><programlisting>
-Package: libreadline2
-Versions: 2.1-12(/var/state/apt/lists/foo_Packages),
-Reverse Depends: 
-  libreadlineg2,libreadline2
-  libreadline2-altdev,libreadline2
-Dependencies:
-2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))
-Provides:
-2.1-12 - 
-Reverse Provides: 
-</programlisting></informalexample>
-			    
-     <para>
-     Esta información nos indica que la versión 2.1-12 de libreadline2,
-     depende de libc5 y ncurses3.0, ambos programas deben instalarse para
-     que libreadline2 pueda funcionar. Además, libreadlineg2 y
-     libreadline2-altdev dependen de libreadline2. Es decir, si se instala
-     libreadline2, también se instalarán libc5 y ncurses3.0 (y ldso), pero
-     libreadlineg2 y libreadline2-altdev no tienen que instalarse.
-     Para una información más especifica acerca del significado de la salida
-     consulte el código fuente de apt.
-     </VarListEntry>
-
-     <VarListEntry><Term>stats</Term>
-     <ListItem><Para>
-     <literal/stats/ muestra algunas estadísticas acerca de la caché.
-     No necesita ningún argumento adicional. Las estadísticas que
-     muestra son: 
-     <itemizedlist>
-       <listitem><para>
-       <literal/Total package names/ es el número de paquetes encontrados
-       en la caché. 
-       </listitem>
-       
-       <listitem><para>
-       <literal/Normal packages/ es el número de paquetes normales. Estos
-       paquetes tienen una correspondencia unívoca entre sus nombres y
-       los nombres que usan  otros paquetes al listarlos en sus
-       dependencias. La mayoría de los paquetes pertenecen a este grupo.
-       </listitem>
-
-       <listitem><para>
-       <literal/Pure virtual packages/ es el número de paquetes que
-       existen sólo como nombre de paquete virtual, esto es, paquetes
-       que sólo "proporcionan" el nombre del paquete virtual, y no hay
-       ningún paquete más que use realmente el nombre. Por ejemplo,
-       "mail-transport-agent" en un sistema Debian GNU/Linux es un
-       paquete virtual puro, varios paquetes proporcionan
-       "mail-transport-agent", pero no hay ningún paquete que se llame
-       "mail-transport-agent".
-       </listitem>
-   
-       <listitem><para>
-       <literal/Single virtual packages/ es el número de paquetes que
-       sólo tiene un paquete real que los proporcione. Por ejemplo, en
-       un sistema Debian GNU/Linux, "X11-text-viewer" es un paquete
-       virtual, pero sólo un paquete, xless, proporciona "X11-text-viewer". 
-       </listitem>
-
-       <listitem><para>
-       <literal/Mixed virtual packages/ es el número de paquetes que o
-       bien proporcionan un determinado paquete virtual o tienen el
-       mismo nombre como paquete virtual y como paquete real, en un
-       sistema Debian GNU/Linux, "debconf" es a la vez un paquete real,
-       y es proporcionado por el paquete debconf-tiny. 
-       </listitem>
-   
-       <listitem><para>
-       <literal/Missing/ es el número de nombres de paquetes a los que se hace
-       referencia como dependencia pero que no son proporcionado por ningún
-       paquete. Estos paquetes probablemente signifiquen que no se tiene
-       acceso al total de la distribución, o bien que algún paquete (real o
-       virtual) ha sido eliminado de la distribución. Normalmente se hace
-       referencia a ellos desde los campos de conflictos de la descripción 
-       de los paquetes.
-       </listitem>
-
-       <listitem><para>
-       <literal/Total distinct versions/ es el número de versiones de paquetes
-       encontrados en la caché, por lo tanto el número es al menos igual al
-       número total de paquetes. Si más de una distribución ("estable"
-       e "inestable", por ejemplo), se encuentra en la caché al mismo
-       tiempo, este valor puede ser considerablemente mayor que el
-       número total de paquetes. 
-       </listitem>
-
-       <listitem><para>
-       <literal/Total dependencies/ es el número total de  relaciones de
-       dependencia necesitadas por todos los paquetes de la caché.
-       </listitem>
-     </itemizedlist>
-     </VarListEntry>
-     
-     <VarListEntry><Term>showsrc <replaceable/paquete(s)/</Term>
-     <ListItem><Para>
-     <literal/showsrc/ muestra todos los campos de los paquetes fuente que
-      coinciden con los nombres de los paquetes suministrados. Se muestran
-      todas las versiones, así como  los paquetes que son binarios. 
-     </VarListEntry>
-     
-     <VarListEntry><Term>dump</Term>
-     <ListItem><Para>
-     <literal/dump/ muestra una pequeña lista de todos los paquetes en la
-      caché. Fundamentalmente para depuración.
-     </VarListEntry>
-
-     <VarListEntry><Term>dumpavail</Term>
-     <ListItem><Para>
-     <literal/dumpavail/ envía a la salida estándar una lista de los paquetes
-       disponibles. Esta lista es apropiada para su uso con &dpkg; y es
-       usada por el método &dselect;. 
-     </VarListEntry>
-
-     <VarListEntry><Term>unmet</Term>
-     <ListItem><Para>
-     <literal/unmet/ muestra un resumen de todas las dependencias no
-       satisfechas en la caché de paquetes.
-     </VarListEntry>
-
-     <VarListEntry><Term>show <replaceable/paquete(s)/</Term>
-     <ListItem><Para>
-     <literal/show/ realiza una función similar a <command>dpkg
-	--print-avail</>,  muestra los datos de los paquetes listados.
-     </VarListEntry>
-
-     <VarListEntry><Term>search <replaceable/regex [regex ...]/</Term>
-     <ListItem><Para>
-     <literal/search/ realiza una búsqueda de la expresión regular
-       dada en todo el texto de todos los paquetes disponibles. Busca la
-       expresión regular tanto en el nombre de los paquetes como en
-       su descripción y muestra el nombre del paquete y una pequeña
-       descripción de este. Si se proporciona el argumento <option/--full/ el
-       resultado es el igual al que produce <literal/show/  para cada paquete en
-       concreto, pero si se proporciona el argumento <option/--names-only/
-       entonces sólo se busca en el nombre de los paquetes.
-     <para>
-     
-       Se pueden especificar argumentos separados para buscar una cadena de
-       caracteres que los contenga todos al mismo tiempo.
-     </VarListEntry>
-
-     <VarListEntry><Term>depends <replaceable/paquete(s)/</Term>
-     <ListItem><Para>
-     <literal/depends/ muestra una lista de todas la dependencias de
-       un paquete y de todos los paquetes que la pueden satisfacer.
-     </VarListEntry>
-
-     <VarListEntry><Term>rdepends <replaceable/paquetes(s)/</Term>
-     <ListItem><Para>
-       <literal/rdepends/ muestrade las dependencias inversas de un paquete.
-     </VarListEntry>
-
-     <VarListEntry><Term>pkgnames <replaceable/[ prefijo ]/</Term>
-     <ListItem><Para>
-       Esta orden muestra el nombre de todos los paquetes instalados en
-       el sistema. El argumento opcional es un prefijo por el cual se
-       filtraría la lista de nombres. La salida es apropiada para uso
-       junto con la función de auto-completado mediante tabulador en un
-       intérprete de órdenes y se genera de forma extremadamente
-       rápida. Su mejor uso es con la opción <option/--generate/.
-     </VarListEntry>
-     
-     <VarListEntry><Term>dotty <replaceable/paquete(s)/</Term>
-     <ListItem><Para>
-     <literal/dotty/ toma una lista de paquetes de la línea de ordenes
-       y genera una salida apropiada para dotty, del paquete 
-     <ulink url="http://www.research.att.com/sw/tools/graphviz/">GraphViz</>.
-       El resultado será una serie de nodos y uniones representando las
-       relaciones entre paquetes. Por omisión los paquetes dados
-       mostrarán todas sus dependencias, lo que puede producir una
-       salida muy grande. Esto puede ser deshabilitado activando la
-       opción <literal>APT::Cache::GivenOnly</>.
-
-     <para>
-       Los nodos resultantes tendrán varias formas, los paquetes normales son
-       cajas, pure provides son triángulos, mixed provides son
-       diamantes, los paquetes no encontrados son hexágonos. Las cajas naranjas
-       significan recursion was stopped [leaf packages], líneas azules
-       son predependencias, líneas verdes son conflictos. 
-
-     <para>
-     Tenga cuidado, dotty no puede dibujar una gran cantidad de paquetes.
-     
-     <VarListEntry><Term>policy <replaceable/[ paquete(s) ]/</Term>
-     <ListItem><Para>
-     <literal/policy/ está pensada para ayudar a depurar
-       asuntos relacionado con el archivo de preferencias. Sin
-       argumentos mostrará la prioridad de cada fuente. De lo
-       contrario muestra una información detallada acerca de la
-       prioridad de selección de cada nombre de paquete.
-     </VarListEntry>
-
-     <VarListEntry><Term>madison <replaceable/[ paquete(s) ]/</Term>
-     <ListItem><Para>
-       La orden <literal/madison/ de <literal/apt-cache/  intenta imitar el formato
-       de salida y parte de la funcionalidad de la herramienta para el manejo del
-       archivo de Debian, <literal/madison/.  Muestra las versiones disponibles de 
-       un determinado paquete en un formato tabular. A diferencia del
-       <literal/madison/ original, sólo puede mostrar información para la
-       arquitectura para la que APT obtuvo las listas de paquetes
-       (<literal/APT::Architecture/).
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
- 
- <RefSect1><Title>Opciones</>
-   &apt-cmdblurb;
-   
-   <VariableList>
-     <VarListEntry><term><option/-p/</><term><option/--pkg-cache/</>
-     <ListItem><Para>
-     Selecciona el fichero para guardar la caché de paquetes. La caché de
-     paquetes es la caché primaria usada para todas las operaciones.
-     Opción de configuración: <literal/Dir::Cache::pkgcache/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-s/</><term><option/--src-cache/</>
-     <ListItem><Para>
-     Selecciona el fichero para guardar la caché de fuente. Sólo
-     <literal/gencaches/ usa esta caché y guarda una versión meticulosamente
-     analizada de la información de cada paquete de las fuentes
-     remotas. Cuando se construye la caché de paquetes la caché
-     fuente se usa para evitar analizar todos los ficheros de paquetes.
-     Opción de configuración: <literal/Dir::Cache::srcpkgcache/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-q/</><term><option/--quiet/</>
-     <ListItem><Para>
-     Silencioso, produce una salida adecuada para su almacenamiento, omitiendo los
-     indicadores de progreso. Más q's producirán una salida más silenciosa,
-     hasta un máximo de 2. Además es posible usar <option/-q=#/ para
-     ajustar el nivel de silenciosidad, ignorando el fichero de
-     configuración. Opción de configuración: <literal/quiet/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-i/</><term><option/--important/</>
-     <ListItem><Para>
-     Muestra sólo las dependencias importantes, se usa junto con
-     <literal/unmet/. Hace que sólo se muestren las dependencias y predependencias.
-     Opción de configuración: <literal/APT::Cache::Important/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-f/</><term><option/--full/</>
-     <ListItem><Para>
-     Muestra todos los campos de información cuando se busque. Opción de
-      configuración: <literal/APT::Cache::ShowFull/. 
-     </VarListEntry>
-
-     <VarListEntry><term><option/-a/</><term><option/--all-versions/</>
-     <ListItem><Para>
-      Muestra la descripción completa de todos las versiones disponibles. Es el
-     comportamiento predeterminado, para desactivarlo use
-     <option/--no-all-versions/. Si se especifica <option/--no-all-versions/,
-     sólo se muestra la versión candidata (la que se seleccionaría para
-     instalar). Esta opción sólo es aplicable a la orden <literal/show/. Opción
-     de configuración: <literal/APT::Cache::AllVersions/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-g/</><term><option/--generate/</>
-     <ListItem><Para>
-     Realiza una regeneración completa de la caché de paquetes en vez de
-      usarla tal y como está. Esta es la opción por omisión, para
-      desactivarlo use <option/--no-generate/. Opción de
-      configuración: <literal/APT::Cache::Generate/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--names-only/</><term><option/-n/</>
-     <ListItem><Para>
-     Sólo busca en los nombres de paquetes, no en las descripciones largas. 
-      Opción de configuración: <literal/APT::Cache::NamesOnly/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--all-names/</>
-     <ListItem><Para>
-     Hace que <literal/pkgnames/ muestre todos los nombres,
-      incluyendo los paquetes virtuales y las dependencias insatisfechas.
-      Opción de configuración: <literal/APT::Cache::AllNames/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--recurse/</>
-     <ListItem><Para>
-     Hace <literal/depends/ y <literal/rdepends/ recursivos de modo que todos
-      los paquetes mencionados se muestran sólo una vez. Opción de configuración
-      <literal/APT::Cache::RecurseDepends/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--installed/</>
-     <ListItem><Para>
-     Limita la salida de <literal/depends/ y <literal/rdepends/ a paquetes
-      instalados. Opción de configuración: <literal/APT::Cache::Installed/.
-     </VarListEntry>
-
-
-     &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Ficheros</>
-   <variablelist>
-     <VarListEntry><term><filename>/etc/apt/sources.list</></term>
-     <ListItem><Para>
-     Fichero que contiene los sitios de donde se obtienen los paquetes.
-      Opción de configuración: <literal/Dir::Etc::SourceList/.
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&statedir;/lists/</></term>
-     <ListItem><Para>
-     Directorio donde se almacena la información del estado de cada paquete
-     fuente por cada sitio especificado &sources-list;
-     Opción de configuración: <literal/Dir::State::Lists/.
-     </VarListEntry>
-  
-     <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
-     <ListItem><Para>
-     Directorio de almacenamiento para la información de estado en
-      tránsito. Opción de Configuración: <literal/Dir::State::Lists/
-      (lo que implica que no estarán completos). 
-     </VarListEntry>     
-   </variablelist>
- </RefSect1>
-
- <RefSect1><Title>Vea además</>
-   <para>
-   &apt-conf;, &sources-list;, &apt-get;
- </RefSect1>
-
- <RefSect1><Title>Diagnósticos</>
-   <para>
-   <command/apt-cache/ devuelve cero en operaciones satisfactorias, 100 en caso
-   de error.
- </RefSect1>
-
- &manbugs;
- &manauthor;
- <RefSect1><Title>Tradución</>
-   <para>
-   Página del manual traducida por Rubén Porras <email>nahoo@inicia.es</>,
-   revisada por Gustavo Saldumbide <email>gsal@adinet.com.uy</>.
- </RefSect1>
-</refentry>
-<!-- Keep this comment at the end of the file
-Local variables:
-mode: sgml
-sgml-omittag:nil
-sgml-shorttag:t
-sgml-namecase-general:t
-sgml-general-insert-case:lower
-sgml-minimize-attributes:nil
-sgml-always-quote-attributes:t
-sgml-indent-step:1
-sgml-indent-data:t
-sgml-parent-document:nil
-sgml-exposed-tags:nil
-sgml-local-catalogs:("/usr/lib/sgml/catalog")
-sgml-local-ecat-files:nil
-End:
--->

doc/es/apt-cdrom.es.8.sgml

@@ -1,167 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!--
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.2 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt-cdrom.8.sgml
--->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-cdrom</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-cdrom</>
-    <refpurpose>utilidad APT para administración del CDROM</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-cdrom</>
-      <arg><option>-hvrmfan</></arg>
-      <arg><option>-d=<replaceable/cdrom punto_de_montaje/</></arg>
-      <arg><option>-o=<replaceable/cadena de configuración/</></arg>
-      <arg><option>-c=<replaceable/fichero/</></arg>
-      <group choice=req>
-         <arg>add</>
-         <arg>ident</>
-      </group>   
-   </cmdsynopsis>
-  </refsynopsisdiv>
-
-<RefSect1><Title>Descripción</>
-   <para>
-   <command/apt-cdrom/ se usa para añadir un CDROM nuevo a la lista de recursos
-   disponibles de APT. <command/apt-cdrom/ determina la estructura del disco,
-   corrige varios errores de grabación posibles y verifica los ficheros con
-   los índices.   
-   <para>
-   Es necesario usar <command/apt-cdrom/ para añadir CDs al sistema APT, 
-   no puede hacerse manualmente. Además cada unidad de un conjunto de discos
-   debe de ser analizada por separado para detectar los posibles errores de
-   grabación.
-
-   <para>
-   A menos que se de una de las opciones <option/-h/, o <option/--help/
-   una de las siguientes órdenes deben de estar presentes.
-   
-   <VariableList>
-     <VarListEntry><Term>add</Term>
-     <ListItem><Para>
-     <literal/add/ para añadir un disco nuevo a la lista de recursos. 
-     Desmontará el dispositivo de CDROM, pedirá que se inserte un disco y
-     procederá a analizar y copiar los ficheros de índices. Si el disco
-     no contiene el directorio apropiado <filename>.disk/</> se mostrará un
-     mensaje descriptivo.
-
-     <para>
-     APT usa un identificador de CDROM para reconocer que disco está actualmente
-     en la unidad lectora y mantiene una lista de estos identificadores en 
-     <filename>&statedir;/cdroms.list</>
-     </VarListEntry>
-     
-     <VarListEntry><Term>ident</Term>
-     <ListItem><Para>
-     Una herramienta de depuración para informar de identidad del disco actual
-     así como del nombre guardado.
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Opciones</>
-   &apt-cmdblurb;
-   
-   <VariableList>
-     <VarListEntry><term><option/-d/</><term><option/--cdrom/</>
-     <ListItem><Para>
-     Punto de montaje. Especifica el lugar donde se debe montar el cdrom.
-     Este punto de montaje debe estar listado en <filename>/etc/fstab</> y
-     configurado correctamente.
-     Opción de Configuración: <literal/Acquire::cdrom::mount/.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-r/</><term><option/--rename/</>
-     <ListItem><Para>
-     Renombrar un disco. Cambia la etiqueta de un disco. Esta opción hará que
-     <command/apt-cdrom/ pregunte una nueva etiqueta.
-     Opción de Configuración: <literal/APT::CDROM::Rename/.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-m/</><term><option/--no-mount/</>
-     <ListItem><Para>
-     No montar. Evita que <command/apt-cdrom/ monte y desmonte el punto de
-     montaje.
-     Opción de Configuración: <literal/APT::CDROM::NoMount/.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-f/</><term><option/--fast/</>
-     <ListItem><Para>
-     Rápido. Asumir que los ficheros con los paquetes son válidos y no
-     comprobar todos los paquetes. Esta opción sólo se debe de usar si
-     <command/apt-cdrom/ comprobó el disco con anterioridad y no detectó
-     ningún error.
-     Opción de Configuración: <literal/APT::CDROM::Fast/.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-a/</><term><option/--thorough/</>
-     <ListItem><Para>
-     Comprobación meticulosa de los paquetes. Esta opción puede ser necesaria
-     con algunos discos viejos de Debian 1.1/1.2 que tienen los ficheros de
-     los paquetes en lugares extraños. Tardará mucho más en analizar el CD, 
-     pero encontrará todos los paquetes.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-n/</>
-                   <term><option/--just-print/</>
-                   <term><option/--recon/</>
-                   <term><option/--no-act/</>
-     <ListItem><Para>
-     No cambiar nada. No cambiar el fichero &sources-list; y no escribir
-     los ficheros de índices. Sin embargo sigue haciendo todas las
-     comprobaciones.
-     Opción de Configuración: <literal/APT::CDROM::NoAct/.
-     </VarListEntry> 
- 
-     &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Véase también</>
-   <para>
-   &apt-conf;, &apt-get;, &sources-list;
- </RefSect1>
-
- <RefSect1><Title>Diagnósticos</>
-   <para>
-   <command/apt-cdrom/ devuelve cero en una operaciones satisfactorias,
-   el decimal 100 en caso de error.
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
-
-</refentry>
-

doc/es/apt-config.es.8.sgml

@@ -1,123 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Carlos Mestre
-Está basada en la página de manual original:
-versión 1.2 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt-config.8.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-config</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-config</>
-    <refpurpose>Programa para la consulta de configuración de APT</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-config</>
-      <arg><option>-hv</></arg>
-      <arg><option>-o=<replaceable/cadena de configuración/</></arg>
-      <arg><option>-c=<replaceable/fichero/</></arg>
-      <group choice=req>
-         <arg>shell</>
-         <arg>dump</>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
- <RefSect1><Title>Descripción</>
-   <para>
-   <command/apt-config/ es un programa interno usado por varios programas del
-   conjunto de herramientas APT para proporcionar una configurabilidad
-   coherente.Este accede al archivo principal de configuración
-   <filename>/etc/apt/apt.conf</> de forma que sea fácil de usar por scripts.
-   <para>
-   A menos que se incluya la opción <option/-h/ o <option/--help/, una de de
-   los siguientes órdenes debe estar presente.
-   </para>
-   
-   <VariableList>
-     <VarListEntry><Term>shell</Term>
-     <ListItem><Para>
-     shell se usa para acceder a la información de configuración de un fichero
-     de órdenes (shell script). Este proporciona 2 argumentos, el primero es
-     una variable del intérprete de órdenes, y el segundo el valor de
-     configuración para la petición. Como salida muestra una serie de listas
-     de órdenes asignados al intérprete de órdenes por cada valor presente. En
-     un fichero de órdenes, este debería usarse como:
-     </para>
-     
-<informalexample><programlisting>
-OPTS="-f"
-RES=`apt-config shell OPTS MyApp::Options`
-eval $RES
-</programlisting></informalexample>
-
-     <para>
-     Esto debería fijar la variable de entorno del intérprete de órdenes $OPTS
-     al valor deMyApp::Opciones, con un valor por omisión de <option/-f/.
-     
-     <para>
-     El elemento de configuración podría ser corregido después con /[fdbi]. f
-     devuelve nombres de ficheros, d devuelve los directorios, b devuelve
-     verdadero o falso e i devuelve un número entero. Cada uno de los valores
-     devueltos es normalizado y verificado internamente.
-     </VarListEntry>
-
-     <VarListEntry><Term>dump</Term>
-     <ListItem><Para>
-     Sólo muestra el contenido del espacio de configuración.
-     </VarListEntry>
-
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Opciones</>
-   &apt-cmdblurb;
-   
-   <VariableList>
-   
-     &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Vea además</>
-   <para>
-   &apt-conf;
- </RefSect1>
-
- <RefSect1><Title>Diagnósticos</>
-   <para>
-   <command/apt-config/ devuelve el valor cero en una operación normal, 100 si ocurre un error.
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Carlos Mestre
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
- 
-</refentry>

doc/es/apt-get.es.8.sgml

@@ -1,558 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.7 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt-get.8.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt-get</>
-   <manvolnum>8</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt-get</>
-    <refpurpose>utilidad de manejo de paquetes APT -- interfaz en
-    línea de ordenes.</>
- </refnamediv>
-
- <!-- Arguments -->
- <refsynopsisdiv>
-   <cmdsynopsis>
-      <command>apt-get</>
-      <arg><option>-hvs</></arg>
-      <arg><option>-o=<replaceable/cadena de configuración/</></arg>
-      <arg><option>-c=<replaceable/fichero/</></arg>
-      <group choice=req>
-         <arg>update</>
-         <arg>upgrade</>
-         <arg>dselect-upgrade</>
-         <arg>install <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>remove <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>source <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>build-dep <arg choice="plain" rep="repeat"><replaceable>paquete</replaceable></arg></arg>
-         <arg>check</>
-         <arg>clean</>
-         <arg>autoclean</>
-      </group>   
-   </cmdsynopsis>
- </refsynopsisdiv>
- 
- <RefSect1><Title>Descripción</>
-   <para>
-   <command/apt-get/ es la herramienta en línea de órdenes usada para
-   el manejo de paquetes, también es la herramienta usada por  otras
-   que dependen de la biblioteca APT. Hay varias interfaces disponibles, como
-   dselect(8), aptitude, synaptic, gnome-apt and wajig.
-   <para>
-   Se debe proporcionar una de las siguientes órdenes a menos que se
-   den las opciones <option/-h/, o <option/--help/.
-   
-   <VariableList>
-     <VarListEntry><Term>update</Term>
-     <ListItem><Para>
-     <literal/update/ se usa para sincronizar el índice de
-       paquetes respecto a sus fuentes. Los índices de paquetes
-       disponibles se obtienen de los lugares especificados en
-       <filename>/etc/apt/sources.list</>. Por ejemplo, cuando se usa
-       un archivo de Debian, esta orden descarga y analiza los
-       ficheros <filename>Packages.gz</>, de tal forma que la
-       información acerca de nuevos paquetes pasa a estar
-       disponible. Siempre se debe realizar un <literal/update/
-       antes de un <literal/upgrade/ o un <literal/dist-upgrade/. Se
-       debe tener en cuenta que el indicador de progreso será
-       incorrecto, ya que el tamaño de los próximos ficheros con
-       información sobre paquetes es desconocido hasta el momento de
-       su descarga. 
-     </VarListEntry>
-     
-     <VarListEntry><Term>upgrade</Term>
-     <ListItem><Para>   
-     <literal/upgrade/ se usa para instalar la versión más
-       nueva de todos los paquetes instalados en el sistema
-       provenientes de alguna de las fuentes listadas en
-     <filename>/etc/apt/sources.list</>. Los paquetes
-       instalados con una nueva versión disponible son descargados y
-       actualizados, bajo ninguna circunstancia se desinstalarán paquetes, o
-       se instalarán paquetes nuevos. Las nuevas versiones de programas
-       instalados que no puedan ser actualizados sin cambiar el estado de
-       instalación de otros paquetes no se instalarán, manteniéndose la
-       versión actual. Debe realizarse un <literal/update/ antes para
-       que <command/apt-get/ sepa cuales son las versiones disponibles
-       de los paquetes.
-     </VarListEntry>
-
-     <VarListEntry><Term>dselect-upgrade</Term>
-     <ListItem><Para>
-     <literal/dselect-upgrade/
-     se usa junto con el tradicional administrador de paquetes de Debian
-     GNU/Linux, &dselect;. <literal/dselect-upgrade/ recoge los
-     cambios hechos al campo de <literal/Status/ de los paquetes
-     disponibles por &dselect;, y realiza las acciones necesarias
-     para que los cambios se lleven a cabo (por ejemplo, borrar
-     paquetes antiguos e instalar las nuevas versiones). 
-     </VarListEntry>
-
-     <VarListEntry><Term>dist-upgrade</Term>
-     <ListItem><Para>   
-     <literal/dist-upgrade/, además de realizar las acciones de
-     <literal/upgrade/, maneja inteligentemente los cambios de
-       dependencias debidos a nuevas versiones de paquetes,
-       <command/apt-get/ tiene un sofisticado sistema de resolución de
-       conflictos, si es necesario tratará de actualizar los paquetes
-       más importantes a costa de los menos importantes. El fichero
-       <filename>/etc/apt/sources.list</> contiene la lista de sitios
-       de los cuales se descargan los ficheros.
-       También puede consultar &apt-preferences; si quiere modificar este
-       comportamiento para paquetes individuales. 
-     </VarListEntry>
-
-     <VarListEntry><Term>install</Term>
-     <ListItem><Para>   
-     <literal/install/ instala los paquetes que siguen a la palabra
-       install. Cada nombre de paquete no es el nombre completo del
-       paquete junto con la versión de Debian, sino sólo el nombre del
-       paquete (por ejemplo, en un sistema Debian GNU/Linux, el
-       argumento sería libc6, no <literal/libc6_1.9.6-2.deb/). Se obtendrán e
-       instalarán todos los paquetes especificados para la
-       instalación, así como los requeridos por estos. El fichero 
-       <filename>/etc/apt/sources.list</> se usa para localizar los
-       paquetes. Si al nombre del paquete se le antepone un guión (sin
-       ningún espacio), el paquete será desinstalado en vez de
-       instalado. Similarmente el signo del la suma se puede usar para
-       especificar que un paquete debe de ser instalado. Esta últimas
-       características se pueden usar para modificar decisiones
-       tomadas por el sistema de resolución de conflictos de apt-get.
-     <para>
-     Se puede seleccionar una versión especifica de un paquete
-     poniendo a continuación del paquete un igual ('=') seguido de
-     la versión deseada. Alternativamente se puede seleccionar una
-     distribución especifica poniendo a continuación del nombre del
-     paquete una barra ('/') seguido de la versión de la
-     distribución o su nombre en el archivo de Debian (stable,
-     testing, unstable). 
-     <para>
-     Cualquiera de estos dos métodos de selección puede instalar una
-     versión anterior de los paquetes y debe ser usada con cuidado.
-     <para>
-     Finalmente, &apt-preferences; permite modificar las normas de selección
-     para paquetes individuales.
-     <para>
-     Si ningún paquete coincide con la expresión que se ha dado y la
-     expresión contiene un '.', '?' o un '*', entonces se asume que es una
-     expresión regular de acuerdo con el estándar POSIX, y es aplicada a
-     todos los nombres de paquetes de la base de datos. Cualquier
-     coincidencia se instala (o desinstala). Tenga en cuenta que la
-     comparación se hace en subcadenas, de manera que 'lo.*' es válido 
-     para 'how-lo' y para 'lowest'. Si este no es el comportamiento deseado
-     se debe anclar la expresión regular con un '^' o un '$', o bien crear una
-     expresión regular más específica. 
-     </VarListEntry>
-
-     <VarListEntry><Term>remove</Term>
-     <ListItem><Para>   
-     <literal/remove/ se comporta del mismo modo que <literal/install/
-       con la diferencia de que desinstala los paquetes en vez de
-       instalarlos. Si un signo más precede al nombre del paquete (sin
-       ningún espacio en blanco entre los dos), el paquete en cuestión
-       será instalado en vez de eliminado.
-     </VarListEntry>
-
-     <VarListEntry><Term>source</Term>
-     <ListItem><Para>
-     <literal/source/ hace que <command/apt-get/ descargue paquetes
-       fuente. APT examinará los paquetes disponibles para decidir que
-       paquete fuente cogerá. Entones descargará en el directorio
-       actual la versión más reciente del paquete fuente. Los paquetes
-       fuente se obtienen de sitios distintos a los binarios, estos
-       sitios se especifican mediante líneas del tipo
-       <literal/deb-src/ en el fichero &sources-list;. Esto puede
-       provocar que la versión que descargará del paquete fuente no
-       coincida con la del paquete binario que tenga instalado o
-       pueda instalar. Si se especifica el argumento --compile
-       entonces el paquete se compilará usando dpkg-buildpackage para
-       producir un .deb binario, si se especifica el argumento
-       --download-only entonces el paquete fuente no se desempaquetará.
-     <para>
-     Una versión especifica de un paquete fuente puede requerirse
-     poniendo un signo igual ('=') seguido de la versión a descargar
-     después del nombre del paquete. Es un mecanismo similar al que
-     se usa con los paquetes binarios. Esto permite seleccionar
-     exactamente el nombre y versión del paquete fuente, activando
-     implícitamente la opción <literal/APT::Get::Only-Source/.
-     
-     <para>
-     Dese cuenta que los paquetes fuentes no se tratan como los binarios, sólo
-     existen en el directorio actual, es parecido a descargar los paquetes tar
-     comprimidos con las fuentes. 
-     </VarListEntry>
-
-     <VarListEntry><Term>build-dep</Term>
-     <ListItem><Para>   
-     <literal/build-dep/ hace que apt-get instale/desinstale paquetes
-       en un intento de satisfacer las dependencias de compilación de
-       un paquete fuente. Por el momento si hay varios paquetes que
-       satisfacen la misma dependencia, apt-get elige uno aleatoriamente.
-     </VarListEntry>
-
-     <VarListEntry><Term>check</Term>
-     <ListItem><Para>   
-     <literal/check/ es una herramienta de diagnóstico. Actualiza la
-       caché de paquetes (/var/cache/apt/pkgcache.bin), vuelve a crear
-       un nuevo árbol de dependencias y busca dependencias imposibles
-       de resolver.
-     </VarListEntry>
-
-     <VarListEntry><Term>clean</Term>
-     <ListItem><Para>   
-     <literal/clean/ borra totalmente el repositorio local que
-       contiene los ficheros .deb descargados. Borra todo excepto el
-       fichero de bloqueo de los directorios
-     <filename>&cachedir;/archives/</> y 
-     <filename>&cachedir;/archives/partial/</>. Cuando APT se usa como
-       un método de &dselect;, <literal/clean/ se ejecuta
-       automáticamente. Si usted no usa dselect es probable que desee 
-       ejecutar <literal/apt-get clean/ de vez en cuando para liberar
-       algo de espacio en disco.
-     </VarListEntry>
-
-     <VarListEntry><Term>autoclean</Term>
-     <ListItem><Para>   
-     Al igual que <literal/clean/, <literal/autoclean/ borra el
-       repositorio local de paquetes descargados. La diferencia reside
-       en que sólo borrará aquellos paquetes que ya no pueden ser
-       descargados, o son claramente inservibles. Esto permite
-       mantener la caché durante largos periodos de tiempo sin que
-       aumente su tamaño sin control. Si la opción de configuración
-       <literal/APT::Clean-Installed/ está desactivada impedirá que se
-       borren paquetes instalados.
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
- 
- <RefSect1><Title>Opciones</>
-   &apt-cmdblurb;
-
-   <VariableList>
-     <VarListEntry><term><option/-d/</><term><option/--download-only/</>
-     <ListItem><Para>
-     Sólo descarga los ficheros con los paquetes, no los desempaqueta
-      ni los instala. Opción de Configuración:
-      <literal/APT::Get::Download-Only/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-f/</><term><option/--fix-broken/</>
-     <ListItem><Para>
-     Intenta arreglar un sistema con dependencias actualmente rotas. Esta
-      opción usada conjuntamente con install/remove, puede omitir cualquier
-      paquete para permitir a APT deducir una posible solución. Cualquier paquete
-      especificado debe de corregir totalmente el problema. La opción es a
-      veces necesaria 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 (usualmente ejecutar
-       &dselect; o <command/dpkg --remove/ para desinstalar alguno de
-      los paquetes que crean el conflicto). El uso de esta opción
-      junto con <option/-m/ puede producir un error en algunas
-      situaciones. Opción de Configuración: <literal/APT::Get::Fix-Broken/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-m/</><term><option/--ignore-missing/</>
-                   <term><option/--fix-missing/</>
-     <ListItem><Para>
-     No tiene en cuenta los paquetes que no se hayan podido descargar o que
-      después de la descarga se encuentren dañados, estos paquetes se tratan
-      como no modificables y se continúa con el resto. Usar esta opción junto
-      con <option/-f/ puede producir un error en algunas situaciones. Si un
-      paquete se selecciona para su normal instalación (particularmente si
-      se hace mediante la línea de órdenes) y no puede ser descargado,
-      será tratado como no modificable. Opción de Configuración:
-      <literal/APT::Get::Fix-Missing/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--no-download/</>
-     <ListItem><Para>
-     Deshabilita la descarga de paquetes. Usada junto con
-     <option/--ignore-missing/ es la mejor manera de forzar a APT a usar
-      solo los .debs que ya se han descargado con anterioridad.
-      Opción de Configuración: <literal/APT::Get::Download/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-q/</><term><option/--quiet/</>
-     <ListItem><Para>
-     Silencioso. Produce una salida adecuada para un registro,
-      omitiendo los indicadores de progreso. Si se especifican más q's
-      (hasta un máximo de 2) se conseguirá una salida más
-      silenciosa. También es posible usar <option/-q=#/ para
-      seleccionar el nivel de silenciosidad, no teniendo en cuenta el
-      fichero de configuración. Dese cuenta que un nivel silencioso de
-      2 implica <option/-y/, por lo tanto nunca se deberá usar -qq sin
-      añadir un modificador para que no realice ninguna acción como
-      -d, --print-uris o -s para evitar que APT realice algo que usted
-      no espera. Opción de Configuración: <literal/quiet/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-s/</>
-                   <term><option/--simulate/</>
-		   <term><option/--just-print/</>
-		   <term><option/--dry-run/</>
-		   <term><option/--recon/</>
-		   <term><option/--no-act/</>
-     <ListItem><Para>
-     No realiza ninguna acción; simula lo que hubiese ocurrido, pero sin
-      hacer cambios reales en el sistema. Opción de Configuración:
-      <literal/APT::Get::Simulate/.
-     <para>
-     La simulación muestra por pantalla una serie de líneas, cada una de
-      las cuales representa una operación de dpkg, configurar (Conf),
-      desinstalar (Remv), o desempaquetar (Inst). Un par de corchetes
-      indican paquetes con dependencias rotas, si no hay nada entre ellos
-      significa que no hay ningún problema (poco probable).
-     </VarListEntry>
-
-     <VarListEntry><term><option/-y/</><term><option/--yes/</>
-                   <term><option/--assume-yes/</>
-     <ListItem><Para>
-     Asume una respuesta afirmativa a todas las preguntas, de esta forma
-      apt-get se ejecuta sin necesidad de intervención posterior para tomar
-      decisiones. <literal/apt-get/ terminará sin hacer nada si se
-      produjese una situación no deseada, como cambiar un paquete
-      puesto en hold (un paquete puesto en hold es un paquete que no
-      debe de ser modificado) o desinstalar un paquete esencial.
-      Opción de Configuración: <literal/APT::Get::Assume-Yes/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-u/</><term><option/--show-upgraded/</>
-     <ListItem><Para>
-     Muestra los paquetes que se van a actualizar. Opción de Configuración:
-     <literal/APT::Get::Show-Upgraded/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-V/</><term><option/--verbose-versions/</>
-     <ListItem><Para>
-     Muestra la versión completa para los paquetes actualizados e instalados.
-     Opción de configuración: <literal/APT::Get::Show-Versions/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-b/</><term><option/--compile/</>
-                   <term><option/--build/</>
-     <ListItem><Para>
-     Descarga las fuentes y luego las compila.
-      Opción de Configuración: <literal/APT::Get::Compile/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--ignore-hold/</>
-     <ListItem><Para>
-     No respeta los paquetes retenidos. Esto puede ser interesante junto con 
-     <literal/dist-upgrade/ para no tener en cuenta un gran número de
-      paquetes en hold. Opción de Configuración: <literal/APT::Ignore-Hold/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--no-upgrade/</>
-     <ListItem><Para>
-     No actualiza los paquetes. Cuando se usa juntamente con
-     <literal/install/, <literal/no-upgrade/ evita que se actualicen los
-     paquetes listados en la línea de órdenes si ya están previamente
-      instalados. Opción de Configuración: <literal/APT::Get::Upgrade/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--force-yes/</>
-     <ListItem><Para>
-     Supone una respuesta afirmativa a todas las preguntas. Ésta es una
-      opción peligrosa que hará que apt-get continúe incluso si va a
-      realizar algo potencialmente peligros. No se debe usar excepto
-      en situaciones muy especiales. ¡<literal/force-yes/ puede
-      destruir su sistema! Opción de Configuración:
-      <literal/APT::Get::force-yes/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--print-uris/</>
-     <ListItem><Para>
-     Muestra las URIs de los ficheros a instalar en vez de
-      descargarlos. Cada URI tiene la dirección de donde se obtendrá
-      el paquete, el fichero de destino, su tamaño y la suma de
-      control md5 esperada. Dese cuenta que el nombre de fichero no
-      siempre coincide con el nombre de fichero en el sitio
-      remoto. Esto también funciona con las ordenes <literal/source/ y
-      <literal/update/. Cuando se usa con la orden <literal/update/,
-      no se incluyen ni la suma de control MD5 ni el tamaño, y es
-      tarea del usuario descomprimir cualquier fichero comprimido.
-      Opción de Configuración: <literal/APT::Get::Print-URIs/. 
-     </VarListEntry>
-
-     <VarListEntry><term><option/--purge/</>
-     <ListItem><Para>
-     Borra los archivos de configuración de todos los paquetes que sean
-     desinstalados. Se mostrará un asterisco '*' a continuación de los paquetes
-     que se encuentren en esta situación. Opción de Configuración:
-     <literal/APT::Get::Purge/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--reinstall/</>
-     <ListItem><Para>
-     Reinstala los paquetes ya instalados, incluso si son la última versión
-      disponible del paquete. Opción de Configuración:
-      <literal/APT::Get::ReInstall/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--list-cleanup/</>
-     <ListItem><Para>
-     Esta opción está activada por omisión, si quiere desactivarla use
-     <literal/--no-list-cleanup/. Cuando está activada
-      <command/apt-get/ administra automáticamente los contenidos de
-      <filename>&statedir;/lists</> para asegurarse de que se borran
-      los ficheros obsoletos. La única razón para desactivarla es un
-      cambio frecuente en la lista de repositorios que usa
-      apt-get. Opción de Configuración: <literal/APT::Get::List-Cleanup/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-t/</>
-                   <term><option/--target-release/</>
-                   <term><option/--default-release/</>
-     <ListItem><Para>
-     Esta opción permite tener un control sobre la versión de la
-     distribución desde la cual se instalan los paquetes de manera
-     sencilla, creando un pin de 990 usando la cadena de caracteres
-     proporcionada que hace referencia a la distribución. Algunos ejemplos
-     comunes pueden ser <option>-t '2.1*'</> o <option>-t unstable</>.
-     Opción de configuración: <literal/APT::Default-Release/.
-     Vea además la página del manual de &apt-preferences;.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--trivial-only/</>
-     <ListItem><Para>
-     Sólo realiza acciones consideradas triviales. Esta opción está
-     relacionada con <option/--assume-yes/, donde <option/--assume-yes/
-     responderá afirmativamente a cualquier pregunta,
-     <option/--trivial-only/ responderá negativamente. 
-     Opción de configuración: <literal/APT::Get::Trivial-Only/.
-     </VarListEntry>
-
-     <VarListEntry><term><option/--no-remove/</>
-     <ListItem><Para>
-     Si algún paquete va a ser desinstalado apt-get termina inmediatamente. 
-     Opción de Configuración: <literal/APT::Get::Remove/
-     </VarListEntry>
-
-     <VarListEntry><term><option/--only-source/</>
-     <ListItem><Para>
-     Sólo tiene sentido para la orden <literal/source/. Indica que los
-     nombres de paquetes fuente dados no deben ser tratados a
-     través de la tabla de binarios. Esto significa que si se especifica esta
-     opción, la orden <literal/source/ sólo aceptará como argumentos nombres de
-     paquetes fuente, en vez de aceptar nombres de paquetes binarios y luego
-     buscar el nombre del paquete fuente correspondiente.
-     Opción de Configuración: <literal/APT::Get::Only-Source/
-     </VarListEntry>
-
-     <VarListEntry><term><option/--diff-only/</><term><option/--tar-only/</>
-     <ListItem><Para>
-     Descarga sólo el fichero diff o tar del archivo fuente. 
-     Opciones de Configuración: <literal/APT::Get::Diff-Only/ y 
-     <literal/APT::Get::Tar-Only/
-     </VarListEntry>
-     
-     <VarListEntry><term><option/--arch-only/</>
-     <ListItem><Para>
-     Procesa sólo las dependencias de construcción dependientes de la
-      arquitectura. Opción de configuración: <literal/APT::Get::Arch-Only/ 
-     </VarListEntry>
-     
-     &apt-commonoptions;
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Ficheros</>
-   <variablelist>
-     <VarListEntry><term><filename>/etc/apt/sources.list</></term>
-     <ListItem><Para>
-     Fichero que contiene los sitios de donde se obtienen los paquetes.
-     Opción de Configuración: <literal/Dir::Etc::SourceList/.
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>/etc/apt/apt.conf</></term>
-     <ListItem><Para>
-     Fichero de configuración de APT.
-     Opción de Configuración: <literal/Dir::Etc::Main/.
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>/etc/apt/apt.conf.d/</></term>
-     <ListItem><Para>
-     Directorio con fragmentos de ficheros de configuración APT.
-     Opción de Configuración: <literal/Dir::Etc::Parts/.
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>/etc/apt/preferences</></term>
-     <ListItem><Para>
-     Fichero de configuración que contiene preferencias sobre versiones de
-     paquetes, por ejemplo, puede especificar que un cierto paquete se descargue
-     de un sitio diferente, o de una distribución con una versión diferente.
-     Opción de Configuración: <literal/Dir::Etc::Preferences/.
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&cachedir;/archives/</></term>
-     <ListItem><Para>
-     Directorio donde se guardan los paquetes obtenidos.
-     Opción de Configuración: <literal/Dir::Cache::Archives/.
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&cachedir;/archives/partial/</></term>
-     <ListItem><Para>
-     Directorio donde se guardan los ficheros en tránsito.
-     Opción de Configuración: <literal/Dir::Cache::Archives/ (Implica partial).
-     </VarListEntry>
-     
-     <VarListEntry><term><filename>&statedir;/lists/</></term>
-     <ListItem><Para>
-     Directorio donde se almacena información de estado por cada
-     sitio especificado en &sources-list;
-     Opción de Configuración: <literal/Dir::State::Lists/.
-     </VarListEntry>
-  
-     <VarListEntry><term><filename>&statedir;/lists/partial/</></term>
-     <ListItem><Para>
-     Directorio de almacenamiento para la información de estado en tránsito.
-     Opción de Configuración: <literal/Dir::State::Lists/ (Implica partial).
-     </VarListEntry>     
-   </variablelist>
- </RefSect1>
-
- <RefSect1><Title>Vea además</>
-   <para>
-   &apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;,
-   &apt-config;, la guía de usuario de APT en &docdir;, &apt-preferences;, el
-   Cómo de APT.
- </RefSect1>
-
- <RefSect1><Title>Diagnósticos</>
-   <para>
-   <command/apt-get/ devuelve cero en operaciones satisfactorias, 100 en caso
-   de error.
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
- 
-</refentry>

doc/es/apt.conf.es.5.sgml

@@ -1,447 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!--
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Carlos Mestre <faraox@gulic.org> y
-Rubén Porras Campo <nahoo@inicia.es>.
-Está basada en la página de manual original:
-versión 1.6 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt.conf.5.sgml
--->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>apt.conf</>
-   <manvolnum>5</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt.conf</>
-    <refpurpose>Archivo de configuración de APT</>
- </refnamediv>
- 
- <RefSect1><Title>Descripción</>
-   <para>
-   <filename/apt.conf/ es el fichero principal de configuración del conjunto de
-   herramientas APT, todas las herramientas hacen uso del fichero de
-   configuración y un analizador común de sintaxis de la línea de órdenes
-   para proporcionar un entorno uniforme. Cuando se inicia una utilidad APT,
-   este leerá la configuración especificada en la variable de entorno
-   <envar/APT_CONFIG/ (si existe), luego leerá los ficheos en
-   <literal/Dir::Etc::Parts/, entonces leerá el fichero de configuración
-   principal especificado por <literal/Dir::Etc::main/, finalmente aplicará
-   las opciones de la línea de órdenes para reescribir la directrices de la
-   configuración, posiblemente cargando incluso más ficheros de configuración.
-   <para>
-   El fichero de configuración está organizado en forma de árbol con las
-   opciones organizadas en grupos funcionales. Las opciones especificadas son
-   dadas con dobles dos puntos, por ejemplo <literal/APT::Get::Assume-Yes/ es
-   un opción de la función GET del conjunto de herramientas APT.
-   Las opciones no son heredadas de sus grupos padres.
-   <para>
-   Sintácticamente, el lenguaje de configuración es modelado como en utilidades
-   ISC, como bind y dhcp. Las líneas que comienzan con <literal>//</literal> se
-   tratan como comentarios (se ignoran). Cada línea es de la forma
-   <literallayout>APT::Get::Assume-Yes "true";</literallayout> Los 
-   espacios entre los dos puntos son obligatorios, y las comillas son
-   opcionales. Un nuevo ámbito puede abrirse con llaves, por ejemplo:
-<informalexample><programlisting>   
-APT {
-  Get {
-    Assume-Yes "true";
-    Fix-Broken "true";
-  };
-};
-</programlisting></informalexample>
-   con nuevas líneas en cada lugar para hacerlo más legible. Las listas pueden
-   crearse abriendo un nuevo ámbito e incluyendo una única palabra acotada
-   entre comillas seguido de un punto y coma. Pueden ser incluidas múltiples
-   entradas, cada una separada por un punto y coma.
-<informalexample><programlisting>   
-DPkg::Pre-Install-Pkgs {"/usr/sbin/dpkg-preconfigure --apt";};
-</programlisting></informalexample>
-   <para>
-   En general, el fichero de configuración de ejemplo
-   <filename>&docdir;examples/apt.conf</> &configureindex; es una buena guía
-   para entender su aspecto.
-   <para>
-   Se permiten dos valores especiales, <literal/#include/ y <literal/#clear/. 
-   <literal/#include/ incluirá el fichero dado, a menos que el final del nombre
-   del fichero acabe en una barra, entonces se incluye el directorio entero.
-   <literal/#clear/ se usa para suprimir la lista de nombres.
-   <para>
-   Todas las utilidades APT permiten la opción -o como una directriz
-   arbitraria de configuración que es especificada en la línea de órdenes. La
-   sintaxis es un nombre de opción completo (<literal/APT::Get::Assume-Yes/
-   por ejemplo) seguido por signos de igualdad y el nuevo valor de la
-   opción. Las listas también pueden ser añadidas incluyendo :: al final del
-   nombre de la lista.
-   </RefSect1>
-
- <RefSect1><Title>El grupo APT</>
-   <para>   
-   Este grupo de opciones controlan la conducta general de APT así como el
-   mantenimiento de las opciones para todas las utilidades.
-   <VariableList>
-     <VarListEntry><Term>Arquitectura</Term>
-     <ListItem><Para>
-     Arquitectura del sistema; ajusta la arquitectura a usar cuando se obtengan
-     los ficheros y se analicen las listas de paquetes. El valor por defecto es
-     la arquitectura para la que ha sido compilado apt.
-     </VarListEntry>
-     
-     <VarListEntry><Term>Ignore-Hold</Term>
-     <ListItem><Para>
-     Ignorar paquetes retenidos: Esta opción global causa que el solucionador de
-     problemas ignore paquetes retenidos cuando tome decisiones.
-     </VarListEntry>
-
-     <VarListEntry><Term>Clean-Installed</Term>
-     <ListItem><Para>
-     Activo por defecto. Cuando se activa la función de auto-limpieza, ésta
-     eliminará cualquier paquete de la caché que ya no pueda descargarse. Si se
-     desactiva, entonces los paquetes que están localmente instalados son
-     excluidos de la limpieza - nótese que APT no provee ningún medio directo
-     para reinstalarlos.
-     </VarListEntry>
-
-     <VarListEntry><Term>Immediate-Configure</Term>
-     <ListItem><Para>
-     Deshabilita la configuración inmediata: Esta peligrosa opción
-     deshabilita algunas partes del código de ordenación de APT para inducir a éste
-     a hacer pocas llamadas a dpkg. Hacer esto podría ser necesario en algún
-     sistema de usuario extremadamente lento, pero sería muy peligroso y
-     podría causar que los scripts de instalación del paquete fallaran o algo
-     peor. Úselo a su cuenta y riesgo.
-     </VarListEntry>
-
-     <VarListEntry><Term>Force-LoopBreak</Term>
-     <ListItem><Para>
-     Nunca habilite esta opción a menos que usted -realmente- conozca lo que
-     está haciendo. Esto permite a APT eliminar temporalmente un paquete
-     esencial para romper conflictos o bucles conflictos/pre-dependencias
-     entre dos paquetes esenciales. EL BUCLE NO DEBERÍA EXISTIR NUNCA COMO TAL
-     Y ES UN ERROR GRAVE. Esta opción trabajará si el paquete esencial no es
-     tar, gzip, libc, dpkg, bash o cualquier otro del que dependan estos
-     paquetes.
-     </VarListEntry>
-
-     <VarListEntry><Term>Cache-Limit</Term>
-     <ListItem><Para>
-     APT usa un fichero de caché de memoria mapeada de tamaño fijo para
-     almacenar la información disponible. Esto fija el tamaño de esa caché.
-     </VarListEntry>
-
-     <VarListEntry><Term>Build-Essential</Term>
-     <ListItem><Para>
-     Define que paquete(s) son considerados dependencias de construcción
-     esenciales.
-     </VarListEntry>
-
-     <VarListEntry><Term>Get</Term>
-     <ListItem><Para>
-     La subsección Get controla la herramienta &apt-get;, por favor, mire su
-     documentación para más información sobre esta opción.
-     </VarListEntry>
-
-     <VarListEntry><Term>Cache</Term>
-     <ListItem><Para>
-     La subsección Cache controla la herramienta &apt-cache;, por favor, mire
-     su documentación para más información sobre esta opción.
-     </VarListEntry>
-
-     <VarListEntry><Term>CDROM</Term>
-     <ListItem><Para>
-     La subsección CDROM controla la herramienta &apt-cdrom;, por favor, mire
-     la documentación para más información sobre esta opción.
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>El grupo Acquire</>
-   <para>   
-   El grupo de opciones <literal/Acquire/ controla la descarga de paquetes y los
-   manejadores de URI.
-   <VariableList>
-     <VarListEntry><Term>Queue-Mode</Term>
-     <ListItem><Para>
-     Modo de cola; <literal/Queue-Mode/ puede ser <literal/host/ o
-     <literal/access/ que determina como paralelizar las conexiones salientes
-     de APT. <literal/host/ significa que se abrirá una conexión
-     por puesto de destino, <literal/access/ significa que será abierta una
-     conexión por cada tipo de URI.
-     </VarListEntry>
-
-     <VarListEntry><Term>Retries</Term>
-     <ListItem><Para>
-     Número de reintentos. Si es distinto de cero APT volverá a intentar obtener
-     los ficheros fallidos el número de veces dado.
-     </VarListEntry>
-
-     <VarListEntry><Term>Source-Symlinks</Term>
-     <ListItem><Para>
-     Usar enlaces simbólicos para los archivos fuente. Si es true los archivos
-     fuente se enlazarán a ser posible, en vez de copiarse. Por omisión es true.
-     </VarListEntry>
-
-     <VarListEntry><Term>http</Term>
-     <ListItem><Para>
-     HTTP URIs; http::Proxy es el proxy http predeterminado a usar. Usa el
-     formato general <literal>http://[[usuario][:clave]@]puesto[:puerto]/</>.
-     También se puede especificar un proxy por cada puesto usando la forma 
-     <literal/http::Proxy::&lt;puesto&gt;/ con la palabra especial <literal/DIRECT/ 
-     queriendo decir que no se use proxy. La variable de entorno
-     <envar/http_proxy/ modifica todas las preferencias.
-     <para>
-     Para los proxies que cumplen con HTTP/1.1 se proporcionan tres opciones de
-     configuración. <literal/No-Cache/ dice al proxy que no use su caché bajo
-     ninguna circunstancia, <literal/Max-Age/ sólo se envía para los ficheros de
-     índice y le pide a la caché que refresque su copia si es más antigua que
-     un determinado número de segundos. Debian actualiza sus ficheros de índices
-     diariamente, debido a esto el valor predeterminado es 1 día.
-     <literal/No-Store/ especifica que la caché nunca deberá almacenar la
-     petición, sólo está habilitada para los ficheros de archivo. Puede ser
-     útil para prevenir que un proxy se contamine con ficheros .deb muy
-     grandes. Nota: Squid 2.0.2 no soporta ninguna de estas opciones.
-     <para>
-     La opción <literal/timeout/ establece el tiempo máximo de espera del
-     método, esto se aplica a todo, incluyendo el tiempo de espera para realizar
-     la conexión y para recibir datos.
-     <para>
-     Se proporciona una opción para controlar la profundidad de la tubería en
-     casos en que el servidor no cumpla con RFC o tenga fallos (como pasa con
-     Squid 2.0.2).
-     <literal/Acquire::http::Pipeline-Depth/ puede ser un valor entre 0 y 5 
-     indicando cuantas peticiones sin resolver puede envíar APT. DEBE
-     especificarse si el puesto remoto no demora apropiadamente las conexiones
-     TCP - de otro modo los datos se corromperán. Los puesto que necesiten esto
-     violan el RFC 2068.
-     </VarListEntry>
-
-     <VarListEntry><Term>ftp</Term>
-     <ListItem><Para>
-     FTP URIs; ftp::Proxy es el servidor proxy a usar de forma
-     predeterminada. Se encuentra en el formato estándar
-     <literal>ftp://[[usuario][:clave]@]puesto[:puerto]/</> y se modifica mediante
-     la variable de entorno <envar/ftp_proxy/. Para usar un proxy ftp es
-     necesario establecer el script <literal/ftp::ProxyLogin/ en el fichero de
-     configuración. Esta entrada especifica órdenes que se mandan al servidor
-     proxy para decirle a donde debe conectarse. Consulte &configureindex; para
-     ver un ejemplo de como hacerlo. Las variables de substitución disponibles
-     son <literal/$(PROXY_USER)/, <literal/$(PROXY_PASS)/,
-     <literal/$(SITE_USER)/, <literal/$(SITE_PASS)/, <literal/$(SITE)/, y
-     <literal/$(SITE_PORT)/. Cada una se toma del componete de la URI
-     correspondiente. 
-     <para>
-     La opción <literal/timeout/ establece el tiempo máximo de espera del
-     método, esto se aplica a todo, incluyendo el tiempo de espera para realizar
-     la conexión y para recibir datos.
-     <para>
-     Se proporcionan varias opciones para controlar el modo pasivo. Generalmente
-     es seguro dejar activado el modo pasivo, funciona en casi todos los
-     entornos. Sin embargo algunas situaciones requieren desactivar el modo
-     pasivo y usar el modo puerto e su lugar. Esto se puede hacer globalmente,
-     para conexiones a través de proxy o para un puesto específico (Consulte el
-     fichero de configuración de muestra para ver ejemplos).
-     <para>
-     Es posible usar proxy FTP a través de HTTP estableciendo la variable de
-     entorno <envar/ftp_proxy/ a una dirección http - mire la discusión del
-     método http de arriba para la sintaxis. No se puede habilitar en el fichero
-     de configuración y no se recomienda su uso debido a su poca eficiencia.
-     <para>
-     La opción <literal/ForceExtended/ controla el uso de las órdenes de RFC2428 
-     <literal/EPSV/ y <literal/EPRT/. Por omisión es false, que quiere decir que
-     sólo se usan si el control de conexión es IPv6. Poniéndolo a true fuerza su
-     uso incluso en conexiones IPv4. Dese cuenta que la mayoría de los
-     servidores FTP no soportan RFC2428.
-     </VarListEntry>
-
-     <VarListEntry><Term>cdrom</Term>
-     <ListItem><Para>
-     CDROM URIs; la única opción de configuración para los CDROM es el punto de
-     montaje, <literal/cdrom::Mount/ debe ser el punto de montaje de la unidad
-     de CDROM tal y como se especifica en <filename>/etc/fstab</>. Es posible
-     proporcionar órdenes mount y unmount alternativas si el punto de montaje no
-     puede especificarse en fstab (como con SMB y versiones de mount
-     antiguas). Respecto a la sintaxis se pone <literallayout>"/cdrom/"::Mount
-     "tal";</literallayout> dentro del bloque cdrom. Es importante no tener una
-     barra final. Las órdenes de unmount pueden especificarse usando UMount.
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Directorios</>
-   <para>   
-   La sección <literal/Dir::State/ contiene directorios que pertenecen a
-   información del estado local. <literal/lists/ es el directorio donde se
-   almacenan las listas de paquetes descargados y <literal/status/ es el nombre
-   del fichero de estado de dpkg.
-   <literal/preferences/ es el nombre del fichero de preferencias de APT.
-   <literal/Dir::State/ contiene el directorio que se usará como prefijo por
-   omisión en todas las opciones restantes en caso de que no empiezen con
-   <filename>/</> o <filename>./</>.
-   <para>
-   <literal/Dir::Cache/ contiene lugares pertenecientes a información de la
-   caché local, como las dos cachés de paquetes <literal/srcpkgcache/ y 
-   <literal/pkgcache/ o como el lugar donde se guardan los ficheros descargados, 
-   <literal/Dir::Cache::archives/. La generación de cachés puede desactivarse
-   dejando sus nombres en blanco. Ésto enlentecerá el arranque pero ahorrará
-   espacio. Normalmente se prefiere deshabilitar pkgcache en vez de
-   srcpkgcache. Al igual que con <literal/Dir::State/ el directorio
-   predeterminado está en <literal/Dir::Cache/
-   <para>
-   <literal/Dir::Etc/ contiene el lugar de los ficheros de configuración, 
-   <literal/sourcelist/ contiene el lugar de sourcelist y <literal/main/ es el
-   fichero de configuración predeterminado (esta opción de configuración no
-   tiene ningún efecto a menos que se realice desde el fichero de configuración
-   especificado por <envar/APT_CONFIG/).
-   <para>
-   La opción <literal/Dir::Parts/ lee en todos los fragementos de configuración
-   en orden léxico <!--¿Y esto qué es?--> desde el directorio
-   especificado. Después de esto se carga el fichero principal de configuración.
-   <para>
-   <literal/Dir::Bin/ apunta a los programas
-   binarios. <literal/Dir::Bin::Methods/ especifica la localización de los
-   manejadores de los métodos y <literal/gzip/, <literal/dpkg/,
-   <literal/apt-get/, <literal/dpkg-source/, <literal/dpkg-buildpackage/ y
-   <literal/apt-cache/ especifican la localización de los respectivos programas.
- </RefSect1>
- 
- <RefSect1><Title>APT con DSelect</>
-   <para>   
-   Cuando APT se usa como método de &dselect; varias directivas de configuración
-   controlan el comportamiento predeterminado. Se encuentran en la sección
-   <literal/DSelect/.
-   
-   <VariableList>
-     <VarListEntry><Term>Clean</Term>
-     <ListItem><Para>
-     Modo de borrado de caché; este valor puede ser always, prompt, auto,
-     pre-auto y never. always y prompt borrarán todos los paquetes de la caché
-     después de actualizar, prompt (predeterminado) pregunta primero. 
-     auto borra sólo aquellos paquetes que ya no se pueden descargar (han sido
-     reemplazados por otra versión, por ejemplo). pre-auto realiza esta última
-     acción antes de descargar los paquetes nuevos.
-     </VarListEntry>
-
-     <VarListEntry><Term>Options</Term>
-     <ListItem><Para>
-     El contenido de esta variable se pasa a &apt-get; como opciones de línea de
-     ordenes cuando se ejecuta en la fase de instalación.
-     </VarListEntry>
-
-     <VarListEntry><Term>UpdateOptions</Term>
-     <ListItem><Para>
-     El contenido de esta variable se pasa a &apt-get; como opciones de línea de
-     ordenes cuando se ejecuta en la fase de actualización.
-     </VarListEntry>
-
-     <VarListEntry><Term>PromptAfterUpdate</Term>
-     <ListItem><Para>
-     Si es true la operación de [U]pdate en &dselect; preguntará siempre antes
-     de continuar. Por omisión sólo pregunta en caso de error.
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
- 
-  <RefSect1><Title>Como APT llama a dpkg</>
-   <para>   
-   Varias directivas de configuración controlan como APT llama a &dpkg;. Se
-   encuentran en la sección <literal/DPkg/.
-
-   <VariableList>
-     <VarListEntry><Term>Options</Term>
-     <ListItem><Para>
-     Lista de opciones que se pasan a dpkg. Las opciones deben especificarse
-     usando la notación de lista y cada elemento de la lista se pasa a &dpkg;
-     como un sólo argumento.
-     </VarListEntry>
-     
-     <VarListEntry><Term>Pre-Invoke</Term><Term>Post-Invoke</Term>
-     <ListItem><Para>
-     Es una lista de órdenes de shell que se ejecutarán antes de llamar a
-     &dpkg;. Como <literal/Options/, debe de especificarse con notación de
-     lista. Las órdenes se ejecutan en orden usando <filename>/bin/sh</>, si
-     alguna falla APT abortará.
-     </VarListEntry>
-
-     <VarListEntry><Term>Pre-Install-Pkgs</Term>
-     <ListItem><Para>
-     Lista de órdenes de shell que se ejecutarán antes de llamar a
-     &dpkg;. Como <literal/Options/, debe de especificarse con notación de
-     lista. Las órdenes se ejecutan en orden usando <filename>/bin/sh</>, si
-     alguna falla APT abortará. APT pasará a los programas los nombres de
-     fichero de todos los .deb que va ha instalar por la entrada estándar, uno
-     por línea.
-     <para>
-     La versión 2 de este protocolo vuelca más información, incluyendo la
-     versión del protocolo, el espacio de configuración de APT <!--Esto suena
-     raro-->, los ficheros y versiones que cambian. La versión 2 se habilita
-     estableciendo <literal/DPkg::Tools::Options::cmd::Version/ a
-     2. <literal/cmd/ es una orden dada a <literal/Pre-Install-Pkgs/.
-     </VarListEntry>
-
-     <VarListEntry><Term>Run-Directory</Term>
-     <ListItem><Para>
-     APT hace que éste sea su directorio de trabajo antes de llamar a dpkg, por
-     omisión es <filename>/</>.
-     </VarListEntry>
-
-     <VarListEntry><Term>Build-Options</Term>
-     <ListItem><Para>
-     Éstas opciones se pasan a &dpkg-buildpackage; cuando compila paquetes,
-     por omisión se limita a deshabilitar el firmado de paquetes y producir
-     todos los binarios.
-     </VarListEntry>
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Opciones de depuración</>
-   <para>   
-   La mayoría de las opciones de la sección <literal/debug/ no son interesantes
-   para el usuario normal, sin embargo <literal/Debug::pkgProblemResolver/
-   muestra una salida interesante acerca de las decisiones que realiza
-   dist-upgrade. <literal/Debug::NoLocking/ deshabilita el bloqueo de fichero de
-   forma que APT puede realizar algunas operaciones sin permisos de superusuario
-   y <literal/Debug::pkgDPkgPM/ mostrará la línea de órdenes para cada llamada a
-   dpkg. <literal/Debug::IdentCdrom/ deshabilitará la inclusión de datos de
-   statfs <!--¿ésto es correcto-->en los ID's de los CDROM.
- </RefSect1>
- 
- <RefSect1><Title>Ejemplos</>
-   <para>
-   &configureindex; contiene un fichero de configuración de ejemplo mostrando
-   los valores predeterminados para todas las opciones posibles.
- </RefSect1>
- 
- <RefSect1><Title>Ficheros</>
-   <para>
-   <filename>/etc/apt/apt.conf</>
- </RefSect1>
- 
- <RefSect1><Title>Véase también</>
-   <para>
-   &apt-cache;, &apt-config;<!-- ? reading apt.conf -->, &apt-preferences;.
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
- 
-</refentry>

doc/es/apt.ent.es

@@ -1,155 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-
-<!--
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.3 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt.ent
--->
-
-<!-- Some common paths.. -->
-<!ENTITY docdir "/usr/share/doc/apt/">
-<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
-<!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
-<!ENTITY statedir "/var/lib/apt">
-<!ENTITY cachedir "/var/cache/apt">
-
-<!-- Cross references to other man pages -->
-<!ENTITY apt-conf "<CiteRefEntry>
-    <RefEntryTitle><filename/apt.conf/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY apt-get "<CiteRefEntry>
-    <RefEntryTitle><command/apt-get/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-config "<CiteRefEntry>
-    <RefEntryTitle><command/apt-config/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-cdrom "<CiteRefEntry>
-    <RefEntryTitle><command/apt-cdrom/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-cache "<CiteRefEntry>
-    <RefEntryTitle><command/apt-cache/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-preferences "<CiteRefEntry>
-    <RefEntryTitle><command/apt_preferences/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY sources-list "<CiteRefEntry>
-    <RefEntryTitle><filename/sources.list/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY reportbug "<CiteRefEntry>
-    <RefEntryTitle><command/reportbug/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-buildpackage "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY gzip "<CiteRefEntry>
-    <RefEntryTitle><command/gzip/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-scanpackages "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-scansources "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dselect "<CiteRefEntry>
-    <RefEntryTitle><command/dselect/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-    
-<!-- Boiler plate docinfo section -->
-<!ENTITY apt-docinfo "
- <docinfo>
-   <address><email>apt@packages.debian.org</></address>
-   <author><firstname>Jason</> <surname>Gunthorpe</></>
-   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>
-   <date>12 March 2001</>
- </docinfo>
-"> 
-
-<!-- Boiler plate Bug reporting section -->
-<!ENTITY manbugs "
- <RefSect1><Title>Fallos</>
-   <para>
-   Vea la <ulink url='http://bugs.debian.org/src:apt'>página de fallos de APT</>.
-   Si desea avisar de un fallo en APT, vea 
-   <filename>/usr/share/doc/debian/bug-reporting.txt</> o la orden  &reportbug;.
- </RefSect1>
-">
-
-<!-- Boiler plate Author section -->
-<!ENTITY manauthor "
- <RefSect1><Title>Autor</>
-   <para>
-   APT fue escrito por el equipo de APT <email>apt@packages.debian.org</>.
- </RefSect1>
-">
-
-<!-- Should be used within the option section of the text to
-     put in the blurb about -h, -v, -c and -o -->
-<!ENTITY apt-commonoptions "
-     <VarListEntry><term><option/-h/</><term><option/--help/</>
-     <ListItem><Para>
-     Muestra un breve resumen del modo de uso.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-v/</><term><option/--version/</>
-     <ListItem><Para>
-     Muestra la versión del programa.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-c/</><term><option/--config-file/</>
-     <ListItem><Para>
-     Especifica el fichero de configuración a usar.
-     El programa leerá el fichero de configuración por omisión y luego
-     este otro. Lea &apt-conf; para más información acerca de la sintaxis.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-o/</><term><option/--option/</>
-     <ListItem><Para>
-     Establece una opción de configuración. La sintaxis es <option>-o
-     Foo::Bar=bar</>. 
-     </VarListEntry>
-">
-
-<!-- Should be used within the option section of the text to
-     put in the blurb about -h, -v, -c and -o -->
-<!ENTITY apt-cmdblurb "
-   <para>
-   Todas las opciones de línea de órdenes pueden ser especificadas
-   mediante el fichero de configuración, en la descripción de cada opción
-   se indica la opción de configuración que hay que modificar. Para
-   opciones booleanas puedes modificar el fichero de configuración usando
-   cosas parecidas a <option/-f-/,<option/--no-f/, <option/-f=no/ y alguna que
-   otra variante.
-   </para>
-">

doc/es/apt.es.8

@@ -1,55 +0,0 @@
-.\" This manpage is copyright (C) 1998 Branden Robinson <branden@debian.org>.
-.\" This translation is copyright (C) 2003 The Spanish translation group
-.\"  <debian-l10n-spanish@lists.debian.org>
-.\" 
-.\" This is free software; you may redistribute it and/or modify
-.\" it under the terms of the GNU General Public License as
-.\" published by the Free Software Foundation; either version 2,
-.\" or (at your option) any later version.
-.\"
-.\" This is distributed in the hope that it will be useful, but
-.\" WITHOUT ANY WARRANTY; without even the implied warranty of
-.\" MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-.\" GNU General Public License for more details.
-.\"
-.\" You should have received a copy of the GNU General Public
-.\" License along with APT; if not, write to the Free Software
-.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 
-.\" 02111-1307 USA
-.TH apt 8 "16 Junio 1998" "Debian GNU/Linux"
-.SH NOMBRE
-apt \- Herramienta Avanzada de Paquetes
-.SH SINOPSIS
-.B apt
-.SH DESCRIPCIÓN
-APT es un sistema de gestión de paquetes de software. No hay aún interfaces
-amigables para éste, ya que está aún en desarrollo. Consulte mientras
-tanto, 
-.BR apt-get (8).
-.SH OPCIONES
-Ninguna.
-.SH FICHEROS
-Ninguno.
-.SH LEA TAMBIEN
-.BR apt-cache (8),
-.BR apt-get (8),
-.BR apt.conf (5),
-.BR sources.list (5)
-.SH DIAGNÓSTICO
-apt devuelve cero cuando no ocurre ningún error. Si hay algún error
-devuelve el valor 100.
-.SH ERRATAS
-Esta página de manual no está siquiera iniciada.
-.PP
-Consulte <http://bugs.debian.org/apt>. Si desea enviar un informe de error
-en
-.BR apt ,
-por favor lea
-.I /usr/share/doc/debian/bug-reporting.txt
-o el programa
-.BR reportbug (1)
-.SH AUTOR
-El equipo APT <apt@packages.debian.org> escribió apt.
-La traducción de esta página de manual fue iniciada por
-Rudy Godoy <rudy@kernel-panik.org> y revisada posteriormente por 
-Ismael Fanlo, Rubén Porras y Javier Fernández-Sanguino.

doc/es/apt_preferences.es.5.sgml

@@ -1,587 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-y revisada por Javier Fernández-Sanguino <jfs@computer.org> 
-Está basada en la página de manual original:
-versión 1.5 del CVS de
-/cvs/debian-doc/manpages/english/apt/apt_preferences.5.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
-
- <refmeta>
-   <refentrytitle>apt_preferences</>
-   <manvolnum>5</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt_preferences</>
-    <refpurpose>Fichero de preferencias de APT</>
- </refnamediv>
-
-<RefSect1>
-<Title>Descripción</Title>
-<para>
-El fichero de preferencias de APT <filename>/etc/apt/preferences</>
-se puede usar para controlar las versiones de los paquetes seleccionados.
-</para>
-
-<para>Cuando el fichero &sources-list; contiene referencias a más de una
-distribución (por ejemplo, <literal>estable</literal> y <literal>pruebas
-</literal>). APT asigna una prioridad a cada versión disponible. 
-Limitado por las dependencias, <command>apt-get</command> selecciona la versión
-con mayor prioridad.
-</para>
-
-<para>El fichero de preferencias de APT modifica las prioridades asignadas por
-APT, dando control al usuario sobre que ejemplar se seleccionará para la
-instalación.
-</para>
-<para>
-Puede estén disponibles varios ejemplares de la misma versión de un paquete
-cuando el fichero &sources-list; contenga referencias a más de una fuente. En
-este caso <command>apt-get</command> descarga el ejemplar que aparezca listado
-primero en el fichero &sources-list;. El fichero de preferencias de APT no
-modifica la elección del ejemplar, sólo la elección de la versión.
-</para>
-<RefSect2><Title>¿Cómo asigna APT las prioridades?</>
-
-<para>Si no existe el fichero de preferencias o no hay ninguna entrada en éste
-que se pueda aplicar a una determinada versión, se asigna a la versión la 
-prioridad de la distribución a la que pertenece. Es posible seleccionar una 
-distribución, &gt;&gt;distribución objetivo&lt;&lt; 
-(n. t. del inglés <emphasis>target release</emphasis>), que recibe
-una prioridad mayor que el resto. La distribución objetivo se puede definir
-en la línea de órdenes al ejecutar <command>apt-get</command> o en el fichero
-de configuración de APT (<filename>/etc/apt/apt.conf</filename>).
-Por ejemplo,
-<programlisting>
-<command>apt-get install -t testing <replaceable>paquete</replaceable></command>
-</programlisting>
-<programlisting>
-APT::Default-Release "stable";
-</programlisting>
-</para>
-
-<para>
-Si se ha especificado una distribución objetivo, APT usa el siguiente
-algoritmo para establecer las prioridades de cada versión de un paquete. 
-Asigna:
-
-<variablelist>
-<varlistentry>
-<term>prioridad 100</term>
-<listitem><simpara>a la versión instalada (si existe).</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>prioridad 500</term>
-<listitem><simpara>a la versión que ni está instalada ni pertenece a la 
-distribución objetivo.</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>prioridad 990</term>
-<listitem><simpara>a las versiones que no están instaladas pero que
-pertenecen a la distribución objetivo.</simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a
-todas las versiones de los paquetes instalados y 500 al resto.
-</para>
-
-<para>
-APT aplica las siguientes normas, expuestas por orden de precedencia, 
-para determinar qué versión del paquete debe instalar.
-
-<itemizedlist>
-<listitem><simpara>Nunca instalar una versión anterior de un paquete en lugar 
-de la instalada a menos que la prioridad de la versión disponible supere 1000 
-(Dese cuenta que ninguna de las prioridades que asigna APT por omisión superan
-1000, éstas prioridades sólo se pueden establecer mediante el fichero de 
-preferencias. Tenga en consideración que instalar una versión anterior del
-paquete puede ser peligroso).
-</simpara></listitem>
-<listitem><simpara>Instalar la versión de mayor prioridad.
-</simpara></listitem>
-<listitem><simpara>Si dos o más versiones tienen la misma prioridad, 
-instala la más reciente (esto es, la que tiene un número de versión mayor).
-</simpara></listitem>
-<listitem><simpara>Si dos o más versiones tienen la misma prioridad y número de
-versión, pero o bien difieren en su meta-información o se ha proporcionado la
-opción <literal/--reinstall/ se instala la que no está instalada.
-</simpara></listitem>
-</itemizedlist>
-</para>
-
-<para>
-Típicamente, la versión instalada del paquete (prioridad 100)
-no es tan reciente como la disponible a través de &sources-list; 
-(prioridad 500 o 990). Entonces el paquete se actualizará cuando se ejecute
-<command>apt-get install <replaceable>algún-paquete</replaceable></command> o
-<command>apt-get upgrade</command>.
-</para>
-
-<para>Rara vez la versión instalada de un paquete es <emphasis/más/ reciente
-que cualquiera de las versiones disponibles. En éste caso no se instalará la
-versión anterior del paquete cuando se ejecute <command>apt-get install
-<replaceable>algún-paquete</replaceable></command> o <command>apt-get
-upgrade</command>.
-</para>
-
-<para>
-A veces la versión instalada de un paquete es más reciente que la 
-versión perteneciente a la distribución objetivo, pero no tan reciente como la 
-versión de otra distribución. Este tipo de paquetes se actualizarán cuando se
-ejecute <command>apt-get install
-<replaceable>algún-paquete</replaceable></command> o <command>apt-get 
-upgrade</command> porque al menos <emphasis/uno/ de los ejemplares disponibles
-tiene una prioridad mayor que la versión instalada.
-</para>
-
-</RefSect2>
-
-<RefSect2><Title>El efecto de las preferencias sobre APT</>
-
-<para>
-El fichero de preferencias de APT permite al administrador del sistema controlar
-las asignaciones de prioridades. El fichero consiste en uno o más registros de
-varias líneas separados entre sí por espacios en blanco. Los registros pueden
-tener una o dos formas: una específica y otra general.
-<itemizedlist>
-<listitem>
-<simpara>
-La forma específica asigna una prioridad ("Pin-Priority") a un paquete
-concreto y se aplica a una versión o rango de versiones. Por ejemplo,
-el siguiente registro asigna una prioridad alta a todas las versiones del
-paquete <filename/perl/ cuyo número de versión empiece con "<literal/5.8/".
-</simpara>
-
-<programlisting>
-Package: perl
-Pin: version 5.8*
-Pin-Priority: 1001
-</programlisting>
-</listitem>
-
-<listitem><simpara>
-La forma general asigna una prioridad a todas las versiones de los paquetes
-en una distribución (esto es, a todas las versiones de paquetes provenientes
-de un fichero <filename/Release/), o a todos las versiones de un paquete
-que provienen de un sitio concreto en internet, identificado por su
-nombre de dominio.
-</simpara>
-
-<simpara>
-Esta forma general del fichero de preferencias de APT sólo se aplica a grupos de
-paquetes. Por ejemplo, el siguiente registro hace que asigne una prioridad alta
-a todas las versiones disponibles desde un sitio local.
-</simpara>
-
-<programlisting>
-Package: *
-Pin: origin ""
-Pin-Priority: 999
-</programlisting>
-
-<simpara>
-Un aviso acerca de la palabra clave usada en "<literal/origin/": no debe de
-confundirse con el origen ("Origin:") de una distribución tal y como se
-especifica en el fichero <filename/Release/. Lo que sigue a "Origin:" en un
-fichero <filename/Release/ no es una dirección de un sitio de internet, sino el
-autor o el nombre del proveedor, tales como "Debian" o "Ximian".
-</simpara>
-
-<simpara>
-El siguiente registro asigna una prioridad baja a todas las versiones de los
-paquetes pertenecientes a cualquier distribución que tenga como nombre de
-Archivo "<literal/unstable/".
-</simpara>
-
-<programlisting>
-Package: *
-Pin: release a=unstable
-Pin-Priority: 50
-</programlisting>
-
-<simpara>
-El siguiente registro asigna una prioridad alta a todas las versiones de los
-paquetes pertenecientes a la distribución que tiene como nombre de Archivo
-"<literal/stable/" y como número de versión "<literal/3.0/".
-</simpara>
-
-<programlisting>
-Package: *
-Pin: release a=unstable, v=3.0
-Pin-Priority: 50
-</programlisting>
-</listitem>
-</itemizedlist>
-</para>
-
-</RefSect2>
-
-<RefSect2>
-<Title>¿Cómo interpreta APT las prioridades?</Title>
-
-<para>
-Las prioridades (P) asignadas en el fichero de preferencias deben ser
-números enteros. Se interpretan (en general) del siguiente modo:
-
-<variablelist>
-<varlistentry>
-<term>P &gt; 1000</term>
-<listitem><simpara>la versión se instala incluso si es una versión
-anterior a la instalada en el sistema.</simpara></listitem>
-</varlistentry>
-<varlistentry><term>990 &lt; P &lt;=1000</term>
-<listitem><simpara>la versión se instala aunque no venga de la distribución
-objetivo, a menos que la versión instalada sea más reciente.
-</simpara></listitem> 
-</varlistentry>
-<varlistentry><term>500 &lt; P &lt;=990</term>
-<listitem><simpara>la versión se instala a menos que exista otro ejemplar
-disponible perteneciente a la distribución objetivo o bien la versión 
-instalada sea más reciente.</simpara></listitem>
-</varlistentry>
-<varlistentry><term>100 &lt; P &lt;=500</term>
-<listitem><simpara>la versión se instala a menos que exista un ejemplar
-perteneciente a otra distribución o la versión instalada sea más reciente.
-</simpara></listitem>
-<varlistentry><term>0 &lt; P &lt;=100</term>
-<listitem><simpara>la versión sólo se instala si no hay ninguna versión 
-del paquete instalado.</simpara></listitem>
-</varlistentry>
-<varlistentry><term>P &lt; 0</term>
-<listitem><simpara>la versión nunca se instala.
-</simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Si uno de los registros de forma específica descritos arriba coinciden con una
-versión disponible de un paquete, el registro determina la prioridad de la
-versión. En caso de que esto no sea así, si cualquier número de registros de
-forma general coinciden con una versión, el primero determina la prioridad de la
-versión del paquete.
-</para>
-
-<para>
-Por ejemplo, suponga que el fichero de preferencias de APT 
-contiene los tres registros antes mencionados:
-
-<programlisting>
-Package: perl
-Pin: version 5.8*
-Pin-Priority: 1001
-
-Package: *
-Pin: origin ""
-Pin-Priority: 999
-
-Package: *
-Pin: release unstable
-Pin-Priority: 50
-</programlisting>
-
-Entonces:
-
-<itemizedlist>
-<listitem><simpara>La versión más reciente disponible del paquete
-<literal/perl/ se instala mientras que el número de versión empieze 
-con "<literal/5.8/". Si se encuentra disponible <emphasis/cualquier/ 
-versión 5.8* de <literal/perl/ y la versión instalada es 5.9*, entonces 
-se instala la versión5.8*.
-</simpara></listitem><listitem><simpara>Cualquier otra versión de un paquete
-distinto de 
-<literal/perl/ disponible desde el sistema local tiene prioridad sobre el
-resto de las versiones, incluso sobre los pertenecientes a la distribución 
-objetivo.
-</simpara></listitem>
-<listitem><simpara>Otras versiones que tengan un origen distinto al sistema
-local listadas en &sources-list; y que pertenezcan a la distribución
-<literal/inestable/ sólo se instalarán si se seleccionan para instalar y no hay
-ninguna versión del paquete instalado.
-</simpara></listitem>
-</itemizedlist>
-</para>
-</RefSect2>
-
-<RefSect2>
-<Title>Determinación de la versión del paquete y de las propiedades de la
-distribución</Title>
-
-<para>
-Los recursos del fichero &sources-list; deben proporcionar los ficheros
-<filename>Packages</filename> y <filename>Release</filename>. Éstos describen
-los paquetes disponibles en cada uno de los sitios.
-</para>
-
-<para>El fichero <filename>Packages</filename> se encuentra normalmente en
-el directorio <filename>.../dists/<replaceable>nombre-dist</replaceable>/
-<replaceable>componente</replaceable>/<replaceable>arquitectura</replaceable>
-</filename>,
-por ejemplo, <filename>.../dists/stable/main/binary-i386/Packages</filename>.
-El fichero consiste en una serie de registros de varias líneas, uno por cada
-paquete disponible en ese directorio. Para montar un repositorio de APT sólo
-son significativas dos de las líneas de cada registro:
-<variablelist>
-<varlistentry>
-<term>La línea <literal/Package:/ </term>
-<listitem><simpara>Indica el nombre del paquete</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>La línea <literal/Version:/ </term>
-<listitem><simpara>Indica el número de versión del paquete</simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>El fichero <filename>Release</filename> normalmente se encuentra 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/ los paquetes por debajo del directorio 
-padre. Al contrario que el fichero <filename/Packages/, casi todas las 
-líneas del fichero <filename/Release/ son relevantes para las prioridades de 
-APT: 
-
-<variablelist>
-<varlistentry>
-<term>La línea <literal/Archive:/ </term>
-<listitem><simpara>Indica el nombre del archivo al que pertenecen todos los
-paquetes del árbol de directorios. Por ejemplo, la línea 
-"Archive: stable" especifica que todos los paquetes en el árbol de 
-directorios por debajo del directorio raíz marcado en el fichero 
-<filename/Release/ están en un archivo de <literal/estable/. Para
-especificar una preferencia de acuerdo con este parámetro
-tendrá que poner la siguiente línea en el fichero de preferencias de APT:
-</simpara>
-<programlisting>
-Pin: release a=stable
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>La línea <literal/Version:/ </term>
-<listitem><simpara>Indica la versión de la distribución. Por ejemplo, los 
-paquetes en árbol pueden pertenecer a la versión 3.0 de Debian GNU/Linux. Dese
-cuenta de que <literal/pruebas/ e <literal/inestable/ no tienen una versión
-asignada porque no han sido liberadas. Para especificar una preferencia de
-acuerdo con este parámetro tendrá que poner una de las siguientes línea en el
-fichero de preferencias de APT:
-</simpara>
-
-<programlisting>
-Pin: release v=3.0
-Pin: release a=stable, v=3.0
-Pin: release 3.0
-</programlisting>
-
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>La línea <literal/Component:/ </term>
-<listitem><simpara>Indica la licencia asociada a los paquetes en el árbol 
-de directorios correspondiente al fichero <filename/Release/. Por ejemplo, 
-la línea <literal/Component: main/ especifica que todos los ejemplares son 
-de la sección <literal/main/, ésto asegura que su licencia se ajusta a las
-DFSG. Para especificar una preferencia de acuerdo con este parámetro tendrá 
-que poner la siguiente línea en el fichero de preferencias de APT:
-</simpara>
-<programlisting>
-Pin: release c=main
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>La línea <literal/Origin:/ </term>
-<listitem><simpara>Indica la procedencia de los paquetes en el árbol de
-directorios del fichero <filename/Release/. La procedencia más común es
-<literal/Debian/. Para especificar una preferencia de acuerdo con este 
-parámetro tendrá que poner la siguiente línea en el fichero de preferencias 
-de APT:
-</simpara>
-<programlisting>
-Pin: release o=Debian
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>La línea <literal/Label:/ </term>
-<listitem><simpara>nombra la etiqueta de los paquetes en los árboles de
-directorios del fichero <filename/Release/. Normalmente es
-<literal/Debian/. Para especificar una preferencia de acuerdo con este parámetro
-tendrá que poner la siguiente línea en el fichero de preferencias de APT:
-</simpara>
-<programlisting>
-Pin: release l=Debian
-</programlisting>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Todos los ficheros <filename>Packages</filename> y <filename>Release</filename>
-que se obtienen de los recursos de &sources-list; se guardan en el directorio
-<filename>/var/lib/apt/lists</filename>, o en el directorio definido por la
-variable <literal/Dir::State::Lists/, que puede estar definida en el fichero
-<filename/apt.conf/. Por ejemplo, el fichero
-<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release
-</filename> contiene los ficheros <filename>Release</filename> obtenidos de
-<literal/debian.lcs.mit.edu/ para la arquitectura <literal/binary-i386/ de la
-sección <literal/contrib/ de la distribución <literal/inestable/.
-</para>
-
-</RefSect2>
-
-<RefSect2>
-<Title>Líneas opcionales en un registro de preferencias de APT</Title>
-
-<para>
-Cada registro en el fichero de preferencias de APT puede comenzar
-con una o más líneas que tengan como primera palabra
-<literal/Explanation:/. Útil para comentarios.
-</para>
-
-<para>
-La línea <literal/Pin-Priority:/ es opcional. Si se omite, APT asigna
-una prioridad un número menor que la última prioridad especificada en una línea
-que empieze con <literal/Pin-Priority: release .../.
-</para>
-</RefSect2>
-</RefSect1>
-
-<RefSect1>
-<Title>Ejemplos</Title>
-<RefSect2>
-<Title>Siguiendo la distribución estable</Title>
-
-<para>El siguiente fichero de preferencias de APT provoca que APT asigne una
-prioridad mayor de la que asigna por omisión (500) a todos los ejemplares de
-la distribución <literal/estable/ y una prioridad más baja al resto de las
-distribuciones <literal/Debian/.
-
-<programlisting>
-Explanation: Desinstalar o no instalar los ejemplares que no
-Explanation: pertenecen a la distribución estable
-Package: *
-Pin: release a=stable
-Pin-Priority: 900
-
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-</programlisting>
-</para>
-
-<para>
-Con un fichero &sources-list; apropiado y el fichero de preferencias mostrado
-anteriormente, cualquiera de las siguientes órdenes de APT hace que o bien todo
-el sistema o bien sólo algunos paquetes se actualicen a la última versión
-<literal/estable/.
-
-<programlisting>
-apt-get install <replaceable>paquete</replaceable>
-apt-get upgrade
-apt-get dist-upgrade
-</programlisting>
-</para>
-
-<para>La siguiente orden hace que APT actualice un paquete a la última versión
-de la distribución de <literal/pruebas/, el paquete no se actualizará de nuevo amenos que se ejecute de nuevo la orden.
-
-<programlisting>
-apt-get install <replaceable>paquete</replaceable>/testing
-</programlisting>
-</RefSect2>
-
-<RefSect2>
-<Title>Siguiendo la distribución de pruebas o inestable</Title>
-
-<para>El siguiente fichero de preferencias de APT provocará que APT asigne
-mayor prioridad a las versiones de la distribución de <literal/pruebas/,
-una prioridad menor a los paquetes de la distribución <literal/inestable/,
-y una prioridad prohibitiva a los paquetes de otras distribuciones de
-<literal/Debian/.
-
-<programlisting>
-Package: *
-Pin: release a=testing
-Pin-Priority: 900
-
-Package: *
-Pin: release a=unstable
-Pin-Priority: 800
-
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-</programlisting>
-</para>
-
-<para>
-Con un fichero &sources-list; adecuado y el fichero de preferencias anterior,
-cualquiera de la órdenes siguientes hace que APT actualice los paquetes a la
-última versión de la distribución de <literal/pruebas/.
-
-<programlisting>
-apt-get install <replaceable>paquete</replaceable>
-apt-get upgrade
-apt-get dist-upgrade
-</programlisting>
-</para>
-
-<para>La siguiente orden hace que APT actualice un determinado paquete a la
-última versión de la distribución <literal/inestable/. Más tarde,
-<command>apt-get upgrade</command> actualizarán el paquete a la última versión
-de la distribución de <literal/pruebas/ 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/inestable/ si es más reciente que la versión instalada.
-
-<programlisting>
-apt-get install <replaceable>paquete</replaceable>/unstable
-</programlisting>
-</para>
-
-</RefSect2>
-</RefSect1>
-
-<RefSect1>
-<Title>Véase además</>
-<para>
-&apt-get; &apt-cache; &apt-conf; &sources-list;
-</para>
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
-
-</refentry>

doc/es/makefile

@@ -5,8 +5,7 @@ SUBDIR=doc/es
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-# Man pages
-SOURCE = apt-cache.es.8 apt-get.es.8 apt-cdrom.es.8 apt.conf.es.5 \
-         sources.list.es.5 apt-config.es.8 apt_preferences.es.5
-INCLUDES = apt.ent.es
-include $(SGML_MANPAGE_H)
+# Language Code of this translation
+LC=es
+
+include $(PO4A_MANPAGE_H)

doc/es/sources.list.es.5.sgml

@@ -1,225 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.3 del CVS de
-/cvs/debian-doc/manpages/english/apt/sources.list.5.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>sources.list</>
-   <manvolnum>5</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>sources.list</>
-    <refpurpose>lista de recursos de paquetes para APT</>
- </refnamediv>
- 
- <RefSect1><Title>Descripción</>
- 
-   <para>   
-   La lista de recursos de paquetes se usa para localizar ficheros del sistema
-   de distribución de paquetes usado en el sistema.
-   A día de hoy, esta página del manual documenta sólamente el sistema de
-   paquetes usado por Debian GNU/Linux. Este fichero de control está situado en
-   <filename>/etc/apt/sources.list</>
-   <para>
-   La lista de procedencias está diseñada para soportar cualquier número y
-   distintos tipos de procedencias. El fichero lista una procedencia por línea,
-   con la procedencia de mayor prioridad en la primera línea.
-   El formato de cada línea es:
-   <literal/tipo uri argumentos/. El primer elemento, <literal/tipo/,
-   determina el formato de <literal/argumentos/.
-   <literal/uri/ es Universal Resource Identifier (Identificador Universal de
-   Recursos), un caso general de la más especifica y bien conocida
-   Universal Resource Locator, o URL.
-   El resto de la línea puede marcarse como comentario usando #.
- </RefSect1>
- 
- <RefSect1><Title>Los tipos deb y deb-src</>
-   <para>   
-   El tipo <literal/deb/ hace referencia a un típico archivo de Debian de dos
-   niveles, <filename>distribución/componente</>. Normalmente
-   <literal/distribución/ es <literal/stable/, <literal/testing/, o
-   <literal/unstable/, mientras que componente es <literal/main/,
-   <literal/contrib/, <literal/non-free/, o <literal/non-us/. El tipo
-   <literal/deb-src/ hace referencia al código fuente de la distribución con la
-   misma sintaxis que el tipo <literal/deb/. Es necesaria una línea
-   <literal/deb-src/ para descargar un índice de los paquetes que tienen
-   código fuente disponible.
-   <para>
-   El formato para una entrada en el fichero <filename/sources.list/ usando
-   los tipos <literal/deb/ y <literal/deb-src/ es:
-   <literallayout>deb uri distribución [componente1] [componente2] [...]</literallayout>
-   <para>
-   La URI para el tipo <literal/deb/ debe de especificar la base de 
-   la distribución de Debian, donde APT encontrará la información que
-   necesita.
-   <literal/distribución/ puede especificar un ruta exacta, en cuyo caso se
-   deben omitir los componentes y <literal/distribución/ debe finalizar
-   con una barra (/). Esto es útil cuando únicamente queremos una sub-sección 
-   del archivo denotado por la URI. Si <literal/distribución/ no especifica 
-   la ruta exacta, al menos uno de los <literal/componentes/ debe de estar
-   presente.
-   <para>
-   <literal/distribución/ puede contener una variable, <literal/$(ARCH)/,
-   que se expandirá en la arquitectura de Debian usada en el sistema (i386,
-   m68k, powerpc, ...). Esto permite que <filename/sources.list/ sea 
-   independiente de la arquitectura. En general esta característica sólo es
-   de interés cuando se especifica una ruta completa, de lo contrario
-   <literal/APT/ generará automáticamente la URI con la arquitectura actual
-   del sistema.
-   <para>
-   Debido a que sólo se puede especificar una distribución por línea es posible
-   que sea necesario tener múltiples líneas para la misma URI si deseamos
-   tener accesibles más de una distribución o componente de ese sitio.
-   APT ordenará internamente la lista de URI's después de haber generado
-   una copia interna, y juntará varias referencias al mismo servidor de Internet
-   en una sola conexión, para así no establecer una conexión FTP de forma
-   ineficiente, cerrarla, hacer algo más, y entonces restablecer la conexión
-   al mismo servidor. Esta característica es útil para acceder a FPT's concurridos
-   que limitan el número de accesos simultáneos de usuarios anónimos. APT
-   también paralelará conexiones a diferentes servidores para aprovechar mejor
-   el ancho de banda.
-   <para>
-   Es importante listar las fuente por orden de preferencia, con la fuente de más
-   preferencia al principio. Lo normal es ordenar las fuentes por velocidad,
-   de la más rápida a la más lenta (CD-ROM seguido de servidores en la red
-   local, seguidos por servidores de Internet distantes, por ejemplo).
-   <para>
-   Algunos ejemplos:
-   <literallayout>
-deb http://http.us.debian.org/debian stable main contrib non-free
-deb http://http.us.debian.org/debian dists/stable-updates/
-   </literallayout>
- </RefSect1>
-
- <RefSect1><title>especificación de la URI</title>
-   <para>
-   Se reconocen los siguientes tipos de URI: cdrom, file, http, y ftp.
-   <VariableList>
-    <VarListEntry><term>file</term>
-    <ListItem><Para>
-    file permite considerar como archivo a cualquier
-    fichero en el sistema de ficheros. Esto es útil para particiones
-    montadas mediante NFS y réplicas locales.
-    </VarListEntry>
-    
-    <VarListEntry><term>cdrom</term>
-    <ListItem><Para>
-    El cdrom permite a APT usar la unidad de CDROM local. Use el
-    programa &apt-cdrom; para añadir entradas de un cdrom a sources.list.
-    </VarListEntry>
-
-    <VarListEntry><term>http</term>
-    <ListItem><Para>
-    Http especifica un servidor HTTP como archivo. Si la variable de entorno
-    <EnVar/http_proxy/ está establecida con el formato http://server:port/,
-    se usará el servidor proxy especificado en <EnVar/http_proxy/. Usuarios de
-    servidor proxy de autenticación HTTP/1.1 deberán usar la cadena de 
-    caracteres http://user:pass@server:port/
-    Dese cuenta que este método de autenticación es inseguro.
-    </VarListEntry>
-
-    <VarListEntry><term>ftp</term>
-    <ListItem><Para>
-    Ftp especifica un servidor FTP como archivo. El comportamiento de APT 
-    con FTP es altamente configurable, para más información consulte la página
-    del manual de &apt-conf;. Dese cuenta que un proxy ftp puede ser
-    especificado usando la variable de entorno <EnVar/ftp_proxy/. Es posible
-    especificar un servidor proxy http (servidores proxy http normalmente
-    comprenden las url's tipo ftp) usando este método y SÓLO este método.
-    Se ignorarán los proxies ftp especificados en el fichero de configuración que usen 
-    http.
-    </VarListEntry>
-
-    <VarListEntry><term>copy</term>
-    <ListItem><Para>
-    Copy es idéntico a file excepto en que los paquetes son copiados al
-    directorio que contiene la caché en vez de usar directamente su
-    lugar original. Esto es útil para gente que use discos zip con APT.
-    </VarListEntry>
-    
-    <VarListEntry><term>rsh</term><term>ssh</term>
-    <ListItem><Para>
-    El método rsh/ssh usa rsh/ssh para conectar a los servidores remotos como
-    un usuario dado y acceder a los ficheros. No es posible realizar ninguna
-    autenticación por contraseña, debe hacerse previamente una configuración
-    de claves RSA o rhosts.
-    El acceso a los ficheros del sistema remoto usa las órdenes estándar
-    <command/find/ y <command/dd/ para realizar las transferencias.
-    </VarListEntry>
-  </VariableList>
- </RefSect1>
- 
- <RefSect1><title>Ejemplos</title>
-   <para>
-   Usa el archivo local (o montado mediante NFS) en /home/jason/debian
-   para stable/main, stable/contrib, y stable/non-free.
-   <literallayout>deb file:/home/jason/debian stable main contrib non-free</literallayout>
-   <para>
-   Como arriba, excepto que usa la distribución inestable.
-   <literallayout>deb file:/home/jason/debian unstable main contrib non-free</literallayout>
-   <para>
-   Línea para el código fuente de lo mismo que arriba
-   <literallayout>deb-src file:/home/jason/debian unstable main contrib non-free</literallayout>
-   <para>
-   Usa HTTP para acceder al archivo en archive.debian.org, y usa sólo la parte
-   de hamm/main.
-   <literallayout>deb http://archive.debian.org/debian-archive hamm main</literallayout>
-   <para>
-   Usa FTP para acceder al archivo en ftp.debian.org, debajo del directorio
-   debian, y usa sólo la parte de stable/contrib.
-   <literallayout>deb ftp://ftp.debian.org/debian stable contrib</literallayout>
-   <para>
-   Usa FTP para acceder al archivo en ftp.debian.org, debajo del directorio
-   debian, y usa sólo la parte de unstable/contrib. Si tanto esta línea como 
-   la del ejemplo anterior aparecen en <filename/sources.list/, se usará sólo
-   una sesión FTP para ambas.
-   <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
-   <para>
-   Usa HTTP para acceder al archivo en nonus.debian.org, bajo el directorio
-   debian-non-US.
-   <literallayout>deb http://nonus.debian.org/debian-non-US stable/non-US main
-   contrib non-free</literallayout>
-   <para>
-   Usa HTTP para acceder al archivo en nonus.debian.org, bajo el directorio
-   debian-non-US, y usa sólo ficheros que se encuentren debajo de
-   <filename>unstable/binary-i386</> en máquinas i386, 
-   <filename>unstable/binary-m68k</> en máquinas m68k, y así para todas las
-   arquitecturas soportadas. (Dese cuenta que este ejemplo sólo sirve para
-   ilustrar como se usa la variable de substitución, non-us ya no está
-   estructurado de este modo)
-   <literallayout>deb http://ftp.de.debian.org/debian-non-US
-   unstable/binary-$(ARCH)/</literallayout> 
- </RefSect1>
- 
- <RefSect1><Title>Véase también</>
-   <para>
-   &apt-cache; &apt-conf;
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
-
-</refentry>

doc/es/vendors.list.es.5.sgml

@@ -1,120 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.es">
-%aptent;
-
-]>
-
-<!-- 
-(c) 2003 Software in the Public Interest
-Esta traducción ha sido realizada por Rubén Porras Campo <nahoo@inicia.es>
-Está basada en la página de manual original:
-versión 1.2 del CVS de
-/cvs/debian-doc/manpages/english/apt/vendors.list.5.sgml
- -->
-
-<refentry lang=es>
- &apt-docinfo;
- 
- <refmeta>
-   <refentrytitle>vendors.list</>
-   <manvolnum>5</>
- </refmeta>
- 
- <!-- Man page title -->
- <refnamediv>
-    <refname>vendors.list</>
-    <refpurpose>Configuración de claves de seguridad de APT</>
- </refnamediv>
- 
- <RefSect1><Title>Descripción</>
-   <para>   
-   La lista de proveedores de paquetes contiene una lista de todos los
-   proveedores cuyos paquetes descargados desee autenticar.
-   Debe de tener la huella digital PGP correspondiente a cada
-   proveedor, de este modo APT puede verificar la firma del fichero
-   <literal>Release</literal> y después la suma de control de cada
-   paquete descargado. Para habilitar la autenticación debe añadir
-   entre llaves el identificador del proveedor (vea más abajo) a cada
-   línea del fichero &sources-list; que replique el repositorio
-   proporcionado por ese proveedor.
-   <para>
-   El formato del fichero es parecido al que usa
-   <command>apt.conf</command>. Consiste de un número arbitrario de
-   bloques, donde cada bloque comienza con una cadena de caracteres
-   que indican el <replaceable/tipo_clave/ y el <replaceable/id_de_proveedor/.
-   <para>
-   Algunos proveedores pueden tener varios bloques definiendo
-   diferentes normas de seguridad para sus distribuciones. Debian, por
-   ejemplo, usa diferentes métodos para firmar las distintas distribuciones.
-   <para>
-   <replaceable/tipo_clave/ es el tipo de comprobación exigido.
-   Actualmente, sólo está disponible el tipo <literal/simple-key/.
-   <para>
-   <replaceable/id_de_proveedor/ es la cadena de carácteres que
-   identifica al proveedor. Es una cadena arbitraria y obligatoria que
-   debe proporcionar para identificar inequívocamente al proveedor
-   listado en este fichero.
-   
-   Ejemplo:
-<informalexample><programlisting>   
-simple-key "juan"
-{
-   Fingerprint "0987AB4378FSD872343298787ACC";
-   Name "Juan Gándara &lt;juan@gandara.com&gt;";
-}						    
-</programlisting></informalexample>
-   
- </RefSect1>
-
- <RefSect1><Title>El tipo simple-key</>
-   <para>   
-   Este tipo de verificación se usa cuando el proveedor tiene una sola
-   clave asegurada que se debe usar para firmar el fichero <literal>
-   Release</literal>. Los siguiente elementos deben de estar presentes:
-   
-   <VariableList>
-     <VarListEntry><Term>Fingerprint</Term>
-     <ListItem><Para>
-     La huella digital PGP para la clave. La huella digital debe
-     expresarse con la notación estándar, con o sin espacios.
-     La opción <option/--fingerprint/ de la orden <CiteRefEntry><RefEntryTitle>
-     <command/gpg/</RefEntryTitle><ManVolNum/1/</CiteRefEntry>
-     mostrará la huella digital de la clave o claves seleccionadas.
-     </VarListEntry>
-     
-     <VarListEntry><Term>Name</Term>
-     <ListItem><Para>
-     Cadena de caracteres que contiene una descripción del propietario
-     de la clave o del proveedor. Puede poner el nombre del proveedor
-     y su <foreignphrase>email</foreignphrase>. La cadena debe de ir
-     entre comillas dobles.
-     </VarListEntry>
-     
-   </VariableList>
- </RefSect1>
-
- <RefSect1><Title>Ficheros</>
-   <para>
-   <filename>/etc/apt/vendors.list</>
- </RefSect1>
- 
- <RefSect1><Title>Véase también</>
-   <para>
-   &sources-list;
- </RefSect1>
-
- &manbugs;
- &manauthor;
-
-  <refsect1>
-    <title>TRADUCTOR</title>
-    <para>
-      Traducción de Rubén Porras Campo
-      &lt;debian-l10n-spanish@lists.debian.org&gt;
-    </para>
-  </refsect1>
-
-</refentry>
-   

doc/fr/addendum/debiandoc_fr.add

@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>Traducteurs</title>
-   <para>Jérôme Marant, Philippe Batailler, Christian Perrier <email>bubulle@debian.org</email> (2000, 2005, 2009),
-   Équipe de traduction francophone de Debian <email>debian-l10n-french@lists.debian.org</email>
-   </para>
- </refsect1>
-

doc/guide.it.sgml

@@ -1,585 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<book>
-<title>Guida dell'utente di APT</title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<author>Traduzione di Eugenia Franzoni <email>eugenia@linuxcare.com</email>
-</author>
-<version>$Id: guide.it.sgml,v 1.5 2003/04/26 23:26:13 doogie Exp $</version>
-
-<abstract>
-Guida per l'uso del gestore di pacchetti APT.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1998.
-
-<p>Ed. italiana Copyright &copy; Eugenia Franzoni, 2000.
-
-<p>
-"APT" e questo documento sono software libero, e li si può ridistribuire 
-e/o modificare secondo i termini della Licenza Pubblica Generica GNU
-(GPL), pubblicata dalla Free Software Foundation, nella versione 2 o
-(se preferite) qualsiasi versione successiva.
-
-<p>"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.
-
-<p>
-Per ulteriori dettagli sui sistemi GNU/Linux si veda il testo
-completo della licenza nel file
-/usr/share/common-licenses/GPL.
-</copyright>
-
-<toc sect>
-
-<!-- General		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>Descrizione generale
-
-<p>
-Il pacchetto APT al momento contiene due sezioni, il metodo APT 
-<prgn>dselect</> e l'interfaccia utente a linea di comando <prgn>apt-get</>;
-entrambi danno modo di installare e rimuovere pacchetti, e di scaricarne
-altri da Internet.
-
-<sect>Anatomia del sistema di pacchettizzazione
-<p>
-Il sistema di pacchettizzazione di Debian contiene un gran numero di
-informazioni associate a ciascun pacchetto, per assicurarsi che si
-integri facilmente ed in maniera pulita nel sistema; la più
-importante di esse è il sistema di dipendenze.
-
-<p>
-Il sistema di dipendenze permette ai singoli programmi di fare uso
-degli elementi condivisi del sistema, quali le librerie; per 
-ridurre il numero di elementi che l'utente medio debba installare,
-le porzioni di programmi che non vengono usate spesso vengono poste
-in pacchetti separati. Inoltre, è possibile avere più di una scelta per
-cose quali i programmi di posta elettronica, i server X e così via.
-
-<p>
-Il primo passo per capire il sistema di dipendenze è la 
-comprensione del concetto di dipendenza semplice: un pacchetto richiede
-che un altro sia installato insieme ad esso per poter
-funzionare.
-
-
-<p>
-Ad esempio, mail-crypt è un'estensione di emacs che aiuta a criptare le
-mail con PGP. Se PGP non è installato, mail-crypt è inutile, quindi
-mail-crypt ha una dipendenza semplice da PGP. Inoltre, dato che si tratta
-di un'estensione di emacs, mail-crypt dipende anche da emacs, senza il
-quale è totalmente inutile.
-
-<p>
-L'altro tipo di dipendenza importante da capire è la dipendenza di
-conflitto; con questa, un pacchetto che venga installato insieme ad un
-altro pacchetto non funziona, e si hanno seri problemi al sistema.
-Come esempio, si consideri un programma di trasporto della posta,
-quale sendmail, exim o qmail: non è possibile averne due contemporaneamente,
-perché entrambi hanno bisogno di restare in ascolto sulla stessa porta di rete 
-per ricevere la posta. Tentare di installarne due danneggerebbe seriamente il
-sistema, quindi ciascun programma di trasporto della posta ha una
-dipendenza di conflitto con tutti gli altri.
-
-<p>
-Come ulteriore complicazione, c'è la possibilità che un pacchetto
-voglia prendere il posto di un altro; ad esempio, exim e sendmail per molte
-cose sono identici, dato che entrambi gestiscono la posta e comprendono
-un'interfaccia comune, quindi il sistema di pacchettizzazione deve dichiarare
-che sono entrambi agenti di trasporto della posta, e che gli altri
-pacchetti a cui serve uno dei due devono dipendere da un pacchetto
-fittizio agente-di-trasporto-della-posta. Quando si modificano
-a mano i pacchetti, questo può portare a moltissima confusione.
-
-<p>
-In ciascun momento una singola dipendenza può essere soddisfatta o meno
-dai pacchetti già installati; APT cerca di risolvere i problemi
-di dipendenze con un buon numero di algoritmi automatici, che aiutano
-a selezionare i pacchetti da installare.
-</sect>
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- apt-get		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>apt-get
-
-<p>
-<prgn>apt-get</> fornisce un modo semplice di installare i pacchetti dalla
-linea di comando. Diversamente da <prgn>dpkg</>, <prgn>apt-get</> non 
-capisce i nomi dei file .deb, ma utilizza il vero nome dei pacchetti,
-e può installare archivi .deb solo da una fonte.
-
-<p>
-La prima <footnote>Se state usando un proxy server http, dovete prima ancora
-impostare la variabile d'ambiente http_proxy; vedere 
-sources.list(5).</footnote>
-cosa da fare prima di usare <prgn>apt-get</> è impostare l'elenco dei
-pacchetti dalle fonti in modo che il programma sappia quali pacchetti
-sono disponibili. Lo si fa con <tt>apt-get update</>. Ad esempio,
-
-<p>
-<example>
-# apt-get update
-Get http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages
-Get http://llug.sep.bnl.gov/debian/ testing/contrib Packages
-Reading Package Lists... Done
-Building Dependency Tree... Done
-</example>
-
-<p>
-Dopo aver aggiornato l'elenco si possono usare molti comandi:
-<taglist>
-<tag>upgrade<item>
-Upgrade tenterà di fare un aggiornamento indolore del sistema completo,
-senza installare nuovi pacchetti o rimuoverne di esistenti, e senza
-aggiornare un pacchetto che possa rovinarne altri. Upgrade farà un elenco
-di tutti i pacchetti che non avrà potuto aggiornare, cosa che in genere
-significa che questi dipendono da nuovi pacchetti o vanno in conflitto
-con altri. Per forzare la loro installazione si può usare 
-<prgn>dselect</> o <tt>apt-get install</>.
-
-<tag>install<item>
-Install viene usato per installare i singoli pacchetti dando il loro nome. 
-Il pacchetto viene automaticamente scaricato ed installato, cosa molto utile
-se già se ne conosce il nome e non si vuole entrare in grafica per 
-selezionarlo. Al comando si possono passare anche più pacchetti, che saranno
-tutti scaricati. L'installazione automatica cerca di risolvere i problemi
-di dipendenze con gli altri pacchetti elencati, stampa un riassunto e
-chiede conferma se si devono modificare altri pacchetti che non siano quelli
-sulla linea di comando.
-
-<tag>dist-upgrade<item>
-Dist-upgrade fa un aggiornamento completo, progettato in modo da rendere 
-semplici gli aggiornamenti tra versioni di Debian. Usa un algoritmo 
-sofisticato per determinare il miglior insieme di pacchetti da installare,
-aggiornare e rimuovere per arrivare alla versione più aggiornata
-del sistema possibile. In alcune situazioni può essere vantaggioso usare
-dist-upgrade invece che sprecare tempo a risolvere manualmente le 
-dipendenze con <prgn>dselect</>. Una volta completato dist-upgrade, si può
-usare <prgn>dselect</> per installare eventuali pacchetti che sono stati
-tralasciati.
-
-<p>
-È importante controllare attentamente cosa intende fare dist-upgrade,
-dato che le sue decisioni a volte possono essere abbastanza sorprendenti.
-</taglist>
-
-<p>
-<prgn>apt-get</> ha diverse opzioni a linea di comando, che vengono 
-documentate dettagliatamente nella sua pagina man, 
-<manref name="apt-get" section="8">. L'opzione più utile è 
-<tt>-d</>, che non installa i file scaricati: se il sistema deve
-scaricare un gran numero di pacchetti, non è bene farglieli installare
-subito, in caso dovesse andare male qualcosa. Dopo aver usato <tt>-d</>,
-gli archivi scaricati possono essere installati semplicemente dando di
-nuovo lo stesso comando senza l'opzione <tt>-d</>.
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- DSelect		                                               {{{ -->
-<!-- ===================================================================== -->
-<chapt>DSelect
-<p>
-Il metodo APT di <prgn>dselect</> fornisce tutte le funzionalità di APT
-all'interno dell'interfaccia grafica di selezione dei pacchetti 
-<prgn>dselect</>. <prgn>dselect</> viene usato per selezionare i pacchetti
-da installare o rimuovere, ed APT li installa.
-
-<p>
-Per abilitare il metodo APT dovete selezionare [A]ccess in <prgn>dselect</> 
-e scegliere il metodo APT; vi verrà chiesto un insieme di fonti
-(<em>Sources</>), cioè di posti da cui scaricare gli archivi.
-Tali fonti possono essere siti Internet remoti, mirror locali di Debian
-o CDROM; ciascuna di esse può fornire una parte dell'archivio Debian,
-ed APT le combinerà insieme in un set completo di pacchetti. Se avete un
-CDROM è una buona idea indicare quello per primo, e poi i mirror, in modo
-da avere accesso alle ultime versioni; APT userà in questo modo automaticamente
-i pacchetti sul CDROM prima di scaricarli da Internet.
-
-<p>
-<example>
-   Set up a list of distribution source locations
-	 
- Please give the base URL of the debian distribution.
- The access schemes I know about are: http file
-	   
- For example:
-      file:/mnt/debian,
-      ftp://ftp.debian.org/debian,
-      http://ftp.de.debian.org/debian,
-      
-      
- URL [http://llug.sep.bnl.gov/debian]: 
-</example>
-
-<p>
-La configurazione delle fonti inizia chiedendo la base dell'archivio Debian,
-propone come default un mirror HTTP, e poi chiede la distribuzione
-da scaricare.
-
-<p>
-<example>
- Please give the distribution tag to get or a path to the
- package file ending in a /. The distribution
- tags are typically something like: stable unstable testing non-US
-   
- Distribution [stable]: 
-</example>
-
-<p>
-La distribuzione (``distribution'') fa riferimento alla versione Debian
-dell'archivio: <em>stable</> è l'ultima rilasciata, ed <em>unstable</> 
-è quella di sviluppo. <em>non-US</> è disponibile solo su alcuni mirror,
-e contiene dei pacchetti in cui viene usata della tecnologia di criptazione
-o altre cose che non possano essere esportate dagli Stati Uniti; importare
-questi pacchetti negli US è però legale.
-
-<p>
-<example>
- Please give the components to get
- The components are typically something like: main contrib non-free
-  
- Components [main contrib non-free]:
-</example>
-
-<p>
-L'elenco dei componenti (``components'') si riferisce alla lista di
-sotto-distribuzioni da scaricare. Ciascuna distribuzione viene divisa in
-base al copyright del software: la main contiene pacchetti la cui licenza
-soddisfa le DFSG, mentre contrib e non-free contengono software che ha
-diverse restrizioni sull'uso e sulla distribuzione.
-
-<p>
-Si possono inserire un qualsiasi numero di fonti, e lo script di 
-configurazione continuerà a chiedere fino a che abbiate specificato tutti gli
-elementi che volete.
-
-<p>
-Prima di cominciare ad usare <prgn>dselect</> è necessario aggiornare 
-l'elenco dei pacchetti disponibili selezionando [U]pdate dal menù:
-si tratta di un sovrainsieme di ciò che fa <tt>apt-get update</>,
-che rende l'informazione scaricata disponibile a
-<prgn>dselect</>. [U]pdate deve essere fatto anche se prima è stato dato 
-<tt>apt-get update</>.
-
-<p>
-Si può a questo punto continuare selezionando i pacchetti desiderati
-usando [S]elect e poi installando con [I]nstall. Se si usa il metodo APT,
-i comandi [C]onfig e [R]emove non hanno significato, dato che entrambe le
-fasi sono contenute in [I]nstall.
-
-<p>
-Per default APT rimuoverà automaticamente i pacchetti che sono stati installati
-con successo. Per modificare questo comportamento, si inserisca 
-<tt>Dselect::clean "prompt";</> in /etc/apt/apt.conf.
-
-</chapt>
-                                                                  <!-- }}} -->
-<!-- The Interfaces						       {{{ -->
-<!-- ===================================================================== -->
-<chapt>L'interfaccia
-
-<p>
-Entrambi i metodi,  <prgn>dselect</> APT ed <prgn>apt-get</>, condividono la
-stessa interfaccia; si tratta di un sistema semplice che indica in genere
-cosa sta per fare, e poi lo fa.
-<footnote>
-Il metodo <prgn>dselect</> è in realtà un insieme di script di wrapper ad
-<prgn>apt-get</>. Il metodo fornisce delle funzionalità maggiori del
-solo <prgn>apt-get</>.
-</footnote>
-Dopo la stampa di un riassunto delle operazioni che saranno fatte,
-APT stampa dei messaggi informativi sullo stato del sistema, in modo che
-possiate avere davanti agli occhi a quale punto dell'operazione si trova,
-e quanto ancora si deve aspettare.
-
-<!-- ===================================================================== -->
-<sect>Avvio
-
-<p>
-Prima di ciascuna operazione, eccetto l'aggiornamento della lista, APT
-compie alcune operazioni per prepararsi, oltre a dei controlli dello
-stato del sistema. In qualsiasi momento le stesse operazioni possono essere
-fatte con <tt>apt-get check</>
-<p>
-<example>
-# apt-get check
-Reading Package Lists... Done
-Building Dependancy Tree... Done
-</example>
-
-<p>
-La prima cosa che fa è leggere tutti i file dei pacchetti in memoria,
-usando uno schema di caching in modo da rendere la stessa operazione più
-veloce la seconda volta che la si fa. Se alcuni dei file dei pacchetti
-non vengono trovati, sono ignorati e viene stampato un avvertimento
-all'uscita di apt-get.
-
-<p>
-L'operazione finale consiste in un'analisi dettagliata delle
-dipendenze del sistema: viene controllato che tutte le dipendenze dei
-singoli pacchetti installati o non scompattati siano soddisfatte.
-Se vengono individuati dei problemi, viene stampato un resoconto,
-ed <prgn>apt-get</> esce senza eseguire alcuna operazione.
-
-<p>
-<example>
-# apt-get check
-Reading Package Lists... Done
-Building Dependancy Tree... Done
-You might want to run apt-get -f install' to correct these.
-Sorry, but the following packages have unmet dependencies:
-  9fonts: Depends: xlib6g but it is not installed
-  uucp: Depends: mailx but it is not installed
-  blast: Depends: xlib6g (>= 3.3-5) but it is not installed
-  adduser: Depends: perl-base but it is not installed
-  aumix: Depends: libgpmg1 but it is not installed
-  debiandoc-sgml: Depends: sgml-base but it is not installed
-  bash-builtins: Depends: bash (>= 2.01) but 2.0-3 is installed
-  cthugha: Depends: svgalibg1 but it is not installed
-           Depends: xlib6g (>= 3.3-5) but it is not installed
-  libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)
-</example>
-
-<p>
-In questo esempio il sistema ha molti problemi, tra cui uno piuttosto serio
-con la libreadlineg2. Per ciascun pacchetto che ha dipendenze non soddisfatte,
-viene stampata una linea che indica il pacchetto che crea il problema e
-quali problemi ci sono. Viene inclusa inoltre una breve spiegazione
-del perché il pacchetto ha un problema di dipendenze.
-
-<p>
-Ci sono due modi in cui un sistema possa arrivare in uno stato problematico
-di questo genere: il primo è causato dal fatto che <prgn>dpkg</> possa
-mancare alcune relazioni sottili tra pacchetti durante un aggiornamento
-del sistema<footnote>APT considera comunque tutte le dipendenze note,
-e cerca di prevenire problemi ai pacchetti</footnote>; il secondo è possibile
-se l'installazione di un pacchetto fallisce, ed in questo caso è possibile
-che un pacchetto venga scompattato senza che tutti quelli da cui dipende
-siano stati installati.
-
-<p>
-La seconda possibilità è meno seria della prima, dato che APT gestisce
-l'ordine di installazione dei pacchetti; in entrambi i casi l'opzione
-<tt>-f</> di <prgn>apt-get</> gli farà trovare una soluzione e lo farà
-continuare. Il metodo APT di <prgn>dselect</> comprende sempre l'opzione 
-<tt>-f</> per permettere di configurare facilmente anche i pacchetti con
-script errati.
-
-<p>
-Se viene usata però l'opzione <tt>-f</> per correggere un sistema in uno
-stato molto problematico, è possibile che anche con l'opzione il programma
-fallisca, subito o durante la sequenza di installazione. In entrambi i casi
-è necessario usare dpkg a mano (probabilmente usando delle opzioni
-di forzatura) per correggere quanto basta per poter fare continuare APT.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>Il resoconto sullo stato
-
-<p>
-Prima di procedere,  <prgn>apt-get</> presenterà un resoconto delle operazioni
-che sta per fare. In genere tale resoconto varierà con il tipo di operazioni
-da fare, ma ci sono alcuni elementi comuni: in tutti i casi gli elenchi 
-dipendono dallo stato finale delle cose, e tengono conto dell'opzione 
-<tt>-f</> e di altre attività rilevanti per il comando da eseguire.
-
-<sect1>L'elenco dei pacchetti Extra
-<p>
-<example>
-The following extra packages will be installed:
-  libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl
-  mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base
-  bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy
-  squake pgp-i python-base debmake ldso perl libreadlineg2
-  ssh
-</example>
-
-<p>
-L'elenco dei pacchetti Extra mostra tutti i pacchetti che verranno installati
-o aggiornati oltre a quelli indicati sulla linea di comando. Viene generato
-solo per il comando <tt>install</>. I pacchetti elencati sono spesso il
-risultato di un'operazione di auto installazione (Auto Install).
-</sect1>
-
-<sect1>I pacchetti da rimuovere
-<p>
-<example>
-The following packages will be REMOVED:
-  xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix
-  xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel
-  xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid
-  nas xpilot xfig 
-</example>
-
-<p>
-L'elenco dei pacchetti da rimuovere (Remove) indica tutti i pacchetti che
-verranno rimossi dal sistema. Può essere mostrato per una qualsiasi delle
-operazioni, e deve sempre essere esaminato attentamente per assicurarsi
-che non venga eliminato qualcosa di importante. Con l'opzione <tt>-f</>
-è particolarmente probabile che vengano eliminati dei pacchetti, ed in questo
-caso va fatta estrema attenzione. La lista può contenere dei pacchetti
-che verranno rimossi perché sono già rimossi parzialmente, forse a causa
-di un'installazione non terminata correttamente.
-</sect1>
-
-<sect1>L'elenco dei nuovi pacchetti installati
-<p>
-<example>
-The following NEW packages will installed:
-  zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base
-</example>
-
-<p>
-L'elenco dei nuovi pacchetti installati (New) è semplicemente un appunto
-su quello che accadrà. I pacchetti nell'elenco non sono al momento installati
-nel sistema, ma lo saranno alla fine delle operazioni di APT.
-</sect1>
-
-<sect1>L'elenco dei pacchetti trattenuti
-<p>
-<example>
-The following packages have been kept back
-  compface man-db tetex-base msql libpaper svgalib1
-  gs snmp arena lynx xpat2 groff xscreensaver
-</example>
-
-<p>
-In ogni caso in cui il sistema viene aggiornato nel suo insieme, c'è la
-possibilità che non possano venire installate nuove versioni di alcuni 
-pacchetti, dato che potrebbero richiedere l'installazione di pacchetti non
-presenti nel sistema, o entrare in conflitto con altri già presenti. 
-In questo caso, il pacchetto viene elencato nella lista di quelli
-trattenuti (Kept Back). Il miglior modo per convincere i pacchetti 
-elencati in questa lista è di installarli con <tt>apt-get install</> o 
-usare <prgn>dselect</> per risolvere i problemi.
-</sect1>
-
-<sect1>Messaggi di attenzione sui pacchetti trattenuti
-<p>
-<example>
-The following held packages will be changed:
-  cvs 
-</example>
-
-<p>
-A volte si può richiedere ad APT di installare un pacchetto
-che è stato trattenuto; in questi casi viene stampato un messaggio di
-attenzione, che avverte che il pacchetto verrà modificato. Questo 
-dovrebbe accadere solo durante operazioni di dist-upgrade o di install.
-</sect1>
-
-<sect1>Resoconto finale
-<p>
-Infine, APT stamperà un riassunto di tutte le modifiche che accadranno.
-
-<p>
-<example>
-206 packages upgraded, 8 newly installed, 23 to remove and 51 not upgraded.
-12 packages not fully installed or removed.
-Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used. 
-</example>
-
-<p>
-La prima linea del riassunto è semplicemente una versione ridotta di tutte
-le liste, ed include il numero di aggiornamenti -- cioè dei pacchetti
-già installati per cui sono disponibili nuove versioni. La seconda
-linea indica il numero di pacchetti con problemi di configurazione,
-probabilmente in conseguenza di un'installazione non andata a buon fine.
-La linea finale indica i requisiti di spazio dell'installazione: i primi
-due numeri indicano rispettivamente il numero di byte che devono
-essere trasferiti da posizioni remote, ed il secondo la dimensione totale
-di tutti gli archivi necessari per l'installazione. Il numero successivo
-indica la differenza in dimensione tra i pacchetti già installati
-e quelli che lo saranno, ed è approssimativamente equivalente allo spazio
-richiesto in /usr dopo l'installazione. Se si stanno rimuovendo dei
-pacchetti, il valore può indicare lo spazio che verrà liberato.
-
-<p>
-Si possono generare altri resoconti usando l'opzione -u per mostrare
-i pacchetti da aggiornare, ma sono simili all'esempio precedente.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>La visualizzazione dello stato
-<p>
-Durante il download degli archivi e dei file dei pacchetti, APT
-stampa una serie di messaggi di stato.
-
-<p>
-<example>
-# apt-get update
-Get:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages
-Get:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages
-Hit http://llug.sep.bnl.gov/debian/ testing/main Packages
-Get:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages
-Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages
-11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s
-</example>
-
-<p>
-Le linee che cominciano con <em>Get</> vengono stampate quando APT inizia
-a scaricare un file, e l'ultima linea indica il progresso dell'operazione.
-Il primo valore in percentuale indica la percentuale totale di tutti i file;
-dato che la dimensione dei file Package non è nota, purtroppo a volte
-<tt>apt-get update</> fa una stima poco accurata.
-
-<p>
-La sezione successiva della linea di stato viene ripetuta una volta per 
-ciascuna fase del download, ed indica l'operazione in corso, insieme
-ad alcune informazioni utili su cosa stia accadendo. A volte questa
-sezione contiene solamente <em>Forking</>, che significa che il sistema
-operativo sta caricando il modulo. La prima parola dopo la parentesi quadra
-aperta è il nome breve dell'oggetto che si sta scaricando, che per gli archivi 
-è il nome del pacchetto.
-
-<p>
-All'interno delle virgolette c'è una stringa informativa, che indica il 
-progresso della fase di negoziazione del download. Tipicamente comincia con
-<em>Connecting</>, procede con <em>Waiting for file</> e poi con 
-<em>Downloading</> o <em>Resuming</>. Il valore finale è il numero di byte 
-che sono stati scaricati dal sito remoto: una volta cominciato il 
-download viene rappresentato come <tt>102/10.2k</>, che indica che
-sono stati scaricati 102 byte di 10.2 kilobyte. La dimensione totale
-viene sempre espressa in notazione a quattro cifre, per risparmiare 
-spazio. Dopo la dimensione viene indicato un indicatore
-progressivo della percentuale del file. Il penultimo elemento è la velocità
-istantanea media, che viene aggiornata ogni 5 secondi, e riflette la
-velocità di trasferimento dei dati in quel periodo. Infine, viene 
-visualizzato il tempo stimato per il trasferimento, che viene aggiornato
-periodicamente e riflette il tempo necessario per completare tutte le
-operazioni alla velocità di trasferimento mostrata.
-
-<p> 
-La visualizzazione dello stato viene aggiornata ogni mezzo secondo per
-fornire un feedback costante del processo di download, e le linee Get
-scorrono indietro quando viene cominciato il download di un nuovo file.
-Dato che la visualizzazione dello stato viene costantemente
-aggiornata, non è adatta per essere registrata in un file; per non 
-visualizzarla si può usare l'opzione <tt>-q</>.
-</sect>
-
-<!-- ===================================================================== -->
-<sect>Dpkg
-
-<p>
-APT usa <prgn>dpkg</> per installare gli archivi e passerà all'interfaccia
-<prgn>dpkg</> una volta finito il download. 
-<prgn>dpkg</> porrà anche alcune domande durante la manipolazione dei
-pacchetti, ed i pacchetti stessi 
-potranno farne altre. Prima di ciascuna domanda viene
-proposta una descrizione di quello che sta per chiedere, e le domande
-sono troppo diverse per poter essere discusse in maniera completa in questa
-occasione.
-</sect>
-
-</chapt>
-                                                                  <!-- }}} -->
-
-</book>

doc/it/makefile

@@ -0,0 +1,11 @@
+# -*- make -*-
+BASE=../..
+SUBDIR=doc/it
+
+# Bring in the default rules
+include ../../buildlib/defaults.mak
+
+# Language Code of this translation
+LC=it
+
+include $(PO4A_MANPAGE_H)

doc/ja/addendum/debiandoc_ja.add

@@ -1,7 +0,0 @@
-PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
- <refsect1><title>訳者</title>
-   <para>倉澤 望 <email>nabetaro@debian.or.jp</email> (2003-2006,2009),
-   Debian JP Documentation ML <email>debian-doc@debian.or.jp</email>
-   </para>
- </refsect1>
-

doc/makefile

@@ -7,17 +7,38 @@ SUBDIRS= $(dir $(wildcard */makefile))
 include ../buildlib/defaults.mak
 
 # Debian Doc SGML Documents
-SOURCE = dpkg-tech.sgml design.sgml files.sgml guide.sgml guide.it.sgml \
-         cache.sgml method.sgml offline.sgml
+SOURCE = $(wildcard *.sgml)
+DEBIANDOC_HTML_OPTIONS=-l en
 include $(DEBIANDOC_H)
 
-# XML man pages
-SOURCE = apt-cache.8 apt-get.8 apt-cdrom.8 apt.conf.5 sources.list.5 \
-         apt-config.8 apt_preferences.5  \
-         apt-sortpkgs.1 apt-ftparchive.1 apt-extracttemplates.1 \
-	 apt-key.8 apt-secure.8 apt-mark.8
-INCLUDES = apt.ent	 
-include $(XML_MANPAGE_H)
+# Do not use XMLTO, build the manpages directly with XSLTPROC
+ifdef XSLTPROC
+# generate a list of accepted man page translations
+SOURCE = $(patsubst %.xml,%,$(wildcard *.?.xml))
+INCLUDES = apt.ent
+STYLESHEET=manpage-style.xsl
+
+LOCAL := manpage-$(firstword $(SOURCE))
+$(LOCAL)-LIST := $(SOURCE)
+
+# Install generation hooks
+doc: $($(LOCAL)-LIST)
+veryclean: veryclean/$(LOCAL)
+
+$($(LOCAL)-LIST) :: % : %.xml $(INCLUDES)
+	echo Creating man page $@
+	$(XSLTPROC) -o $@ $(STYLESHEET) $<
+
+# Clean rule
+.PHONY: veryclean/$(LOCAL)
+veryclean/$(LOCAL):
+	-rm -rf $($(@F)-LIST)
+
+endif
+
+# Chain to the manpage rule
+SOURCE = apt.8
+include $(MANPAGE_H)
 
 # Examples
 SOURCE = examples/apt.conf examples/sources.list examples/configure-index examples/apt-https-method-example.conf
@@ -78,5 +99,4 @@ $(BUILD)/doc/doxygen-stamp: $(DOXYGEN_SOURCES) $(BUILD)/doc/Doxyfile
 	touch $(BUILD)/doc/doxygen-stamp
 
 doc: $(BUILD)/doc/doxygen-stamp
-
 endif

doc/pl/makefile

@@ -5,7 +5,7 @@ SUBDIR=doc/pl
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-# Debian Doc SGML Documents
-SOURCE = offline.pl.sgml
-DEBIANDOC_HTML_OPTIONS=-l pl
-include $(DEBIANDOC_H)
+# Language Code of this translation
+LC=pl
+
+include $(PO4A_MANPAGE_H)

doc/pl/offline.pl.sgml

@@ -1,252 +0,0 @@
-<!doctype debiandoc  PUBLIC  "-//DebianDoc//DTD DebianDoc//EN">
-<!-- -*- mode: sgml; mode: fold -*- -->
-<book>
-<title>Używanie APT w trybie offline</title>
-
-<author>Jason Gunthorpe <email>jgg@debian.org</email></author>
-<author>Polskie tłumaczenie Krzysztof Fiertek <email>akfedux@megapolis.pl</email></author>
-<version>$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $</version>
-
-<abstract>
-Dokument ten opisuje używanie programu APT w środowiskach pozbawionych dostępu,
-do sieci, a w szczególności metodę pozwalającą na robienie aktualizacji systemu.
-</abstract>
-
-<copyright>
-Copyright &copy; Jason Gunthorpe, 1999.
-<p>
-Copyright &copy; polskiego tłumaczenia Krzysztof Fiertek, 2004.
-<p>
-"APT" i ten dokument są oprogramowaniem wolnodostępnym; możesz
-rozpowszechniać je i/lub zmieniać w zgodzie z postanowieniami
-"Ogólnej Licencji Publicznej GNU" (GNU General Public License)
-takiej, jak została opublikowana przez "Fundacje Wolnego
-Oprogramowania (Free Software Foundation); albo w wersji 2 tejże
-licencji, albo (twój wybór) w dowolnej późniejszej.
-
-<p>
-Więcej szczegółów można uzyskać, przeglądając plik zawierający pełny tekst
-licencji (w systemach Debian jest to plik /usr/share/common-licenses/GPL).
-</copyright>
-
-<toc sect>
-
-<chapt>Wstęp
-<!-- Overview                                                         {{{ -->
-<!-- ===================================================================== -->
-<sect>Wprowadzenie
-
-<p>
-Normalnie APT wymaga bezpośredniego dostępu do archiwów Debiana przez
-sieć lokalną albo przez sieć internetową. Kolejną niedogodnością może być
-fakt, że nasz komputer, który pracuje na powolnym łączu takim jak modem,
-jest znacznie oddalony od innego komputera z szybkim łączem.
-
-<p>
-Rozwiązaniem tego problemu jest użycie pojemnych przenośnych nośników
-takich jak dyskietka Zip lub dysk SuperDisk. Nośniki te nie są
-wystarczająco pojemne, by zgromadzić kompletne archiwum Debiana, ale można
-śmiało dopasować podzbiór dużego archiwum wystarczający dla większości
-użytkowników. Pomysł polega na tym, by użyć programu APT do wygenerowania
-listy pakietów, które są wymagane, a następnie pobraniu ich na dysk, używając
-innego komputera z właściwą zwartością. Jest nawet możliwe, by użyć innego
-komputera z Debianem z zainstalowanym programem APT lub zupełnie innym
-systemem operacyjnym i programem narzędziowym do pobierania plików takim
-jak wget.
-
-<p>
-Osiągane jest to przez twórcze manipulowanie plikiem konfiguracyjnym
-programu APT. Rzeczą niezbędną jest poinformowanie programu APT, aby wskazywał
-na dysk z plikami archiwum. Należy zauważyć, że dysk powinien być
-sformatowany do obsługi systemu plików pozwalającego posługiwać się długimi 
-nazwami plików (np. ext2, fat32 albo vfat).
-
-
-</sect>
-                                                                  <!-- }}} -->
-
-<chapt>Używanie programu APT na obu komputerach
-<!-- Overview                                                         {{{ -->
-<!-- ===================================================================== -->
-<sect>Wprowadzenie
-
-<p>
-APT będący do dyspozycji na obu komputerach daje najprostszą kombinację.
-Zasadniczym pomysłem tej metody jest umieszczenie kopii pliku status na dysku
-i użycie odległego komputera, aby uzyskać najnowsze pliki pakietów
-i zdecydować, które pakiety trzeba pobrać. Struktura katalogów na dysku
-powinna wyglądać następująco:
-
-<example>
-  /disc/
-    archives/
-       partial/
-    lists/
-       partial/
-    status
-    sources.list
-    apt.conf
-</example>
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- The configuration file                                            {{{ -->
-<!-- ===================================================================== -->
-<sect>Plik konfiguracyjny
-
-<p>
-Plik konfiguracyjny powinien informować program APT, aby przechowywał swoje
-pliki na dysku, a także używał plików konfiguracyjnych z dysku. Plik
-sources.list powinien zawierać prawidłowe odnośniki, których należy 
-użyć na zdalnym komputerze, a plik status powinien być kopią 
-<em>/var/lib/dpkg/status</em>. Zauważ, że jeśli używasz lokalnego archiwum 
-musisz użyć tych samych odnośników o identycznej składni.
-
-<p>
-<em>apt.conf</em> musi zawierać niezbędne wpisy, by APT korzystał z dysku:
-
-<example>
- APT
- {
-   /* Ten wpis nie jest wymagany, jeśli oba komputery mają tę samą
-      architekturę; mówi on programowi APT na komputerze pobierającym 
-      pakiety, jaka jest architektura naszego komputera */
-   Architecture "i386";
-   
-   Get::Download-Only "true";
- };
- 
- Dir
- {
-   /* Użyj katalogu disc na informacje stanu i przekieruj plik status
-      z domyślnego /var/lib/dpkg */
-   State "/disc/";
-   State::status "status";
-
-   // Katalog lokalnie przechowywanych pakietów binarnych
-   Cache::archives "/disc/archives/";
-
-   Cache "/tmp/";
-
-   // Lokalizacja pliku sources.list.
-   Etc "/disc";
- }; 
-</example>
-
-Więcej szczegółów można zobaczyć w stronie podręcznika apt.conf i w przykładowym 
-pliku konfiguracyjnym <em>/usr/share/doc/apt/examples/apt.conf</em>.
-
-<p>
-Pierwszą rzeczą, jaką należy zrobić na oddalonym komputerze z Debianem to
-zamontować dysk i przekopiować na niego plik <em>/var/lib/dpkg/status</em>.
-Trzeba także utworzyć stukturę katalogów przedstawioną we "Wprowadzeniu":
-<em>archives/partial/</em> i <em>lists/partial/</em>. Następnie niesiemy
-dysk do oddalonego komputera z szybkim łączem i konfigurujemy plik
-sources.list. Na oddalonym komputerze wykonujemy kolejno:
-
-<example>
- # export APT_CONFIG="/disc/apt.conf"
- # apt-get update
- [ APT aktualizuje ustawienia ]
- # apt-get dist-upgrade
- [ APT pobiera wszystkie pakiety potrzebne do aktualizacji Twojego systemu ]
-
-</example>
-
-Polecenie dist-upgrade można zastąpić każdym innym podstawowym poleceniem
-APT, w szczególności dselect-upgrade. Można nawet użyć APT jako metody
-dostępu dla <em>dselect</em>. Jednak stworzy to problem w przeniesieniu
-Twoich operacji wyborów z powrotem na lokalny komputer.
-
-<p>
-W tej chwili katalog disc zawiera wszystkie pliki indeksowe oraz archiwa
-niezbędne do aktualizacji maszyny z Debianem. Bierzemy dysk z powrotem do
-siebie i wpisujemy:
-
-<example>
-  # export APT_CONFIG="/disc/apt.conf"
-  # apt-get check
-  [ APT tworzy lokalną kopię plików cache ]
-  # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade
-  [ Może też być inne polecenie programu APT ]
-</example>
-
-<p> 
-Do prawidłowego działania koniecznie należy podać plik status z lokalnej
-maszyny. To jest bardzo ważne!
-
-<p>
-Jeśli używasz dselect, możesz wykonać bardzo ryzykowną operację skopiowania
-disc/status do /var/lib/dpkg/status, tak że  wszystkie zmiany, których
-dokonałeś na odległym komputerze, będą przeniesione. Mocno zalecam, aby
-dokonywać doboru pakietów tylko na lokalnym komputerze, ale nie zawsze
-jest to możliwe. NIE podmieniaj pliku status, jeśli dpkg lub APT były
-uruchamiane w międzyczasie!!
-
-</sect>
-                                                                  <!-- }}} -->
-
-<chapt>Używanie programów APT i wget
-<!-- Overview                                                         {{{ -->
-<!-- ===================================================================== -->
-<sect>Wprowadzenie
-
-<p>
-<em>wget</em> jest popularnym i przenośnym programem narzędziowym
-pobierania plików, który działa prawie na każdym komputerze.
-W przeciwieństwie do metody opisanej powyżej ta wymaga, aby na lokalnym komputerze
-była aktualna lista dostępnych pakietów.
-
-<p>
-Należy stworzyć katalog disc tylko na pakiety do pobrania z innego
-komputera. Użyta zostanie do tego opcja --print-uris programu apt-get,
-a następnie przygotujemy skrypt dla programu wget, który pobierze właściwe
-pakiety.
-
-</sect>
-                                                                  <!-- }}} -->
-<!-- Operation                                                         {{{ -->
-<!-- ===================================================================== -->
-<sect>Kolejne kroki
-
-<p>
-W odróżnieniu od poprzedniej metody działania ta nie wymaga specjalnych
-plików konfiguracyjnych. Używamy jedynie podstawowych poleceń APT, by
-wygenerować listę plików.
-
-<example>
- # apt-get dist-upgrade 
- [ Wybierz "no" po znaku zachęty, upewnij się, czy to właściwy wybór ]
- # apt-get -qq --print-uris dist-upgrade > uris
- # awk '{print "wget -O " $2 " " $1}' < uris > /disc/wget-script
-</example>
-
-Także inne opcje niż dist-upgrade mogą tu być użyte, włączając
-dselect-upgrade.
-
-<p>
-Plik skryptu /disc/wget-script będzie teraz zawierać listę wywołań programu 
-wget, niezbędnych do pobrania potrzebnych archiwów.
-Skrypt ten należy uruchomić w bieżącym katalogu o punkcie montowania disc,
-tak aby tu zapisywał dane na dysku.
-
-<p>
-Na oddalonym komputerze należy wykonać coś takiego
-
-<example>
-  # cd /disc
-  # sh -x ./wget-script
-  [ czekaj.. ]
-</example>
-
-Gdy archiwa zostaną pobrane i dysk wróci do komputera z Debianem,
-instalowanie można prowadzić dalej poleceniem:
-
-<example>
-  # apt-get -o dir::cache::archives="/disc/" dist-upgrade
-</example>
-
-które użyje pobranych uprzednio archiwów z dysku.
-</sect>
-                                                                  <!-- }}} -->
-</book>

doc/po4a.conf

@@ -33,6 +33,11 @@
                 add_$lang:$lang/addendum/xml_$lang.add
 [type: docbook] sources.list.5.xml $lang:$lang/sources.list.$lang.5.xml \
                 add_$lang:$lang/addendum/xml_$lang.add
+
+[type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml
+#                 add_$lang::$lang/addendum/debiandoc_$lang.add
+[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml
+#                 add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    cache.sgml $lang:$lang/cache.$lang.sgml \
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    design.sgml $lang:$lang/design.$lang.sgml\
@@ -41,10 +46,6 @@
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    files.sgml $lang:$lang/files.$lang.sgml\
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    guide.sgml $lang:$lang/guide.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
 #[type: sgml]    method.sgml $lang:$lang/method.$lang.sgml\
 #                add_$lang::$lang/addendum/debiandoc_$lang.add
-#[type: sgml]    offline.sgml $lang:$lang/offline.$lang.sgml\
-#                add_$lang::$lang/addendum/debiandoc_$lang.add
 

doc/pt_BR/addendum/xml_pt_BR.add

@@ -0,0 +1,5 @@
+PO4A-HEADER:mode=after;position=manbugs;beginboundary=^</refentry>
+ <refsect1><title>Tradução</title>
+   Esta página de manual foi traduzida para o Português do Brasil por
+   André Luís Lopes <email>andrelop@ig.com.br</email>.
+ </refsect1>

doc/pt_BR/apt.ent.pt_BR

@@ -1,157 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-
-<!-- Some common paths.. -->
-<!ENTITY docdir "/usr/share/doc/apt/">
-<!ENTITY configureindex "<filename>&docdir;examples/configure-index.gz</>">
-<!ENTITY aptconfdir "<filename>/etc/apt.conf</>">
-<!ENTITY statedir "/var/lib/apt">
-<!ENTITY cachedir "/var/cache/apt">
-
-<!-- Cross references to other man pages -->
-<!ENTITY apt-conf "<CiteRefEntry>
-    <RefEntryTitle><filename/apt.conf/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY apt-get "<CiteRefEntry>
-    <RefEntryTitle><command/apt-get/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-config "<CiteRefEntry>
-    <RefEntryTitle><command/apt-config/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-cdrom "<CiteRefEntry>
-    <RefEntryTitle><command/apt-cdrom/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-cache "<CiteRefEntry>
-    <RefEntryTitle><command/apt-cache/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY apt-preferences "<CiteRefEntry>
-    <RefEntryTitle><command/apt_preferences/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY sources-list "<CiteRefEntry>
-    <RefEntryTitle><filename/sources.list/</RefEntryTitle>
-    <ManVolNum/5/
-  </CiteRefEntry>">
-
-<!ENTITY reportbug "<CiteRefEntry>
-    <RefEntryTitle><command/reportbug/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-buildpackage "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-buildpackage/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY gzip "<CiteRefEntry>
-    <RefEntryTitle><command/gzip/</RefEntryTitle>
-    <ManVolNum/1/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-scanpackages "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-scanpackages/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dpkg-scansources "<CiteRefEntry>
-    <RefEntryTitle><command/dpkg-scansources/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-
-<!ENTITY dselect "<CiteRefEntry>
-    <RefEntryTitle><command/dselect/</RefEntryTitle>
-    <ManVolNum/8/
-  </CiteRefEntry>">
-    
-<!-- Boiler plate docinfo section -->
-<!ENTITY apt-docinfo "
- <docinfo>
-   <address><email>apt@packages.debian.org</></address>
-   <author><firstname>Jason</> <surname>Gunthorpe</></>
-   <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>
-   <date>12 Março 2001</>
- </docinfo>
-"> 
-
-<!-- Boiler plate Bug reporting section -->
-<!ENTITY manbugs "
- <RefSect1><Title>Bugs</>
-   <para>
-   Consulte a <ulink url='http://bugs.debian.org/apt'>página de bugs do APT</>.
-   Caso você queira relatar um bug no APT, por favor consulte o arquivo
-   <filename>/usr/share/doc/debian/bug-reporting.txt</> ou o comando &reportbug;.
- </RefSect1>
-">
-
-<!-- Boiler plate Author section -->
-<!ENTITY manauthor "
- <RefSect1><Title>Author</>
-   <para>
-   O APT foi escrito pela equipe APT <email>apt@packages.debian.org</>.
- </RefSect1>
-">
-
-<!-- Brazilian Portuguese Translation Credits section -->
-<!ENTITY ptbr-mantranslator "
- <RefSect1><Title>Tradução</>
-   <para>
-   Esta página de manual foi traduzida para o Português do Brasil por
-   André Luís Lopes <email>andrelop@ig.com.br</>.
- </RefSect1>
-">
-
-
-<!-- Should be used within the option section of the text to
-     put in the blurb about -h, -v, -c and -o -->
-<!ENTITY apt-commonoptions "
-     <VarListEntry><term><option/-h/</><term><option/--help/</>
-     <ListItem><Para>
-     Exibe um pequeno resumo de uso.
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-v/</><term><option/--version/</>
-     <ListItem><Para>
-     Exibe a versão do programa.
-     </VarListEntry>
-
-     <VarListEntry><term><option/-c/</><term><option/--config-file/</>
-     <ListItem><Para>
-     Arquivo de Configuração; Especifica um arquivo de configuração
-     a ser usado. O programa irá ler o arquivo de configuração padrão
-     e então este arquivo de configuração. Consulte &apt-conf; para
-     informação de sintaxe.     
-     </VarListEntry>
-     
-     <VarListEntry><term><option/-o/</><term><option/--option/</>
-     <ListItem><Para>
-     Defie uma Opção de Configuração; Esta opção irá definir uma opção
-     de configuração arbitrária. A sintaxe é <option>-o Foo::Bar=bar</>.
-     </VarListEntry>
-">
-
-<!-- Should be used within the option section of the text to
-     put in the blurb about -h, -v, -c and -o -->
-<!ENTITY apt-cmdblurb "
-   <para>
-   Todas as opções de linha de comando podem ser definidas usando o
-   arquivo de configuração, as descrições indicam a opção de configuração
-   a ser definida. Para opções booleanas você pode sobrepor o arquivo de
-   configuração usando algo como <option/-f-/,<option/--no-f/,
-   <option/-f=no/ ou diversas outras variantes.
-   </para>
-">

doc/pt_BR/apt_preferences.pt_BR.5.sgml

@@ -1,589 +0,0 @@
-<!-- -*- mode: sgml; mode: fold -*- -->
-<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V3.1//EN" [
-
-<!ENTITY % aptent SYSTEM "apt.ent.pt_BR">
-%aptent;
-
-]>
-
-<refentry lang="pt_BR">
- &apt-docinfo;
-
- <refmeta>
-   <refentrytitle>apt_preferences</>
-   <manvolnum>5</>
- </refmeta>
-
- <!-- Man page title -->
- <refnamediv>
-    <refname>apt_preferences</>
-    <refpurpose>Arquivo de controle de preferências para o APT</>
- </refnamediv>
-
-<RefSect1>
-<Title>Descrição</Title>
-<para>
-O arquivo de preferências do APT <filename>/etc/apt/preferences</>
-pode ser usado para controlar quais versões de pacotes serão
-selecionadas para instalação.
-</para>
-
-<para>
-Diversas versões de um pacote podem estar disponíveis para
-instalação quando o arquivo &sources-list; contém referências para
-mais de uma distribuição (por exemplo, <literal>stable</literal> e
-<literal>testing</literal>). O APT atribui uma prioridade para cada
-versão que esteja disponível. Sujeito a obstáculos de dependências, o
-<command>apt-get</command> seleciona para instalação a versão com a
-maior prioridade.
-O arquivo de preferências do APT sobrepoe as prioridades que o APT
-atribui a cada versão de pacote por padrão, dando assim ao usuário
-controle sobre qual versão do pacote é selecionada para instalação.
-</para>
-<para>
-Diversas instâncias da mesma versão de um pacote pode estar disponíveis
-quando o arquivo &sources-list; contém referências a mais de uma fonte.
-Nesse caso, o <command>apt-get</command> faz o download da instância
-listada antes no arquivo &sources-list; .
-O arquivo de preferências do APT não afeta a escolha da instância.
-</para>
-
-<RefSect2><Title>Atribuições de Prioridade Padrão do APT</>
-
-<para>
-Caso não exista um arquivo de preferências ou caso não exista uma
-entrada no arquivo que se aplique a uma instância em particular, a
-prioridade atribuída a essa instância é a prioridade da distribuição
-para a qual a instância pertence. É possível selecionar uma distribuição,
-conhecida como "a versão alvo" (the target release), que recebe uma
-prioridade maior do que as outras distribuições. 
-A versão alvo pode ser definida na linha de comando do
-<command>apt-get</command> ou no arquivo de configuração do APT
-<filename>/etc/apt/apt.conf</filename>.
-Por exemplo, 
-<programlisting>
-<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>
-</programlisting>
-<programlisting>
-APT::Default-Release "stable";
-</programlisting>
-</para>
-
-<para>
-Caso uma versão alvo tenha sido especificada o APT usará o seguinte
-algoritmo para definir as prioridades das instâncias de um pacote.
-Atribuirá :
-<variablelist>
-<varlistentry>
-<term>prioridade 100</term>
-<listitem><simpara>para a instância que já esteja instalada (caso exista).</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>prioridade 500</term>
-<listitem><simpara>para as instâncias que não estã instaladas e que não pertencem a versão alvo.</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>prioridade 990</term>
-<listitem><simpara>para as instâncias que não estejam instaladas e pertençam a versão alvo.</simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Caso nenhuma versão alvo tenha sido especificada, o APT simplesmente
-irá atribuir a prioridade 100 para todas as instâncias de pacotes instaladas
-e a prioridade 500 para todas as instâncias de pacotes não instaladas.
-</para>
-
-<para>
-O APT aplica as regras a seguir, listadas em ordem de precedência, para
-determinar qual instância de um pacote instalar.
-<itemizedlist>
-<listitem><simpara>Nunca faz um downgrade a menos que a prioridade de
-uma instância disponível exceda 1000. (Fazer um "downgrade" é instalar uma
-versão menos recente de um pacote no lugar de uma versão mais recente. Note
-que nenhuma das prioridades padrão do APT excede 1000; prioridades altas
-como essa podem ser definidas somente no arquivo de preferências. Note
-também que fazer um "downgrade" pode ser arriscado.)</simpara></listitem>
-<listitem><simpara>Instala a instância de prioridade mais alta.</simpara></listitem>
-<listitem><simpara>Caso duas ou mais instâncias possuam a mesma prioridade,
-instala a instância mais recente (ou seja, aquela com o maior número de
-versão).</simpara></listitem>
-<listitem><simpara>Caso duas ou mais instâncias possuam a mesma prioridade
-e número de versão mas os pacotes sejam diferentes em alguns de seus
-metadados ou a opção <literal/--reinstall/ seja fornecida, instala aquela
-desinstalada.</simpara></listitem>
-</itemizedlist>
-</para>
-
-<para>
-Em uma situação típica, a instância instalada de um pacote
-(prioridade 100) não é tão recente quanto uma das versões disponíveis
-nas fontes listadas no arquivo &sources-list; (prioridade 500 ou 990).
-Então o pacote será atualizado quando os comandos
-<command>apt-get install <replaceable>algum-pacote</replaceable></command>
-ou <command>apt-get dist-upgrade</command> forem executados.
-</para>
-
-<para>
-Mais raramente, a versão instalada de um pacote é <emphasis/mais/
-recente do que qualquer uma das outras versões disponíveis. O dowgrade
-do pacote não será feito quando os comandos
-<command>apt-get install <replaceable>algum-pacote</replaceable></command>
-ou <command>apt-get upgrade</command> forem executados.
-</para>
-
-<para>
-Algumas vezes a versão instalada de um pacote é mais recente que a versão
-que pertence a versão alvo, mas não tão recente quanto a versão que
-pertence a alguma outra distribuição. Um pacote como esse será na verdade
-atualizado quando os comandos
-<command>apt-get install <replaceable>algum-pacote</replaceable></command>
-ou <command>apt-get upgrade</command> forem executados, devido a pelo
-menos <emphasis/uma/ das versões disponíveis possuir uma prioridade maior
-do que a versão instalada.
-</para>
-
-</RefSect2>
-
-<RefSect2><Title>O Efeito das Preferências do APT</>
-
-<para>
-O arquivo de preferências do APT permite ao administrador do
-sistema personalizar prioridades. O arquivo consiste de um ou mais
-registros de múltiplas linhas separados por linhas em branco. Registros
-podem possuir uma das duas formas, uma forma específica e uma forma geral.
-<itemizedlist>
-<listitem>
-<simpara>
-A forma específica atribui uma uma prioridade (uma "Pin-Priority")
-para um pacote e versão ou faixa de versão especificados. Por exemplo,
-o registro a seguir atribui uma prioridade alta para todas as versões do
-pacote <filename/perl/ os quais tenham seus números de versão iniciando
-com "<literal/5.8/".
-</simpara>
-
-<programlisting>
-Package: perl
-Pin: version 5.8*
-Pin-Priority: 1001
-</programlisting>
-</listitem>
-
-<listitem><simpara>
-O forma geral atribui uma prioridade para todas as versões de pacotes em
-uma dada distribuição (isto é, para toda as versões de pacotes que estejam
-em um certo arquivo <filename/Release/) ou para todas as versões de
-pacotes que provenientes de um site Internet em particular, como
-identificado pelo nome de domínio totalmente qualificado do site Internet.
-</simpara>
-
-<simpara>
-Essa entrada de forma geral no arquivo de preferências do APT
-aplica-se somente a grupos de pacotes. Por exemplo, o registro a seguir
-faz com que o APT atribua uma prioridade alta para todas as versões
-de pacotes disponíveis no site local.
-</simpara>
-
-<programlisting>
-Package: *
-Pin: origin ""
-Pin-Priority: 999
-</programlisting>
-
-<simpara>
-Uma nota de aviso : a palavra-chave usada aqui é "<literal/origin/".
-Esta palavra não deve ser confundida com a origem ("Origin:") de uma
-distribuição como especificado em um arquivo <filename/Release/. O que
-segue a tag "Origin:" em um arquivo <filename/Release/ não é um endereço
-de site Internet mas sim nome de autor ou distribuidor (vendor), como
-"Debian" ou "Ximian".
-</simpara>
-
-<simpara>
-O registro a seguir atribui uma prioridade baixa para todas as versões
-de pacote que pertençam a qualquer distribuição cujo nome do Repositório
-seja "<literal/unstable/".
-</simpara>
-
-<programlisting>
-Package: *
-Pin: release a=unstable
-Pin-Priority: 50
-</programlisting>
-
-<simpara>
-O registro a seguir atribui uma prioridade alta para todas as versões de
-pacotes que pertençam a qualquer versão cujo nome do Repositório seja
-"<literal/stable/" e cujo número de versão seja "<literal/3.0/".
-</simpara>
-
-<programlisting>
-Package: *
-Pin: release a=unstable, v=3.0
-Pin-Priority: 50
-</programlisting>
-</listitem>
-</itemizedlist>
-</para>
-
-</RefSect2>
-
-<RefSect2>
-<Title>Como o APT Interpreta Prioridades</Title>
-
-<para>
-Prioridades (P) atribuídas no arquivo de preferências do APT devem ser
-números inteiros positivos ou negativos. Eles são interpretados como a
-seguir (a grosso modo):
-
-<variablelist>
-<varlistentry>
-<term>P &gt; 1000</term>
-<listitem><simpara>faz com que uma instância seja instalada
-mesmo caso isso constitua um dowgrade do pacote</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>990 &lt; P &lt;=1000</term>
-<listitem><simpara>faz com que uma versão seja instalada
-mesmo caso a mesma não venha de uma versão alvo,
-a menos que a versão instalada seja mais recente</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>500 &lt; P &lt;=990</term>
-<listitem><simpara>faz com que uma versão seja instalada
-a menos que exista uma versão disponível pertencente a versão
-alvo ou a versão instalada seja mais recente</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>100 &lt; P &lt;=500</term>
-<listitem><simpara>faz com que uma versão seja instalada
-a menos que exista uma versão disponível pertencente a alguma
-outra distribuição ou a versão instalada seja mais recente</simpara></listitem>
-<varlistentry>
-<term>0 &lt;= P &lt;=100</term>
-<listitem><simpara>faz com que uma versão seja instalada
-somente caso não exista uma versão instalada do pacote</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>P &lt; 0</term>
-<listitem><simpara>impede a versão de ser instalada</simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Caso um dos registro de forma específica descritos acima case (match) com
-uma versão disponível do pacote então o primeiro desses registros
-encontrados determinará a prioridade da versão do pacote. Na falha desse
-cenário, caso quaisquer registros de forma genérica casem (match) com uma
-versão do pacote disponível então o primeiro desses registros encontrado
-determinará a prioridade da versão do pacote.
-</para>
-
-<para>
-Por exemplo, suponha que o arquivo de preferências do APT contenha
-os três registros apresentados anteriormente :
-
-<programlisting>
-Package: perl
-Pin: version 5.8*
-Pin-Priority: 1001
-
-Package: *
-Pin: origin ""
-Pin-Priority: 999
-
-Package: *
-Pin: release unstable
-Pin-Priority: 50
-</programlisting>
-
-Então :
-
-<itemizedlist>
-<listitem><simpara>A versão mais recente disponível do pacote
-<literal/perl/ será instalado, contanto que esse número de versão da
-versão inicie com "<literal/5.8/".  Caso <emphasis/qualquer/ versão 5.8*
-de <literal/perl/ esteja disponível e a versão instalada seja 5.9*, será
-feito um downgrade do <literal/perl/.
-</simpara></listitem>
-<listitem><simpara>Uma versão de qualquer pacote diferente de
-<literal/perl/ que esteja disponível no sistema local possui prioridade
-sobre outras versões, mesmo versões pertencentes a versão alvo.
-</simpara></listitem>
-<listitem><simpara>Uma versão de um pacote cuja origem não seja o sistema
-local mas sim algum outro site listado no arquivo &sources-list; e que
-pertença a uma distribuição <literal/unstable/ é instalada somente
-caso a mesma seja selecionada para instalação e nenhuma versão do
-pacote já esteja instalada.
-</simpara></listitem>
-</itemizedlist>
-</para>
-</RefSect2>
-
-<RefSect2>
-<Title>Determinação da Versão do Pacote e Propriedades da Distribuição</Title>
-
-<para>
-As localidades listadas em um arquivo &sources-list; devem fornecer
-arquivos <filename>Packages</filename> e <filename>Release</filename> para
-descrever os pacotes disponíveis nessas localidades.
-</para>
-
-<para>
-O arquivo <filename>Packages</filename> é normalmente encontrado no
-diretório <filename>.../dists/<replaceable>nome-distribuição</replaceable>/<replaceable>componente</replaceable>/<replaceable>arquitetura</replaceable></filename> :
-por exemplo, <filename>.../dists/stable/main/binary-i386/Packages</filename>.
-O arquivo consiste de uma série de registros de múltiplas linhas, uma para
-cada pacote disponível no diretório. Somente duas linhas em cada registro
-são relevantes para definir prioridades do APT :
-<variablelist>
-<varlistentry>
-<term>a linha <literal/Package:/</term>
-<listitem><simpara>informa o nome do pacote</simpara></listitem>
-</varlistentry>
-<varlistentry>
-<term>a linha <literal/Version:/</term>
-<listitem><simpara>informa o número de versão do pacote</simpara></listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-O arquivo <filename>Release</filename> é normalmente encontrado no
-diretório
-<filename>.../dists/<replaceable>nome-distribuição</replaceable></filename> :
-por exemplo, <filename>.../dists/stable/Release</filename>,
-ou <filename>.../dists/woody/Release</filename>.
-O arquivo consiste de um registro de múltiplas linhas o qual se aplica a
-<emphasis/todos/ os pacotes na àrvore de diretórios abaixo de seu
-diretório pai. Diferente do arquivo <filename/Packages/, quase todas as
-linhas em um arquivo <filename/Release/ são relevantes para a definição de
-prioridades do APT :
-
-<variablelist>
-<varlistentry>
-<term>a linha <literal/Archive:/</term>
-<listitem><simpara>dá nome ao repositório para o qual todos os pacotes
-na àrvore de diretório pertencem. Por exemplo, a linha
-"Archive: stable"
-especifica que todos os pacotes na àrvore de diretório
-abaixo do diretório pai do arquivo <filename/Release/ estão no
-respositório <literal/stable/.  Especificar esse valor no arquivo de
-preferências do APT iria requerer a linha :
-</simpara>
-<programlisting>
-Pin: release a=stable
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>a linha <literal/Version:/</term>
-<listitem><simpara>dá nome a versão da distribuição. Por exemplo, os
-pacote na àrvore podem pertencer a distribuição Debian GNU/Linux versão
-3.0. Note que normalmente não existe número de versão para as
-distribuições <literal/testing/ e <literal/unstable/ devido as mesmas
-não terem sido lançadas ainda. Especificar isso no arquivo de preferências
-do APT iria requerer uma das linhas a seguir.
-</simpara>
-
-<programlisting>
-Pin: release v=3.0
-Pin: release a=stable v=3.0
-Pin: release 3.0
-</programlisting>
-
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>a linha <literal/Component:/</term>
-<listitem><simpara>dá nome ao componente de licenciamento associado com
-os pacotes na àrvore de diretório do arquivo <filename/Release/. Por
-exemplo, a linha "Component: main" especifica que todos os pacotes na
-àrvore de diretório são do componente <literal/main/, o que significa que
-as mesmas estão licenciadas sob os termos da Linhas Guias Debian para o
-Software Livre (a DFSG). Especificar esse componente no arquivo de
-preferências do APT iria requerer a linha :
-</simpara>
-<programlisting>
-Pin: release c=main
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>a linha <literal/Origin:/</term>
-<listitem><simpara>dá nome ao produtor dos pacotes na àrvore de diretório
-do arquivo <filename/Release/. O mais comum é esse valor ser
-<literal/Debian/.  Especificar essa origem no arquivo de preferências do
-APT iria requerer a linha :
-</simpara>
-<programlisting>
-Pin: release o=Debian
-</programlisting>
-</listitem>
-</varlistentry>
-
-<varlistentry>
-<term>a linha <literal/Label:/</term>
-<listitem><simpara>dá nome ao rótulo (label) dos pacotes na árvore de
-diretório. O mais comum é esse valor ser <literal/Debian/. Especificar
-esse rótulo (label) no arquivo de preferências do APT iria requerer a
-linha :
-</simpara>
-<programlisting>
-Pin: release l=Debian
-</programlisting>
-</listitem>
-</varlistentry>
-</variablelist>
-</para>
-
-<para>
-Todos os arquivos <filename>Packages</filename> e
-<filename>Release</filename> obtidos das localidades listadas no arquivo
-&sources-list; são mantidos no diretório
-<filename>/var/lib/apt/lists</filename> ou no arquivo indicado pela variável
-<literal/Dir::State::Lists/ no arquivo <filename/apt.conf/.
-Por exemplo, o arquivo
-<filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-i386_Release</filename>
-contém o arquivo <filename>Release</filename> obtido do site
-<literal/debian.lcs.mit.edu/ para a arquitetura <literal/binary-i386/,
-arquivos do componente <literal/contrib/ da distribuição <literal/unstable/.
-</para>
-
-</RefSect2>
-
-<RefSect2>
-<Title>Linhas Opcionais em um Registro de Preferências do APT</Title>
-
-<para>
-Cada registro em um arquivo de preferências do APT pode opcionalmente
-iniciar com uma ou mais linhas iniciadas com a palavra
-<literal/Explanation:/. Isto oferece um local para inserir comentários.
-</para>
-
-<para>
-A linha <literal/Pin-Priority:/ em cada registro de preferências do
-APT é opcional. Caso omitida, o APT atribuirá uma prioridade de 1 menos o
-último valor especificado em uma linha iniciando com
-<literal/Pin-Priority: release .../.
-</para>
-</RefSect2>
-</RefSect1>
-
-<RefSect1>
-<Title>Exemplos</Title>
-<RefSect2>
-<Title>Acompanhando a Stable</Title>
-
-<para>
-O arquivo de preferências do APT a seguir fará com que o APT atribua uma
-prioridade maior do que a prioridade padrão (500) para todas as versões
-de pacotes pertencentes a distribuição <literal/stable/ e uma prioridade
-proibitivamente baixa para versões de pacotes pertencentes a outras
-distribuições <literal/Debian/.
-
-<programlisting>
-Explanation: Desinstala ou não instala nenhuma versão de pacote originada
-Explanation: do Debian a não ser aquelas na distribuição stable
-Package: *
-Pin: release a=stable
-Pin-Priority: 900
-
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-</programlisting>
-</para>
-
-<para>
-Com um arquivo &sources-list; apropriado e o arquivo de preferências
-acima, quaisquer um dos comandos a seguir farão com que o APT atualize
-para a(s) ulítma(s) versão(ôes) <literal/stable/.
-
-<programlisting>
-apt-get install <replaceable>nome-pacote</replaceable>
-apt-get upgrade
-apt-get dist-upgrade
-</programlisting>
-</para>
-
-<para>
-O comando a seguir fará com que o APT atualize o pacote
-especificado para a última versão da distribuição <literal/testing/;
-o pacote não serpa atualizado novamente a menos que esse comando seja
-executado novamente.
-
-<programlisting>
-apt-get install <replaceable>pacote</replaceable>/testing
-</programlisting>
-</RefSect2>
-
-<RefSect2>
-<Title>Acompanhando a Testing</Title>
-
-<para>
-O arquivo de preferências do APT a seguir fará com que o APT atribua uma
-prioridade maior para versões de pacote da distribuição <literal/testing/,
-uma prioridade menor para versões de pacotes da distribuição
-<literal/unstable/ e uma prioridade proibitivamente baixa para versões de
-pacotes de outras distribuições <literal/Debian/.
-
-<programlisting>
-Package: *
-Pin: release a=testing
-Pin-Priority: 900
-
-Package: *
-Pin: release a=unstable
-Pin-Priority: 800
-
-Package: *
-Pin: release o=Debian
-Pin-Priority: -10
-</programlisting>
-</para>
-
-<para>
-Com um arquivo &sources-list; adequado e o arquivo de preferências do APT
-acima, quaisquer dos comandos a seguir farão com que o APT atualize para
-a(s) última(s) versão(ões) <literal/testing/.
-
-<programlisting>
-apt-get install <replaceable>nome-pacote</replaceable>
-apt-get upgrade
-apt-get dist-upgrade
-</programlisting>
-</para>
-
-<para>
-O comando a seguir fará com que o APT atualize o pacote especificado para
-a última versão da distribuição <literal/unstable/. Assim, o comando
-<command>apt-get upgrade</command> irá atualizar o pacote para a versão
-<literal/testing/ mais recente caso essa versão seja mais recente que a
-versão instalada, caso não seja, o pacote será atualizado para a versão
-<literal/unstable/ mais recente caso a mesma seja mais recente que a
-versão instalada.
-
-<programlisting>
-apt-get install <replaceable>pacote</replaceable>/unstable
-</programlisting>
-</para>
-
-</RefSect2>
-</RefSect1>
-
-<RefSect1>
-<Title>Consulte também</Title>
-<para>
-&apt-get; &apt-cache; &apt-conf; &sources-list;
-</para>
-</RefSect1>
-
- &manbugs;
- &manauthor;
- &ptbr-mantranslator;

doc/pt_BR/makefile

@@ -5,6 +5,7 @@ SUBDIR=doc/pt_BR
 # Bring in the default rules
 include ../../buildlib/defaults.mak
 
-SOURCE = apt_preferences.pt_BR.5
-INCLUDES = apt.ent.pt_BR
-include $(SGML_MANPAGE_H)
+# Language Code of this translation
+LC=pt_BR
+
+include $(PO4A_MANPAGE_H)

doc/sources.list.5.xml

@@ -34,13 +34,13 @@
    <para>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></para>
+   This control file is <filename>/etc/apt/sources.list</filename>.</para>
 
    <para>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
+   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 
@@ -64,14 +64,14 @@
    <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>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.</para>
 
 
    <para>The format for a <filename>sources.list</filename> entry using the
-   <literal>deb</literal> and <literal>deb-src</literal> types are:</para>
+   <literal>deb</literal> and <literal>deb-src</literal> types is:</para>
 
    <literallayout>deb uri distribution [component1] [component2] [...]</literallayout>
 
@@ -79,7 +79,7 @@
    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 
+   a slash (/). This is useful for when the case 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.</para>
@@ -143,7 +143,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     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/
+    http://user:pass@server:port/.
     Note that this is an insecure method of authentication.</para></listitem>
     </varlistentry>
 
@@ -174,6 +174,18 @@ deb http://http.us.debian.org/debian dists/stable-updates/
     <command>dd</command> 
     commands to perform the file transfers from the remote.</para></listitem>
     </varlistentry>
+
+    <varlistentry><term>more recongnizable URI types</term>
+    <listitem><para>
+    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>.
+    </para></listitem>
+    </varlistentry>
   </variablelist>
  </para>
  </refsect1>
@@ -199,7 +211,7 @@ deb http://http.us.debian.org/debian dists/stable-updates/
 
    <para>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>.
+   well as the one in the previous example in <filename>sources.list</filename>
    a single FTP session will be used for both resource lines.</para>
    <literallayout>deb ftp://ftp.debian.org/debian unstable contrib</literallayout>
 

ftparchive/cachedb.cc

@@ -182,11 +182,11 @@ bool CacheDB::GetFileInfo(string FileName, bool DoControl, bool DoContents,
 	Stats.Bytes += CurStat.FileSize;
 	Stats.Packages++;
 
-	if (DoControl && LoadControl() == false
-		|| DoContents && LoadContents(GenContentsOnly) == false
-		|| DoMD5 && GetMD5(false) == false
-		|| DoSHA1 && GetSHA1(false) == false
-		|| DoSHA256 && GetSHA256(false) == false)
+	if ((DoControl && LoadControl() == false)
+		|| (DoContents && LoadContents(GenContentsOnly) == false)
+		|| (DoMD5 && GetMD5(false) == false)
+		|| (DoSHA1 && GetSHA1(false) == false)
+		|| (DoSHA256 && GetSHA256(false) == false))
 	{
 		delete Fd;
 		Fd = NULL;

ftparchive/writer.cc

@@ -308,6 +308,7 @@ PackagesWriter::PackagesWriter(string DB,string Overrides,string ExtOverrides,
    DoSHA256 = _config->FindB("APT::FTPArchive::SHA256",true);
    DoContents = _config->FindB("APT::FTPArchive::Contents",true);
    NoOverride = _config->FindB("APT::FTPArchive::NoOverrideMsg",false);
+   LongDescription = _config->FindB("APT::FTPArchive::LongDescription",true);
 
    if (Db.Loaded() == false)
       DoContents = false;
@@ -414,10 +415,18 @@ bool PackagesWriter::DoPackage(string FileName)
       NewFileName = FileName;
    if (PathPrefix.empty() == false)
       NewFileName = flCombine(PathPrefix,NewFileName);
-          
+
+   /* Configuration says we don't want to include the long Description
+      in the package file - instead we want to ship a separated file */
+   string desc;
+   if (LongDescription == false) {
+      desc = Tags.FindS("Description").append("\n");
+      OverItem->FieldOverride["Description"] = desc.substr(0, desc.find('\n')).c_str();
+   }
+
    // This lists all the changes to the fields we are going to make.
    // (7 hardcoded + maintainer + suggests + end marker)
-   TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1];
+   TFRewriteData Changes[6+2+OverItem->FieldOverride.size()+1+1];
 
    unsigned int End = 0;
    SetTFRewriteData(Changes[End++], "Size", Size);
@@ -429,6 +438,14 @@ bool PackagesWriter::DoPackage(string FileName)
    SetTFRewriteData(Changes[End++], "Status", 0);
    SetTFRewriteData(Changes[End++], "Optional", 0);
 
+   string DescriptionMd5;
+   if (LongDescription == false) {
+      MD5Summation descmd5;
+      descmd5.Add(desc.c_str());
+      DescriptionMd5 = descmd5.Result().Value();
+      SetTFRewriteData(Changes[End++], "Description-md5", DescriptionMd5.c_str());
+   }
+
    // Rewrite the maintainer field if necessary
    bool MaintFailed;
    string NewMaint = OverItem->SwapMaint(Tags.FindS("Maintainer"),MaintFailed);

ftparchive/writer.h

@@ -86,6 +86,7 @@ class PackagesWriter : public FTWScanner
    bool DoSHA256;
    bool NoOverride;
    bool DoContents;
+   bool LongDescription;
 
    // General options
    string PathPrefix;

methods/connect.cc

@@ -190,8 +190,8 @@ bool Connect(string Host,int Port,const char *Service,int DefPort,int &Fd,
 	       return _error->Error(_("Temporary failure resolving '%s'"),
 				    Host.c_str());
 	    }
-	    return _error->Error(_("Something wicked happened resolving '%s:%s' (%i)"),
-				 Host.c_str(),ServStr,Res);
+	    return _error->Error(_("Something wicked happened resolving '%s:%s' (%i - %s)"),
+				 Host.c_str(),ServStr,Res,gai_strerror(Res));
 	 }
 	 break;
       }

methods/https.cc

@@ -138,7 +138,6 @@ bool HttpsMethod::Fetch(FetchItem *Itm)
    curl_easy_setopt(curl, CURLOPT_NOPROGRESS, false);
    curl_easy_setopt(curl, CURLOPT_FAILONERROR, true);
    curl_easy_setopt(curl, CURLOPT_FILETIME, true);
-   curl_easy_setopt(curl, CURLOPT_NETRC, CURL_NETRC_OPTIONAL);
 
    // SSL parameters are set by default to the common (non mirror-specific) value
    // if available (or a default one) and gets overload by mirror-specific ones.

methods/makefile

@@ -6,9 +6,8 @@ SUBDIR=methods
 include ../buildlib/defaults.mak
 BIN := $(BIN)/methods
 
-# FIXME..
-LIB_APT_PKG_MAJOR = 4.8
-APT_DOMAIN := libapt-pkg$(LIB_APT_PKG_MAJOR)
+include ../buildlib/libversion.mak
+APT_DOMAIN := libapt-pkg$(LIBAPTPKG_MAJOR)
 
 # The file method
 PROGRAM=file

po/ar.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2006-10-20 21:28+0300\n"
 "Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
 "Language-Team: Arabic <support@arabeyes.org>\n"
@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s لـ%s %s مُجمّع على %s %s\n"
@@ -432,26 +432,26 @@ msgstr "*** فشل ربط %s بـ%s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -555,7 +555,7 @@ msgstr "فشل تغيير اسم %s إلى %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -700,7 +700,7 @@ msgstr "تثبيت هذه الحزم دون التحقق منها [y/N]؟ "
 msgid "Some packages could not be authenticated"
 msgstr "تعذرت المصادقة على بعض الحزم"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "هناك مشاكل وتم استخدام -y دون --force-yes"
 
@@ -716,11 +716,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة."
 msgid "Internal error, Ordering didn't finish"
 msgstr "خطأ داخلي، لم تنته عملية الترتيب"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "تعذر قَفْل دليل التنزيل"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "تعذرت قراءة قائمة المصادر."
@@ -749,25 +749,26 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "تعذر حساب المساحة الحرة في %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "ليس هناك مساحة كافية في %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "نعم، افعل ما أقوله!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -778,28 +779,28 @@ msgstr ""
 "كي تستمر اكتب العبارة '%s'\n"
 " ؟] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "إجهاض."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "هل تريد الاستمرار [Y/n]؟"
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "فشل إحضار %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "فشل تنزيل بعض الملفات"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "اكتمل التنزيل وفي وضع التنزيل فقط"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -807,47 +808,47 @@ msgstr ""
 "تعذر إحضار بعض الأرشيف، ربما يمكنك محاولة تنفيذ apt-get update أو إضافة --"
 "fix-missing؟"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing وتبديل الأوساط غير مدعومة حالياً"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "تعذر تصحيح الحزم المفقودة."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "إجهاض التثبيت."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "لاحظ، تحديد %s بدلاً من %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "تخطّي %s، حيث أنها مثبتة ولم يتمّ تعيين الترقية.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "الحزمة %s غير مُثبّتة، لذلك لن تُزال\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "الحزمة %s وهميّة وتوفّرها:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [مُثبّتة]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "يجب اختيار واحدة بالتحديد لتثبيتها."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -855,74 +856,85 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "على أيّ فإن الحزم التالية تحلّ مكانها:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "الحزمة %s ليس لها مرشح تثبيت"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "إعادة تثبيت  %s غير ممكنة، حيث أنّه لا يمكن تنزيلها.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s هي النسخة الأحدث.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "تعذر العثور على الإصدارة '%s' للحزمة '%s'"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "النسخة المحددة %s (%s) للإصدارة %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "لا يقبل الأمر update أية مُعطيات"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "تعذر قفل دليل القائمة"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "سيتم تثبيت الحزم الجديدة التالية:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -938,51 +950,51 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "قد تساعد المعلومات التالية في حل المشكلة:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "تعذر العثور على الحزمة %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "إلا أنه سيتم تثبيت %s"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -990,152 +1002,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "حزم معطوبة"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "سيتم تثبيت الحزم الإضافيّة التالية:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "الحزم المقترحة:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "الحزم المستحسنة:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "حساب الترقية..."
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "فشل"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "تمّ"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "تعذر العثور على مصدر الحزمة %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "تخطي الملف '%s' المنزل مسبقاً\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "ليس هناك مساحة كافية في %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "إحضار المصدر %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "فشل إحضار بعض الأرشيفات."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "أمر فك الحزمة '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "أمر البناء '%s' فشل.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "الوحدات المدعومة:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1179,7 +1191,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1581,11 +1593,11 @@ msgid "File not found"
 msgstr "لم يُعثر على الملف"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "فشيل تنفيذ stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "فشل تعيين وقت التعديل"
 
@@ -1713,7 +1725,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr "تعذر قبول الاتصال"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1789,7 +1801,7 @@ msgstr ""
 
 #: methods/connect.cc:193
 #, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
 #: methods/connect.cc:240
@@ -1877,48 +1889,48 @@ msgstr "خادم http له دعم مدى معطوب"
 msgid "Unknown date format"
 msgstr "نسق تاريخ مجهول"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "فشل التحديد"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "انتهى وقت الاتصال"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "خطأ في الكتابة إلى ملف المُخرجات"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "خطأ في الكتابة إلى الملف"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "خطأ في القراءة من الخادم"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "فشلت كتابة الملف %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "بيانات ترويسة سيئة"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "فشل الاتصال"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "خطأ داخلي"
 
@@ -1926,18 +1938,25 @@ msgstr "خطأ داخلي"
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2324,7 +2343,14 @@ msgstr ""
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2332,6 +2358,13 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2534,40 +2567,40 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr "فشل إعادة التسمية ، %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum غير متطابقة"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "الحجم غير متطابق"
 
@@ -2792,8 +2825,18 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
 msgstr ""
 
 #: methods/rsh.cc:330

po/ast.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2009-07-01 18:09+0100\n"
 "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail."
 "com>\n"
@@ -148,7 +148,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pa %s compiláu en %s %s\n"
@@ -525,26 +525,26 @@ msgstr "*** Fall
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Alcanzose'l llímite of %sB de desenllaz.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "L'archivu nun tien el campu paquetes"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nun tien la entrada saltos\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el curiador de %s ye %s y non %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nun tien la entrada saltos de fonte\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampoco nun tiene una entrada binaria de saltos\n"
@@ -648,7 +648,7 @@ msgstr "Nun pudo renomase %s como %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación d'espresión regular - %s"
@@ -793,7 +793,7 @@ msgstr "
 msgid "Some packages could not be authenticated"
 msgstr "Dellos paquetes nun pudieron autenticase"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hai problemes y utilizose -y ensin --force-yes"
 
@@ -809,11 +809,11 @@ msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torg
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error internu, ordenar nun finó"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Nun pue bloquiase'l direutoriu de descarga"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nun pudo lleese la llista de fontes."
@@ -842,25 +842,26 @@ msgstr "Tres d'esta operaci
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Tres d'esta operación, van lliberase %sB d'espaciu de discu.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nun pue determinase l'espaciu llibre de %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nun tienes espaciu libre bastante en %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Conseñose Trivial Only pero ésta nun ye una operación trivial."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡facer lo que digo!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -871,28 +872,28 @@ msgstr ""
 "Pa continuar escribe la frase '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Encaboxar."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quies continuar [S/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Falló algamar %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Dellos ficheros nun pudieron descargase"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en mou de sólo descarga"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -900,47 +901,47 @@ msgstr ""
 "Nun pudieron algamase dellos archivos, ¿seique executando apt-get update o "
 "tentando --fix-missing?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing y cambéu de mediu nun ta sofitao actualmente"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Nun pudieron iguase los paquetes que falten."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Encaboxando la instalación."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota, escoyendo %s nel llugar de %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Saltando %s, ya ta instalau y la actualización nun ta activada.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquete %s nun ta instalau, nun va desaniciase\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "El paquete %s ye un paquete virtual ufríu por:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Instaláu]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Has d'escoyer esplícitamente unu pa instalar."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -951,58 +952,69 @@ msgstr ""
 "Esto puede significar que falta el paquete, ta arrumbáu, o sólo\n"
 "ta disponible dende otra fonte\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Sicasí, los siguientes paquetes reemplacenlu:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "El paquete %s nun tien candidatu pa instalación"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "La reinstalación de %s nun ye dable, nun pue descargase.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s yá ta na versión más nueva.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la distribución '%s' pa '%s'"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Nun s'alcontró la versión '%s' pa '%s'"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Escoyida la versión %s (%s) pa %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
-msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' ehí\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Nun se puede lleer la llista de paquetes d'oríxenes %s"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "La orde update nun lleva argumentos"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Nun pudo bloquiase'l direutoriu de llista"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suponse que nun vamos esborrar coses; nun pue entamase AutoRemover"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1010,18 +1022,18 @@ msgstr ""
 "Los siguientes paquetes instalaronse de manera automática y ya nun se "
 "necesiten:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Los siguientes paquetes instalaronse de manera automática y ya nun se "
 "necesiten:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Usa 'apt-get autoremove' pa desinstalalos."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1039,43 +1051,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información pue aidar a resolver la situación:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error internu, AutoRemover rompió coses"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error internu, AllUpgrade rompió coses"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nun pudo alcontrase la tarea %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nun pudo alcontrase'l paquete %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, escoyendo %s pa la espresión regular '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s axustáu como instaláu manualmente.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Habríes d'executar `apt-get -f install' para iguar estos:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1083,7 +1095,7 @@ msgstr ""
 "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o "
 "conseña una solución)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1095,117 +1107,117 @@ msgstr ""
 "inestable, que dellos paquetes necesarios nun se crearon o que\n"
 "s'allugaron fuera d'Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Paquetes frañaos"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Instalaránse los siguientes paquetes extra:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Paquetes afalaos:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Paquetes encamentaos"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Calculando l'autualización... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Falló"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Fecho"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Error internu, l'iguador de problemes frañó coses"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Has de conseñar polo menos un paquete p'algamar so fonte"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nun pudo alcontrase un paquete fonte pa %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saltando'l ficheru yá descargáu '%s'\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nun hai espaciu llibre bastante en %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai falta descargar %sB/%sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai falta descargar %sB d'archivos fonte.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fonte descargada %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Falló la descarga de dellos archivos."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saltando'l desempaquetáu de la fonte yá desempaquetada en %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orde de desempaquetáu '%s'.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instaláu.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orde build '%s'.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Falló el procesu fíu"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Hai que conseñar polo menos un paquete pa verificar les dependencies de "
 "construcción"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nun pudo algamase información de dependencies de construcción pa %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nun tien dependencies de construcción.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1214,7 +1226,7 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el "
 "paquete %s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1223,32 +1235,32 @@ msgstr ""
 "La dependencia %s en %s nun puede satisfacese porque denguna versión "
 "disponible del paquete %s satisfaz los requisitos de versión"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Nun se pudo satisfacer la dependencia %s pa %s: El paquete instaláu %s ye "
 "demasiao nuevu"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Fallu pa satisfacer la dependencia %s pa %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Les dependencies de construcción de %s nun pudieron satisfacese."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Fallu al procesar les dependencies de construcción"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Módulos sofitaos:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1334,7 +1346,7 @@ msgstr ""
 "pa más información y opciones.\n"
 "                       Esti APT tien Poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1759,11 +1771,11 @@ msgid "File not found"
 msgstr "Nun s'atopa'l ficheru."
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Falló al lleer"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Nun se pudo afitar la hora de modificación"
 
@@ -1891,7 +1903,7 @@ msgstr "Gandi
 msgid "Unable to accept connection"
 msgstr "Nun se pudo aceptar la conexón"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Hebo un problema al xenerar el hash del ficheru"
 
@@ -1966,8 +1978,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Fallu temporal al resolver '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Daqué raru pasó resolviendo '%s:%s' (%i)"
 
 #: methods/connect.cc:240
@@ -2059,47 +2071,47 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance"
 msgid "Unknown date format"
 msgstr "Formatu de data desconocíu"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Falló la escoyeta"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Gandió'l tiempu de conexón"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Fallu al escribir nel ficheru de salida"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Fallu al escribir nel ficheru"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fallu al lleer nel sirvidor. El llau remotu zarró la conexón."
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Fallu al lleer nel sirvidor"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Falló al francer el ficheru"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Datos de testera incorreutos"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Fallo la conexón"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Fallu internu"
 
@@ -2107,12 +2119,12 @@ msgstr "Fallu internu"
 msgid "Can't mmap an empty file"
 msgstr "Nun se puede facer mmap d'un ficheru baleru"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nun se pudo facer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2121,6 +2133,13 @@ msgstr ""
 "Dynamic MMap escosó l'espaciu. Por favor aumenta'l tamañu de APT::Cache-"
 "Limit. El valor actual ye : %lu. (man 5 apt.conf)"
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2507,7 +2526,14 @@ msgstr "Triba '%s' desconocida na llinia %u de la llista d'or
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Llinia %u mal formada na llista d'oríxenes %s (id del proveedor)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2518,6 +2544,13 @@ msgstr ""
 "esencial %s por un cote de Conflictos/Pre-Dependencies. Esto normalmente ye "
 "malo, pero si daveres quies facelo, activa la opción  APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2728,19 +2761,19 @@ msgstr "Fallu de E/S al grabar cach
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló'l cambiu de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 nun concasa"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "La suma hash nun concasa"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nun hai clave pública denguna disponible pa les IDs de clave darréu:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2749,7 +2782,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete (por faltar una arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2758,7 +2791,7 @@ msgstr ""
 "Nun pudo alcontrase un ficheru pal paquete %s. Esto puede significar que "
 "necesites iguar manualmente esti paquete"
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2766,7 +2799,7 @@ msgstr ""
 "Los ficheros d'indiz de paquetes tan corrompíos. Nun hai campu Filename: pal "
 "paquete %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "El tamañu nun concasa"
 
@@ -2998,14 +3031,30 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non bloquiáu"
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Nun fui quien a parchiar el ficheru"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Conexón encaboxada prematuramente"
 
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Nenguna fonte de paquetes'% s' esbillada '% s' ehí\n"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Nun fui quien a parchiar el ficheru"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/bg.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2009-01-27 12:41+0200\n"
 "Last-Translator: Damyan Ivanov <dmn@debian.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s за %s компилиран на %s %s\n"
@@ -538,26 +538,26 @@ msgstr "*** Неуспех при създаването на връзка %s к
 msgid " DeLink limit of %sB hit.\n"
 msgstr "Превишен лимит на DeLink от %sB.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Архивът няма поле „package“"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s няма запис „override“\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  поддържащия пакета %s е %s, а не %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s няма запис „source override“\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s няма също и запис „binary override“\n"
@@ -661,7 +661,7 @@ msgstr "Неуспех при преименуването на %s на %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Грешка при компилирането на регулярния израз - %s"
@@ -808,7 +808,7 @@ msgstr "Инсталиране на тези пакети без проверк
 msgid "Some packages could not be authenticated"
 msgstr "Някои пакети не можаха да бъдат удостоверени"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Има проблеми и „-y“ е използвано без „--force-yes“"
 
@@ -824,11 +824,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п
 msgid "Internal error, Ordering didn't finish"
 msgstr "Вътрешна грешка, „Ordering“ не завърши"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Неуспех при заключването на директорията за изтегляне"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Списъкът с източници не можа да бъде прочетен."
@@ -860,25 +860,26 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Неуспех при определянето на свободното пространство в %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Нямате достатъчно свободно пространство в %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Указано е „Trivial Only“, но това не е тривиална операция."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Да, прави каквото казвам!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -889,28 +890,28 @@ msgstr ""
 "За да продължите, въведете фразата „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Прекъсване."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Искате ли да продължите [Y/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Неуспех при изтеглянето на %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Някои файлове не можаха да бъдат изтеглени"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Изтеглянето завърши в режим само на изтегляне"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -918,47 +919,47 @@ msgstr ""
 "Неуспех при изтеглянето на някои архиви, може да изпълните „apt-get update“ "
 "или да опитате с „--fix-missing“?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "„--fix-missing“ и превключване на носители не се поддържа все още"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Неуспех при коригирането на липсващите пакети."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Прекъсване на инсталирането."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Забележете, избиране на %s вместо %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Пропускане на %s, вече е инсталиран и не е маркиран за актуализация.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Пакетът %s не е инсталиран, така че не е премахнат\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Пакетът %s е виртуален пакет, осигурен от:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Инсталиран]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Трябва изрично да изберете един за инсталиране."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -969,75 +970,87 @@ msgstr ""
 "Това може да означава, че пакета липсва, остарял е, или е достъпен\n"
 "само от друг източник\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Обаче следните пакети го заместват:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Пакетът %s няма кандидат за инсталиране"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Преинсталацията на %s не е възможна, не може да бъде изтеглен.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s вече е най-новата версия.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Не е намерено издание „%s“ на „%s“"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Не е намерена версия „%s“ на „%s“"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Избрана е версия %s (%s) за %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr ""
+"Неуспех при получаването на атрибути на списъка с пакети с изходен код %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Командата „update“ не възприема аргументи"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Неуспех при заключването на директорията със списъка на пакетите"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Следните пакети са били инсталирани автоматично и вече не са необходими:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Използвайте „apt-get autoremove“ за да ги премахнете."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1055,44 +1068,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Следната информация може да помогне за намиране на изход от ситуацията:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Неуспех при намирането на задача %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Неуспех при намирането на пакет %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Забележете, избиране на %s за регулярен израз „%s“\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s е отбелязан като ръчно инсталиран.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1100,7 +1113,7 @@ msgstr ""
 "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или "
 "укажете разрешение)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1112,118 +1125,118 @@ msgstr ""
 "дистрибуция, че някои необходими пакети още не са създадени или пък\n"
 "са били преместени от Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Счупени пакети"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Следните допълнителни пакети ще бъдат инсталирани:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Предложени пакети:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Препоръчвани пакети:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Изчисляване на актуализацията..."
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Неуспех"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Готово"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Неуспех при намирането на изходен код на пакет %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Пропускане на вече изтегления файл „%s“\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Нямате достатъчно свободно пространство в %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Изтегляне на изходен код %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Неуспех при изтеглянето на някои архиви."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Командата за разпакетиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Командата за компилиране „%s“ пропадна.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Процесът-потомък пропадна"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Трябва да укажете поне един пакет за проверка на зависимости за компилиране"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Неуспех при получаването на информация за зависимостите за компилиране на %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s няма зависимости за компилиране.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1232,7 +1245,7 @@ msgstr ""
 "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s "
 "не може да бъде намерен"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1242,32 +1255,32 @@ msgstr ""
 "налични версии на пакета %s, които могат да удовлетворят изискването за "
 "версия"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният "
 "пакет %s е твърде нов"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Неуспех при обработката на зависимостите за компилиране"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Поддържани модули:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1354,7 +1367,7 @@ msgstr ""
 "информация и опции.\n"
 "                           Това APT има Върховни Сили.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1772,11 +1785,11 @@ msgid "File not found"
 msgstr "Файлът не е намерен"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Неуспех при получаването на атрибути"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Неуспех при задаването на време на промяна"
 
@@ -1906,7 +1919,7 @@ msgstr "Времето за установяване на връзка с гне
 msgid "Unable to accept connection"
 msgstr "Невъзможно е да се приеме свързването"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Проблем при хеширане на файла"
 
@@ -1981,8 +1994,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Временен неуспех при намирането на IP адреса на „%s“"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)"
 
 #: methods/connect.cc:240
@@ -2078,47 +2091,47 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл
 msgid "Unknown date format"
 msgstr "Неизвестен формат на дата"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Неуспех на избора"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Допустимото време за свързване изтече"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Грешка при записа на изходен файл"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Грешка при записа на файл"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Грешка при записа на файла"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Грешка при четене от сървъра"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Неуспех при отрязване на края на файла"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Невалидни данни на заглавната част"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Неуспех при свързването"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Вътрешна грешка"
 
@@ -2126,18 +2139,25 @@ msgstr "Вътрешна грешка"
 msgid "Can't mmap an empty file"
 msgstr "Невъзможно е да се прехвърли в паметта празен файл"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Неуспех при прехвърлянето в паметта на %lu байта"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2532,7 +2552,14 @@ msgstr ""
 "Лошо форматиран ред %u в списъка с източници %s (идентификатор на "
 "производител)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2544,6 +2571,13 @@ msgstr ""
 "пакет %s. Това често е лошо, но ако наистина искате да го направите, "
 "активирайте опцията APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2761,19 +2795,19 @@ msgstr "Входно/изходна грешка при запазването
 msgid "rename failed, %s (%s -> %s)."
 msgstr "преименуването се провали, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Несъответствие на контролна сума MD5"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Несъответствие на контролната сума"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Няма налични публични ключове за следните идентификатори на ключове:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2782,7 +2816,7 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет (поради пропусната архитектура)."
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2791,14 +2825,14 @@ msgstr ""
 "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва "
 "ръчно да оправите този пакет."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Индексните файлове на пакета са повредени. Няма поле Filename: за пакет %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Несъответствие на размера"
 
@@ -3028,14 +3062,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Неуспех при закърпване на файла"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Връзката прекъсна преждевременно"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Неуспех при закърпване на файла"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/bs.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2004-05-06 15:25+0100\n"
 "Last-Translator: Safir Šećerović <sapphire@linux.org.ba>\n"
 "Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -152,7 +152,7 @@ msgstr ""
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr ""
@@ -440,26 +440,26 @@ msgstr ""
 msgid " DeLink limit of %sB hit.\n"
 msgstr ""
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr ""
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr ""
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr ""
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -563,7 +563,7 @@ msgstr ""
 msgid "Y"
 msgstr ""
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr ""
@@ -708,7 +708,7 @@ msgstr ""
 msgid "Some packages could not be authenticated"
 msgstr ""
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr ""
 
@@ -724,11 +724,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr ""
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr ""
@@ -757,25 +757,26 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr ""
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Da, uradi kako kažem!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -783,75 +784,75 @@ msgid ""
 " ?] "
 msgstr ""
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Odustani."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Da li želite nastaviti? [Y/n]"
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr ""
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr ""
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 msgstr ""
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr ""
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Odustajem od instalacije."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr "[Instalirano]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr ""
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -859,74 +860,85 @@ msgid ""
 "is only available from another source\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Međutim, slijedeći paketi ga zamjenjuju:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr ""
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr ""
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Picking '%s' as source package instead of '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr ""
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr ""
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "Slijedeći NOVI paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -942,49 +954,49 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ali se %s treba instalirati"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -992,152 +1004,152 @@ msgid ""
 "or been moved out of Incoming."
 msgstr ""
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Oštećeni paketi"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Slijedeći dodatni paketi će biti instalirani:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Predloženi paketi:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Preporučeni paketi:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Računam nadogradnju..."
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Neuspješno"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Urađeno"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr ""
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr ""
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr ""
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 msgstr ""
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr ""
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr ""
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr ""
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Podržani moduli:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1181,7 +1193,7 @@ msgid ""
 "                       This APT has Super Cow Powers.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1578,11 +1590,11 @@ msgid "File not found"
 msgstr "Datoteka nije pronađena"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr ""
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr ""
 
@@ -1709,7 +1721,7 @@ msgstr ""
 msgid "Unable to accept connection"
 msgstr ""
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr ""
 
@@ -1785,7 +1797,7 @@ msgstr ""
 
 #: methods/connect.cc:193
 #, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 
 #: methods/connect.cc:240
@@ -1874,48 +1886,48 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Nepoznat oblik datuma"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr ""
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr ""
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr ""
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr ""
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr ""
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr ""
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Ne mogu ukloniti %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr ""
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Povezivanje neuspješno"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Unutrašnja greška"
 
@@ -1923,18 +1935,25 @@ msgstr "Unutrašnja greška"
 msgid "Can't mmap an empty file"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr ""
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2322,7 +2341,14 @@ msgstr ""
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2330,6 +2356,13 @@ msgid ""
 "you really want to do it, activate the APT::Force-LoopBreak option."
 msgstr ""
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2532,39 +2565,39 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
 "to manually fix this package. (due to missing arch)"
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr ""
 
@@ -2789,8 +2822,18 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
 msgstr ""
 
 #: methods/rsh.cc:330

po/ca.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.22\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2009-06-06 02:17+0200\n"
 "Last-Translator: Jordi Mallach <jordi@debian.org>\n"
 "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n"
@@ -153,7 +153,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s per a %s compilat el %s %s\n"
@@ -528,26 +528,26 @@ msgstr "*** No s'ha pogut enllaçar %s a %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink s'ha arribat al límit de %sB.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Arxiu sense el camp paquet"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s no té una entrada dominant\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  el mantenidor de %s és %s, no %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s no té una entrada dominant de font\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s no té una entrada dominant de binari\n"
@@ -651,7 +651,7 @@ msgstr "No s'ha pogut canviar el nom de %s a %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "S'ha produït un error de compilació de l'expressió regular - %s"
@@ -796,7 +796,7 @@ msgstr "Voleu instal·lar aquests paquets sense verificar-los [s/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "No s'ha pogut autenticar alguns paquets"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hi ha problemes i s'ha emprat -y sense --force-yes"
 
@@ -815,11 +815,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "S'ha produït un error intern, l'ordenació no ha acabat"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "No és possible blocar el directori de descàrrega"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No s'ha pogut llegir la llista de les fonts."
@@ -850,25 +850,26 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Després d'aquesta operació s'alliberaran %sB d'espai en disc.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No s'ha pogut determinar l'espai lliure en %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No teniu prou espai lliure en %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Es va especificar Trivial Only però aquesta operació no és trivial."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Sí, fes el que et dic!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -879,28 +880,28 @@ msgstr ""
 "Per a continuar escriviu la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Avortat."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Voleu continuar [S/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "No s'ha pogut obtenir %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Alguns fitxers no s'han pogut baixar"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Descàrrega completa i en mode de només descàrrega"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -908,48 +909,48 @@ msgstr ""
 "No es poden baixar alguns arxius, proveu a executar apt-get update o "
 "intenteu-ho amb --fix-missing."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing i els medi intercanviables actualment no estan suportats"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "No es poden corregir els paquets que falten."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "S'està avortant la instal·lació."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota: s'està seleccionant %s en comptes de %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "S'està ometent %s, ja està instal·lat i l'actualització no està establerta.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquet %s no està instal·lat, així doncs no es suprimirà\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "El paquet %s és un paquet virtual proveït per:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Instal·lat]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Necessiteu seleccionar-ne un explícitament per a instal·lar-lo."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -960,77 +961,88 @@ msgstr ""
 "en fa referència. Això normalment vol dir que el paquet falta,\n"
 "s'ha tornat obsolet o només és disponible des d'una altra font.\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Tot i que els següents paquets el reemplacen:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "El paquet %s no té candidat d'instal·lació"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es possible la reinstal·lació del paquet %s, no es pot baixar.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ja es troba en la versió més recent.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió puntual «%s» per a «%s»"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No s'ha trobat la versió «%s» per a «%s»"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versió seleccionada %s (%s) per a %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
-msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "No s'ha pogut llegir la llista de paquets font %s"
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "L'ordre update no pren arguments"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "No es pot blocar el directori de la llista"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es suposa que no hauriem de suprimir coses, no es pot iniciar el supressor "
 "automàtic"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Els paquets següents s'instal·laren automàticament i ja no són necessaris:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empreu «apt-get autoremove» per a suprimir-los."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1048,43 +1060,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "La informació següent pot ajudar-vos a resoldre la situació:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "S'ha produït un error intern, el supressor automàtic ha trencat coses"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error intern, AllUpgrade ha trencat coses"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No s'ha pogut trobar la tasca %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No s'ha pogut trobar el paquet %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota: s'està seleccionant %s per a l'expressió regular '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "S'ha marcat %s com instal·lat manualment.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Potser voldreu executar `apt-get -f install' per a corregir-ho:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1092,7 +1104,7 @@ msgstr ""
 "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o "
 "especifiqueu una solució)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1104,120 +1116,120 @@ msgstr ""
 "unstable i alguns paquets requerits encara no han estat creats o bé\n"
 "encara no els hi han afegit."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Paquets trencats"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "S'instal·laran els següents paquets extres:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Paquets suggerits:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Paquets recomanats:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "S'està calculant l'actualització... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Ha fallat"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Fet"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "S'ha produït un error intern, el solucionador de problemes ha trencat coses"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Haureu d'especificar un paquet de codi font per a baixar"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No es pot trobar un paquet de fonts per a %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "S'està ometent el fitxer ja baixat «%s»\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No teniu prou espai lliure en %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es necessita baixar %sB/%sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es necessita baixar %sB d'arxius font.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obté el font %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "No s'ha pogut baixar alguns arxius."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "S'està ometent el desempaquetament de les fonts que ja ho estan en %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "L'ordre de desempaquetar «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comproveu si el paquet «dpkgdev» està instal·lat.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "L'ordre de construir «%s» ha fallat.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Ha fallat el procés fill"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "S'ha d'especificar un paquet per a verificar les dependències de construcció "
 "per a"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "No es pot obtenir informació sobre les dependències de construcció per a %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no té dependències de construcció.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1226,7 +1238,7 @@ msgstr ""
 "La dependència %s en %s no es pot satisfer per que no es pot trobar el "
 "paquet %s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1235,32 +1247,32 @@ msgstr ""
 "La dependència %s per a %s no es pot satisfer per que cap versió del paquet %"
 "s pot satisfer els requeriments de versions"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No s'ha pogut satisfer la dependència %s per a %s: El paquet instal·lat %s "
 "és massa nou"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No s'ha pogut satisfer la dependència %s per a %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No s'han pogut satisfer les dependències de construcció per a %s"
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "No es poden processar les dependències de construcció"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Mòduls suportats:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1346,7 +1358,7 @@ msgstr ""
 "per a obtenir més informació i opcions.\n"
 "                       Aquest APT té superpoders bovins\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1768,11 +1780,11 @@ msgid "File not found"
 msgstr "Fitxer no trobat"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "L'estat ha fallat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "No s'ha pogut establir el temps de modificació"
 
@@ -1901,7 +1913,7 @@ msgstr "S'ha esgotat el temps de connexió al sòcol de dades"
 msgid "Unable to accept connection"
 msgstr "No es pot acceptar la connexió"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema escollint el fitxer"
 
@@ -1976,8 +1988,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "S'ha produït un error temporal en resoldre '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Ha passat alguna cosa estranya en resoldre «%s:%s» (%i)"
 
 #: methods/connect.cc:240
@@ -2073,48 +2085,48 @@ msgstr "Aquest servidor HTTP té el suport d'abast trencat"
 msgid "Unknown date format"
 msgstr "Format de la data desconegut"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Ha fallat la selecció"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Connexió finalitzada"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "S'ha produït un error en escriure al fitxer de sortida"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "S'ha produït un error en escriure al fitxer"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "S'ha produït un error en llegir, el servidor remot ha tancat la connexió"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "S'ha produït un error en llegir des del servidor"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "No s'ha pogut truncar el fitxer %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Capçalera de dades no vàlida"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Ha fallat la connexió"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Error intern"
 
@@ -2122,12 +2134,12 @@ msgstr "Error intern"
 msgid "Can't mmap an empty file"
 msgstr "No es pot transferir un fitxer buit a memòria"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 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:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2136,6 +2148,13 @@ msgstr ""
 "No hi ha espai per al «Dynamic MMap». Incrementeu la mida d'APT::Cache-Limit. "
 "Valor actual: %lu. (man 5 apt.conf)"
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2522,7 +2541,14 @@ msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "La línia %u és malformada en la llista de fonts %s (id del proveïdor)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2534,6 +2560,13 @@ msgstr ""
 "dolenta, però si realment desitgeu fer-la, activeu l'opció APT::Force-"
 "LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2753,19 +2786,19 @@ msgstr "Error d'E/S en desar la memòria cau de la font"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "no s'ha pogut canviar el nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 no concorda"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "La suma resum no concorda"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "No hi ha cap clau pública disponible per als següents ID de clau:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2775,7 +2808,7 @@ msgstr ""
 "significar que haureu d'arreglar aquest paquet manualment (segons "
 "arquitectura)."
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2784,7 +2817,7 @@ msgstr ""
 "No s'ha trobat un fitxer pel paquet %s. Això podria significar que haureu "
 "d'arreglar aquest paquet manualment."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2792,7 +2825,7 @@ msgstr ""
 "L'índex dels fitxers en el paquet està corromput. Fitxer no existent: camp "
 "per al paquet %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "La mida no concorda"
 
@@ -3024,14 +3057,30 @@ msgstr ""
 msgid "Not locked"
 msgstr "No blocat"
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "No s'ha pogut aplicar el pedaç al fitxer"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "La connexió s'ha tancat prematurament"
 
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "No hi ha cap paquet font «%s», es selecciona «%s» en el seu lloc\n"
+
+#~ msgid "Could not patch file"
+#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/cs.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-11-16 18:05+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -151,7 +151,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pro %s zkompilován na %s %s\n"
@@ -523,26 +523,26 @@ msgstr "*** Nezdařilo se slinkovat %s s %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Odlinkovací limit %sB dosažen.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Archiv nemá pole Package"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s nemá žádnou položku pro override\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  správce %s je %s, ne %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s nemá žádnou zdrojovou položku pro override\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s nemá ani žádnou binární položku pro override\n"
@@ -646,7 +646,7 @@ msgstr "Selhalo přejmenování %s na %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Chyba při kompilaci regulárního výrazu - %s"
@@ -791,7 +791,7 @@ msgstr "Instalovat tyto balíky bez ověření [y/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "Některé balíky nemohly být autentizovány"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Vyskytly se problémy a -y bylo použito bez --force-yes"
 
@@ -807,11 +807,11 @@ msgstr "Balík je potřeba odstranit ale funkce Odstranit je vypnuta."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Vnitřní chyba, třídění nedoběhlo do konce"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Nemohu zamknout adresář pro stahování"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Nelze přečíst seznam zdrojů."
@@ -841,25 +841,26 @@ msgstr "Po této operaci bude na disku použito dalších %sB.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Po této operaci bude na disku uvolněno %sB.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nemohu určit volné místo v %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "V %s nemáte dostatek volného místa."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Udáno „pouze triviální“, ovšem toto není triviální operace."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Ano, udělej to tak, jak říkám!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -870,28 +871,28 @@ msgstr ""
 "Pro pokračování opište frázi „%s“\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Přerušeno."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Chcete pokračovat [Y/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Selhalo stažení %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Některé soubory nemohly být staženy"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Stahování dokončeno v režimu pouze stáhnout"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -899,47 +900,47 @@ msgstr ""
 "Nemohu stáhnout některé archivy. Možná spusťte apt-get update nebo zkuste --"
 "fix-missing?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing a výměna média nejsou momentálně podporovány"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Nemohu opravit chybějící balíky."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Přerušuji instalaci."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Pozn: Vybírám %s místo %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Přeskakuji %s, protože je již nainstalován.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Balík %s není nainstalován, nelze tedy odstranit\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Balík %s je virtuální balík poskytovaný:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr "[Instalovaný]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Měli byste explicitně vybrat jeden k instalaci."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -950,75 +951,86 @@ msgstr ""
 "To může znamenat že balík chybí, byl zastarán, nebo je dostupný\n"
 "pouze z jiného zdroje\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Nicméně následující balíky jej nahrazují:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Balík %s nemá kandidáta pro instalaci"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Reinstalace %s není možná, protože nelze stáhnout.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s je již nejnovější verze.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Vydání „%s“ pro „%s“ nebylo nalezeno"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Verze „%s“ pro „%s“ nebyla nalezena"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Vybraná verze %s (%s) pro %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Příkaz update neakceptuje žádné argumenty"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Nemohu uzamknout list adresář"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Neměli bychom mazat věci, nemůžu spustit AutoRemover"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Následující balíky byly nainstalovány automaticky a již nejsou potřeba:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Pro jejich odstranění použijte „apt-get autoremove“."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1036,43 +1048,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Následující informace vám mohou pomoci vyřešit tuto situaci:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Vnitřní chyba, AutoRemover pokazil věci"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Vnitřní chyba, AllUpgrade pokazil věci"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Nemohu najít úlohu %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Nemohu najít balík %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Pozn: vybírám %s pro regulární výraz „%s“\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s nastaven jako instalovaný ručně.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pro opravení následujících můžete spustit „apt-get -f install“:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1080,7 +1092,7 @@ msgstr ""
 "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo "
 "navrhněte řešení)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1091,124 +1103,124 @@ msgstr ""
 "nemožnou situaci, nebo, pokud používáte nestabilní distribuci, že\n"
 "vyžadované balíky ještě nebyly vytvořeny nebo přesunuty z Příchozí fronty."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Poškozené balíky"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Následující extra balíky budou instalovány:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Navrhované balíky:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Doporučované balíky:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Propočítávám aktualizaci... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Selhalo"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Hotovo"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Vnitřní chyba, řešitel problémů pokazil věci"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Musíte zadat aspoň jeden balík, pro který se stáhnou zdrojové texty"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nemohu najít zdrojový balík pro %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Přeskakuji dříve stažený soubor „%s“\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Na %s nemáte dostatek volného místa"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB/%sB zdrojových archivů.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Potřebuji stáhnout %sB zdrojových archivů.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Stáhnout zdroj %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Stažení některých archivů selhalo."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Přeskakuji rozbalení již rozbaleného zdroje v %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Příkaz pro rozbalení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Zkontrolujte, zda je nainstalován balíček „dpkg-dev“.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Příkaz pro sestavení „%s“ selhal.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Synovský proces selhal"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Musíte zadat alespoň jeden balík, pro který budou kontrolovány závislosti "
 "pro sestavení"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nemohu získat závislosti pro sestavení %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s nemá žádné závislosti pro sestavení.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s závislost pro %s nemůže být splněna, protože balík %s nebyl nalezen"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1217,31 +1229,31 @@ msgstr ""
 "%s závislost pro %s nemůže být splněna protože není k dispozici verze balíku "
 "%s, která odpovídá požadavku na verzi"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Selhalo splnění %s závislosti pro %s: Instalovaný balík %s je příliš nový"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Selhalo splnění %s závislosti pro %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Závislosti pro sestavení %s nemohly být splněny."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Chyba při zpracování závislostí pro sestavení"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Podporované moduly:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1325,7 +1337,7 @@ msgstr ""
 "a apt.conf(5).\n"
 "                       Tato APT má schopnosti svaté krávy.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1740,11 +1752,11 @@ msgid "File not found"
 msgstr "Soubor nebyl nalezen"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Selhalo vyhodnocení"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Nelze nastavit čas modifikace"
 
@@ -1872,7 +1884,7 @@ msgstr "Spojení datového socketu vypršelo"
 msgid "Unable to accept connection"
 msgstr "Nemohu přijmout spojení"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problém s hashováním souboru"
 
@@ -1947,8 +1959,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Dočasné selhání při zjišťování „%s“"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Něco hodně ošklivého se přihodilo při zjišťování „%s:%s“ (%i)"
 
 #: methods/connect.cc:240
@@ -2039,47 +2051,47 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů"
 msgid "Unknown date format"
 msgstr "Neznámý formát data"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Výběr selhal"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Čas spojení vypršel"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Chyba zápisu do výstupního souboru"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Chyba zápisu do souboru"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Chyba čtení ze serveru"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Nelze zmenšit soubor"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Špatné datové záhlaví"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Spojení selhalo"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
@@ -2087,18 +2099,25 @@ msgstr "Vnitřní chyba"
 msgid "Can't mmap an empty file"
 msgstr "Nemohu provést mmap prázdného souboru"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nešlo mmapovat %lu bajtů"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2485,7 +2504,14 @@ msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2496,6 +2522,13 @@ msgstr ""
 "smyčce v Conflicts/Pre-Depends. To je často špatné, ale pokud to skutečně "
 "chcete udělat, aktivujte možnost APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2703,19 +2736,19 @@ msgstr "Chyba IO při ukládání zdrojové cache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "přejmenování selhalo, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Neshoda MD5 součtů"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Neshoda kontrolních součtů"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "K následujícím ID klíčů není dostupný veřejný klíč:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2724,7 +2757,7 @@ msgstr ""
 "Nebyl jsem schopen nalézt soubor s balíkem %s. To by mohlo znamenat, že "
 "tento balík je třeba opravit ručně (kvůli chybějící architektuře)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2733,14 +2766,14 @@ msgstr ""
 "Nebyl jsem schopen nalézt soubor s balíkem %s. Asi budete muset tento balík "
 "opravit ručně."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Indexové soubory balíku jsou narušeny. Chybí pole Filename: u balíku %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Velikosti nesouhlasí"
 
@@ -2969,14 +3002,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Nemohu záplatovat soubor"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Spojení bylo předčasně ukončeno"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Nemohu záplatovat soubor"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/cy.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: APT\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2005-06-06 13:46+0100\n"
 "Last-Translator: Dafydd Harries <daf@muse.19inch.net>\n"
 "Language-Team: Welsh <cy@pengwyn.linux.org.uk>\n"
@@ -169,7 +169,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s ar gyfer %s %s wedi ei grynhow ar %s %s\n"
@@ -551,26 +551,26 @@ msgstr "*** Methwyd cysylltu %s at %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr "  Tarwyd y terfyn cyswllt %sB.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Doedd dim maes pecyn gan yr archif"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  Cynaliwr %s yw %s nid %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, fuzzy, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, fuzzy, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  Does dim cofnod gwrthwneud gan %s\n"
@@ -675,7 +675,7 @@ msgstr "Methwyd ailenwi %s at %s"
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Gwall crynhoi patrwm - %s"
@@ -827,7 +827,7 @@ msgstr ""
 msgid "Some packages could not be authenticated"
 msgstr "RHYBUDD: Ni ellir dilysu'r pecynnau canlynol yn ddiogel!"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Mae problemau a defnyddwyd -y heb --force-yes"
 
@@ -845,11 +845,11 @@ msgstr "Rhaid tynnu pecynnau on mae Tynnu wedi ei analluogi."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Gwall Mewnol wrth ychwanegu dargyfeiriad"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Methwyd darllen y rhestr ffynhonellau."
@@ -878,25 +878,26 @@ msgstr "Ar ôl dadbacio defnyddir %sB o ofod disg ychwanegol.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ar ôl dadbactio caiff %sB o ofod disg ei rhyddhau.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, fuzzy, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Does dim digon o le rhydd gennych yn %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Penodwyd Syml Yn Unig ond nid yw hyn yn weithred syml."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Ie, gwna fel rydw i'n dweud!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, fuzzy, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -907,29 +908,29 @@ msgstr ""
 "Er mwyn mynd ymlaen, teipiwch y frawddeg '%s'\n"
 " ?]"
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Erthylu."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 #, fuzzy
 msgid "Do you want to continue [Y/n]? "
 msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Methwyd cyrchu %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Methodd rhai ffeiliau lawrlwytho"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -937,49 +938,49 @@ msgstr ""
 "Ni ellir cyrchu rhai archifau, efallai dylwch rhedeg apt-get update, neu "
 "geidio defnyddio --fix-missing?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Ni chynhelir cyfnewid cyfrwng efo --fix-missing ar hyn o bryd"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Ni ellir cywiro pecynnau ar goll."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 #, fuzzy
 msgid "Aborting install."
 msgstr "Yn Erthylu'r Sefydliad."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Sylwer, yn dewis %s yn hytrach na %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Yn hepgor %s, mae wedi ei sefydlu a nid yw uwchraddio wedi ei osod.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Nid yw'r pecyn %s wedi ei sefydlu, felly ni chaif ei dynnu\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Mae'r pecyn %s yn becyn rhithwir a ddarparir gan:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Sefydliwyd]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Dylech ddewis un yn benodol i'w sefydlu."
 
 # FIXME: punctuation
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, fuzzy, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -991,74 +992,85 @@ msgstr ""
 "gael ei uwchlwytho, cafodd ei ddarfod neu nid yw ar gael drwy gynnwys y\n"
 "ffeil sources.list.\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Fodd bynnag, mae'r pecynnau canlynol yn cymryd ei le:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Does dim ymgeisydd sefydlu gan y pecyn %s"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Nid yw ailsefydlu %s yn bosib, gan ni ellir ei lawrlwytho.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "Mae %s y fersiwn mwyaf newydd eisioes.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y rhyddhad '%s' o '%s'"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' "
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Ni ellir cloi'r cyfeiriadur rhestr"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "Caiff y pecynnau NEWYDD canlynol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1074,46 +1086,46 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 #, fuzzy
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Methwyd canfod pecyn %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Sylwer, yn dewis %s ar gyfer y patrwm '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ond mae %s yn mynd i gael ei sefydlu"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Efallai hoffech rhedeg `apt-get -f install' er mwyn cywiro'r rhain:"
 
 # FIXME
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1122,7 +1134,7 @@ msgstr ""
 "pecyn (neu penodwch ddatrys)"
 
 # FIXME: needs commas
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1134,118 +1146,118 @@ msgstr ""
 "ansefydlog, fod rhai pecynnau angenrheidiol heb gael eu creu eto neu\n"
 "heb gael eu symud allan o Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Pecynnau wedi torri"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Pecynnau a awgrymmir:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Pecynnau a argymhellir:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 #, fuzzy
 msgid "Calculating upgrade... "
 msgstr "Yn Cyfrifo'r Uwchraddiad... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Methwyd"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Wedi Gorffen"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 #, fuzzy
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Gwall Mewnol, torrodd AllUpgrade bethau"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Rhaid penodi o leiaf un pecyn i gyrchi ffynhonell ar ei gyfer"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, fuzzy, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Does dim digon o le rhydd yn %s gennych"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB/%sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, fuzzy, c-format
 msgid "Fetch source %s\n"
 msgstr "Cyrchu Ffynhonell %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Methwyd cyrchu rhai archifau."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Yn hepgor dadbacio y ffynhonell wedi ei dadbacio eisioes yn %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Methodd y gorchymyn dadbacio '%s'.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Methodd y gorchymyn adeiladu '%s'.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Methodd proses plentyn"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Rhaid penodi o leiaf un pecyn i wirio dibyniaethau adeiladu ar eu cyfer"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ni ellir cyrchu manylion dibyniaeth adeiladu ar gyfer %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nid oes dibyniaethau adeiladu gan %s.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1254,7 +1266,7 @@ msgstr ""
 "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %"
 "s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1263,34 +1275,34 @@ msgstr ""
 "Ni ellir bodloni'r dibyniaeth %s ar gyfer %s oherwydd does dim fersiwn sydd "
 "ar gael o'r pecyn %s yn gallu bodloni'r gofynion ferswin"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Methwyd bodloni dibynniaeth %s am %s: Mae'r pecyn sefydliedig %s yn rhy "
 "newydd"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Methwyd bodloni dibyniaeth %s am %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Methwyd prosesu dibyniaethau adeiladu"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 #, fuzzy
 msgid "Supported modules:"
 msgstr "Modylau a Gynhelir:"
 
 # FIXME: split
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1375,7 +1387,7 @@ msgstr ""
 "\n"
 "                   Mae gan yr APT hwn bŵerau buwch hudol.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1813,11 +1825,11 @@ msgid "File not found"
 msgstr "Ffeil heb ei ganfod"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Methwyd stat()"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Methwyd gosod amser newid"
 
@@ -1948,7 +1960,7 @@ msgstr "Goramserodd cysylltiad y soced data"
 msgid "Unable to accept connection"
 msgstr "Methwyd derbyn cysylltiad"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem wrth stwnshio ffeil"
 
@@ -2024,8 +2036,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Methiant dros dro yn datrys '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Digwyddodd rhywbweth hyll wrth ddatrys '%s:%s' (%i)"
 
 #: methods/connect.cc:240
@@ -2118,50 +2130,50 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri"
 msgid "Unknown date format"
 msgstr "Fformat dyddiad anhysbys"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Methwyd dewis"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Goramserodd y cysylltiad"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Gwall wrth ysgrifennu i ffeil allbwn"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Gwall wrth ysgrifennu at ffeil"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Gwall wrth ysgrifennu at y ffeil"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 #, fuzzy
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Gwall wrth ddarllen o'r gweinydd: caeodd yr ochr pell y cysylltiad"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Gwall wrth ddarllen o'r gweinydd"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Methwyd ysgrifennu ffeil %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 #, fuzzy
 msgid "Bad header data"
 msgstr "Data pennawd gwael"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Methodd y cysylltiad"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Gwall mewnol"
 
@@ -2169,18 +2181,25 @@ msgstr "Gwall mewnol"
 msgid "Can't mmap an empty file"
 msgstr "Ni ellir defnyddio mmap() ar ffeil gwag"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Methwyd gwneud mmap() efo %lu beit"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2579,8 +2598,15 @@ msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)"
 
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
 # FIXME: %s may have an arbirrary length
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2591,6 +2617,13 @@ msgstr ""
 "oherwydd lŵp gwrthdaro/cynddibynu. Mae hyn yn aml yn wael, ond os ydych wir "
 "eisiau ei wneud ef, gweithredwch yr opsiwn APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2810,21 +2843,21 @@ msgstr "Gwall M/A wrth gadw'r storfa ffynhonell"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "methwyd ailenwi, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "Camgyfatebiaeth swm MD5"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 
 # FIXME: case
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2833,7 +2866,7 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law. (Oherwydd pensaerniaeth coll.)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2842,14 +2875,14 @@ msgstr ""
 "Methais i leoli ffeila r gyfer y pecyn %s. Fa all hyn olygu bod rhaid i chi "
 "drwsio'r pecyn hyn a law."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Mae'r ffeiliau mynegai pecyn yn llygr. Dim maes Filename: gan y pecyn %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Camgyfatebiaeth maint"
 
@@ -3076,15 +3109,28 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "Methwyd agor ffeil %s"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Caewyd y cysylltiad yn gynnar"
 
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "Methwyd agor ffeil %s"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/da.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt-da\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2007-09-06 21:40+0200\n"
 "Last-Translator: Claus Hindsgaul <claus.hindsgaul@gmail.com>\n"
 "Language-Team: Danish\n"
@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s oversat %s %s\n"
@@ -531,26 +531,26 @@ msgstr "*** Kunne ikke l
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Nåede DeLink-begrænsningen på %sB.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Arkivet havde intet package-felt"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s har ingen tvangs-post\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  pakkeansvarlig for %s er %s, ikke %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s har ingen linje med tilsidesættelse af standard for kildefiler\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr ""
@@ -655,7 +655,7 @@ msgstr "Kunne ikke omd
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fejl ved tolkning af regulært udtryk - %s"
@@ -800,7 +800,7 @@ msgstr "Install
 msgid "Some packages could not be authenticated"
 msgstr "Nogle pakker kunne ikke autentificeres"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Der er problemer og -y blev brugt uden --force-yes"
 
@@ -816,11 +816,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Intern fejl. Sortering blev ikke fuldført"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Kunne ikke låse nedhentningsmappen"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Listen med kilder kunne ikke læses."
@@ -849,25 +849,26 @@ msgstr "Efter udpakning vil %sB yderligere diskplads v
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kunne ikke bestemme ledig plads i %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Du har ikke nok ledig plads i %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' angivet, men dette er ikke en triviel handling."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Ja, gør som jeg siger!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -878,28 +879,28 @@ msgstr ""
 "For at fortsætte, skal du skrive '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Afbryder."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Vil du fortsætte [J/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Kunne ikke hente %s %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Nedhentningen af filer mislykkedes"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -907,49 +908,49 @@ msgstr ""
 "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:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing og medieskift understøttes endnu ikke"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Kunne ikke rette manglende pakker."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Afbryder installationen."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Bemærk, at %s vælges fremfor %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Overspringer %s, da den allerede er installeret og opgradering er "
 "deaktiveret.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakken %s er ikke installeret, så den afinstalleres ikke\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Pakken %s er en virtuel pakke, der kan leveres af:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Installeret]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Du bør eksplicit vælge en at installere."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -960,75 +961,86 @@ msgstr ""
 "anden pakke. Det kan betyde at denne pakke blevet overflødiggjort eller \n"
 "kun kan hentes fra andre kilder\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Dog kan følgende pakker erstatte den:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Pakken %s har ingen installationskandidat"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Geninstallering af %s er ikke mulig, da den ikke kan hentes.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s er i forvejen den nyeste version.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Udgaven '%s' for '%s' blev ikke fundet"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versionen '%s' for '%s' blev ikke fundet"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valgte version %s (%s) af %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Kunne ikke finde kildepakkelisten %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "'update'-kommandoen benytter ingen parametre"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Kunne ikke låse listemappen"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Det er ikke meningen, at vi skal slette ting og sager, kan ikke starte "
 "AutoRemover"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "Følgende pakker blev installeret automatisk, og behøves ikke længere:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Brug 'apt-get autoremove' til at fjerne dem."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1046,43 +1058,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Følgende oplysninger kan hjælpe dig med at klare situationen:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Intern fejl. AutoRemover ødelagde noget"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Intern fejl, AllUpgrade ødelagde noget"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Kunne ikke finde opgaven %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Kunne ikke finde pakken %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Bemærk, vælger %s som regulært udtryk '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s sat til manuelt installeret.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Du kan muligvis rette det ved at køre 'apt-get -f install':"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1090,7 +1102,7 @@ msgstr ""
 "Uopfyldte afhængigheder. Prøv 'apt-get -f install' uden pakker (eller angiv "
 "en løsning)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1101,115 +1113,115 @@ msgstr ""
 "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n"
 "pakker endnu ikke er lavet eller gjort tilgængelige."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Ødelagte pakker"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Følgende yderligere pakker vil blive installeret:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Foreslåede pakker:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Anbefalede pakker:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Beregner opgraderingen... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Mislykkedes"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Færdig"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Intern fejl. Problemløseren ødelagde noget"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Du skal angive mindst én pakke at hente kildeteksten til"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Kunne ikke finde kildetekstpakken for %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Overspringer allerede hentet fil '%s'\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Du har ikke nok ledig plads i %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB skal hentes fra kildetekst-arkiverne.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Henter kildetekst %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Nogle arkiver kunne ikke hentes."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Overspringer udpakning af allerede udpakket kildetekst i %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Udpakningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tjek om pakken 'dpkg-dev' er installeret.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Opbygningskommandoen '%s' fejlede.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Barneprocessen fejlede"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr "Skal angive mindst én pakke at tjekke opbygningsafhængigheder for"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Kunne ikke hente oplysninger om opbygningsafhængigheder for %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s har ingen opbygningsafhængigheder.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1229,7 @@ msgid ""
 msgstr ""
 "%s-afhængigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1238,32 @@ msgstr ""
 "%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:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Kunne ikke opfylde %s-afhængigheden for %s: Den installerede pakke %s er for "
 "ny"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Kunne ikke opfylde %s-afhængigheden for %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Opbygningsafhængigheden for %s kunne ikke opfyldes."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Kunne ikke behandler opbygningsafhængighederne"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Understøttede moduler:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1335,7 +1347,7 @@ msgstr ""
 "for flere oplysninger og tilvalg.\n"
 "                       Denne APT har \"Super Cow Powers\".\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1757,11 +1769,11 @@ msgid "File not found"
 msgstr "Fil blev ikke fundet"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Kunne ikke finde"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Kunne ikke angive ændringstidspunkt"
 
@@ -1889,7 +1901,7 @@ msgstr "Tidsudl
 msgid "Unable to accept connection"
 msgstr "Kunne ikke acceptere forbindelse"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem ved \"hashing\" af fil"
 
@@ -1964,8 +1976,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Midlertidig fejl ved omsætning af navnet '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Der skete noget underligt under navneomsætning af '%s:%s' (%i)"
 
 #: methods/connect.cc:240
@@ -2058,48 +2070,48 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Ukendt datoformat"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Valg mislykkedes"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Tidsudløb på forbindelsen"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Fejl ved skrivning af uddatafil"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Fejl ved skrivning til fil"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Fejl ved skrivning til filen"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Fejl ved læsning fra serveren. Den fjerne ende lukkede forbindelsen"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Fejl ved læsning fra server"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Kunne ikke skrive filen %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Ugyldige hoved-data"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Forbindelsen mislykkedes"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Intern fejl"
 
@@ -2107,18 +2119,25 @@ msgstr "Intern fejl"
 msgid "Can't mmap an empty file"
 msgstr "Kan ikke udføre mmap for en tom fil"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Kunne ikke udføre mmap for %lu byte"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2504,7 +2523,14 @@ msgstr "Typen '%s' er ukendt p
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Ugyldig linje %u i kildelisten %s (producent-id)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2516,6 +2542,13 @@ msgstr ""
 "idé, men hvis du virkelig vil gøre det, kan du aktivere valget 'APT::Force-"
 "LoopBreak'."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2726,21 +2759,21 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "omdøbning mislykkedes, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum stemmer ikke"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Der er ingen tilgængelige offentlige nøgler for følgende nøgle-ID'er:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2749,7 +2782,7 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nødt til manuelt at reparere denne pakke. (grundet manglende arch)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2758,13 +2791,13 @@ msgstr ""
 "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er "
 "nødt til manuelt at reparere denne pakke."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "Pakkeindeksfilerne er i stykker. Intet 'Filename:'-felt for pakken %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Størrelsen stemmer ikke"
 
@@ -2993,14 +3026,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Kunne ikke påføre filen %s en lap"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Forbindelsen lukkedes for hurtigt"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Kunne ikke påføre filen %s en lap"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/de.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2009-10-20 21:55+0200\n"
 "Last-Translator: Holger Wansing <linux@wansing-online.de>\n"
 "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s für %s, kompiliert am %s %s\n"
@@ -544,26 +544,26 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-Limit von %sB erreicht.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Archiv hatte kein Paket-Feld"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s hat keinen Eintrag in der Override-Liste.\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s-Betreuer ist %s und nicht %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s hat keinen Eintrag in der Source-Override-Liste.\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s hat keinen Eintrag in der Binary-Override-Liste.\n"
@@ -669,7 +669,7 @@ msgstr "%s konnte nicht in %s umbenannt werden"
 msgid "Y"
 msgstr "J"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s"
@@ -815,7 +815,7 @@ msgstr "Diese Pakete ohne Überprüfung installieren [j/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "Einige Pakete konnten nicht authentifiziert werden"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Es gab Probleme und -y wurde ohne --force-yes verwendet"
 
@@ -831,11 +831,11 @@ msgstr "Pakete müssen entfernt werden, aber Entfernen ist abgeschaltet."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Interner Fehler, Anordnung beendete nicht"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden."
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Die Liste der Quellen konnte nicht gelesen werden."
@@ -866,25 +866,26 @@ msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Freier Platz in %s konnte nicht bestimmt werden"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Sie haben nicht genug Platz in %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "»Nur triviale« angegeben, aber dies ist keine triviale Operation."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Ja, tue was ich sage!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -895,28 +896,28 @@ msgstr ""
 "Zum Fortfahren geben Sie bitte »%s« ein.\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Abbruch."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Möchten Sie fortfahren [J/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Fehlschlag beim Holen von %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Einige Dateien konnten nicht heruntergeladen werden"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -924,49 +925,49 @@ msgstr ""
 "Einige Archive konnten nicht heruntergeladen werden; vielleicht »apt-get "
 "update« ausführen oder mit »--fix-missing« probieren?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing und Wechselmedien werden derzeit nicht unterstützt"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Fehlende Pakete konnten nicht korrigiert werden."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Installation abgebrochen."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Hinweis: %s wird an Stelle von %s gewählt\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s wird übersprungen; es ist schon installiert und »upgrade« ist nicht "
 "gesetzt.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Paket %s ist nicht installiert, wird also auch nicht entfernt.\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paket %s ist ein virtuelles Paket, das bereitgestellt wird von:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Installiert]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Sie sollten eines explizit zum Installieren auswählen."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -977,61 +978,72 @@ msgstr ""
 "referenziert. Das kann heißen, dass das Paket fehlt, dass es veraltet\n"
 "ist oder nur aus einer anderen Quelle verfügbar ist.\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Doch die folgenden Pakete ersetzen es:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paket %s hat keinen Installationskandidaten"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Erneute Installation von %s ist nicht möglich,\n"
 "es kann nicht heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ist schon die neueste Version.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release »%s« für »%s« konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version »%s« für »%s« konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Gewählte Version %s (%s) für %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
-msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden."
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Der Befehl »update« akzeptiert keine Argumente"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Das Listenverzeichnis kann nicht gesperrt werden"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Es soll nichts gelöscht werden, AutoRemover kann nicht gestartet werden"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1039,17 +1051,17 @@ msgstr ""
 "Die folgenden Pakete wurden automatisch installiert und werden nicht länger "
 "benötigt:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "%lu Pakete wurden automatisch installiert und werden nicht mehr benötigt.\n"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1068,44 +1080,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr ""
 "Die folgenden Informationen helfen Ihnen vielleicht, die Situation zu lösen:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Task %s konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Paket %s konnte nicht gefunden werden"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s wurde als manuell installiert festgelegt.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Probieren Sie »apt-get -f install«, um dies zu korrigieren:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1113,7 +1125,7 @@ msgstr ""
 "Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne "
 "jegliche Pakete (oder geben Sie eine Lösung an)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1125,120 +1137,120 @@ msgstr ""
 "Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n"
 "erstellt wurden oder Incoming noch nicht verlassen haben."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Kaputte Pakete"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Die folgenden zusätzlichen Pakete werden installiert:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Vorgeschlagene Pakete:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Empfohlene Pakete:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Berechne Upgrade (Paketaktualisierung) ..."
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Fehlgeschlagen"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Fertig"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Es muss mindestens ein Paket angegeben werden, dessen Quellen geholt werden "
 "sollen"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Quellpaket für %s kann nicht gefunden werden"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Überspringe schon heruntergeladene Datei »%s«\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Sie haben nicht genug freien Platz in %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Es müssen noch %sB von %sB an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Quelle %s wird heruntergeladen\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Einige Archive konnten nicht heruntergeladen werden."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Überprüfen Sie, ob das Paket »dpkg-dev« installiert ist.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build-Befehl »%s« fehlgeschlagen.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Kindprozess fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n"
 "überprüft werden sollen."
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr ""
 "Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden."
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s hat keine Bau-Abhängigkeiten.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1247,7 +1259,7 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht "
 "gefunden werden kann."
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1256,32 +1268,32 @@ msgstr ""
 "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da keine verfügbare "
 "Version des Pakets %s die Versionsanforderungen erfüllen kann."
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Die »%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %"
 "s ist zu neu."
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Die »%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Unterstützte Module:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1372,7 +1384,7 @@ msgstr ""
 "weitergehende Informationen und Optionen.\n"
 "                                    Dieses APT hat Super-Kuh-Kräfte.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1800,11 +1812,11 @@ msgstr "Datei nicht gefunden"
 
 # looks like someone hardcoded English grammar
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "»stat« konnte nicht ausgeführt werden."
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Änderungszeitpunkt kann nicht gesetzt werden"
 
@@ -1934,7 +1946,7 @@ msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung"
 msgid "Unable to accept connection"
 msgstr "Verbindung konnte nicht angenommen werden"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf"
 
@@ -2011,8 +2023,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Temporärer Fehlschlag beim Auflösen von »%s«"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)"
 
 #: methods/connect.cc:240
@@ -2108,49 +2120,49 @@ msgstr ""
 msgid "Unknown date format"
 msgstr "Unbekanntes Datumsformat"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Auswahl fehlgeschlagen"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Verbindung erlitt Zeitüberschreitung"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Fehler beim Schreiben der Ausgabedatei"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Fehler beim Schreiben einer Datei"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Fehler beim Schreiben der Datei"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Fehler beim Lesen vom Server: Verbindung wurde durch den Server auf der "
 "anderen Seite geschlossen"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Fehler beim Lesen vom Server"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Datei konnte nicht eingekürzt werden"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Fehlerhafte Kopfzeilendaten"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Interner Fehler"
 
@@ -2158,12 +2170,12 @@ msgstr "Interner Fehler"
 msgid "Can't mmap an empty file"
 msgstr "Eine leere Datei kann nicht mit mmap abgebildet werden"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "mmap von %lu Bytes konnte nicht durchgeführt werden"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2172,6 +2184,13 @@ msgstr ""
 "Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::"
 "Cache-Limit. Aktueller Wert: %lu. (Siehe auch man 5 apt.conf.)"
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2561,7 +2580,14 @@ msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2573,6 +2599,13 @@ msgstr ""
 "ist oft schlimm, aber wenn Sie es wirklich tun wollen, aktivieren Sie bitte "
 "die Option APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2797,20 +2830,20 @@ msgstr "E/A-Fehler beim Speichern des Quell-Caches"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "Umbenennen fehlgeschlagen, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Hash-Summe stimmt nicht überein"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Es gibt keine öffentlichen Schlüssel für die folgenden Schlüssel-IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2820,7 +2853,7 @@ msgstr ""
 "Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender "
 "Architektur)."
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2829,14 +2862,14 @@ msgstr ""
 "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass "
 "Sie dieses Paket von Hand korrigieren müssen."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "Die Paketindexdateien sind beschädigt: Kein Filename:-Feld für Paket %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Größe stimmt nicht überein"
 
@@ -3075,10 +3108,26 @@ msgstr ""
 msgid "Not locked"
 msgstr "Nicht gesperrt"
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Datei konnte nicht gepatcht werden"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Verbindung vorzeitig beendet"
+
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Datei konnte nicht gepatcht werden"

po/dz.po

@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po.pot\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2006-09-19 09:49+0530\n"
 "Last-Translator: Kinley Tshering <gasepkuenden2k3@hotmail.com>\n"
 "Language-Team: Dzongkha <pgeyleg@dit.gov.bt>\n"
@@ -157,7 +157,7 @@ msgstr "%4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s་གི་དོན་ལུ་%s %sགུར་ཕྱོགས་སྒྲིག་འབད་ཡོད་པའི་%s %s\n"
@@ -537,26 +537,26 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད
 msgid " DeLink limit of %sB hit.\n"
 msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ་རྒྱུན་སྐྱོང་པ་འདི་  %s ཨིན་   %s མེན།\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n"
@@ -660,7 +660,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི
 msgid "Y"
 msgstr "ཝའི།"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s"
@@ -805,7 +805,7 @@ msgstr "བདེན་སྦྱོར་མ་འབད་བར་འ་ནི
 msgid "Some packages could not be authenticated"
 msgstr "ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་བདེན་བཤད་འབད་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "དཀའ་ངལ་ཚུ་ཡོདཔ་ལས་-y ་འདི་ --force-yes་མེདཐོག་ལས་ལག་ལེན་འཐབ་སྟེ་ཡོད།"
 
@@ -823,11 +823,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ
 msgid "Internal error, Ordering didn't finish"
 msgstr "ནང་འཁོད་འཛོལ་བ་  གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།"
@@ -858,25 +858,26 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s་ནང་བར་སྟོང་"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s ནང་ཁྱོད་ལུ་བར་སྟོང་དལཝ་ལངམ་སྦེ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "གལ་ཆུང་རྐྱངམ་ཅིག་ཁསལ་བཀོད་འབད་ནུག་ འདི་འབདཝ་ད་འ་ནི་འདི་གལ་ཆུང་གི་བཀོལ་སྤྱོད་མེན།"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "ཨིན་ ང་གིས་སླབ་དོ་བཟུམ་སྦེ་རང་འབད!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -887,28 +888,28 @@ msgstr ""
 "འཕྲོ་མཐུད་འབད་ནིའི་དོན་ལུ་'%s'ཚིག་ཚན་ནང་ལུ་ཡིག་དཔར་རྐྱབས།\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "བར་བཤོལ་འབད།"
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?"
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s  %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -916,49 +917,49 @@ msgstr ""
 "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་མི་ཚུགས་པས་  apt-get་དུས་མཐུན་བཟོ་ནི་གཡོག་བཀོལ་ནི་ཨིན་ན་ཡང་ན་--fix-"
 "missing་དང་གཅིག་ཁར་འབད་རྩོལ་བསྐྱེད་ནི་ཨིན་ན་?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing་དང་བརྡ་ལམ་བརྗེ་སོར་འབད་ནི་འདི་ད་ལྟོ་ལས་རང་རྒྱབ་སྐྱོར་མི་འབད་བས།"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "བརླག་སྟོར་ཞུགས་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ་ནོར་བཅོས་འབད་མི་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།"
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "%s་གི་ཚབ་ལུ་%s་སེལ་འཐུ་འབད་ནི་སེམས་ཁར་བཞག\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "%s་གོམ་འགྱོ་འབད་དོ་  འདི་ཧེ་མ་ལས་རང་གཞི་བཙུགས་འབད་འོདཔ་དང་དུས་ཡར་བསྐྱེད་འབད་ནི་འདི་གཞི་སྒྲིག་མ་"
 "འབད་བས།\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "ཐུམ་སྒྲིལ་%s་འདི་གཞི་བཙུགས་མ་འབད་བས་  འདི་འབད་ནི་དི་གིས་རྩ་བསྐྲད་མ་གཏང་པས།་\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "གྱིས་བྱིན་ཏེ་ཡོད་པའི་ཐུམ་སྒྲིལ་%s་འདི་བར་ཅུ་ཡལ་ཐུམ་སྒྲིལ་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [གཞི་བཙུགས་འབད་ཡོད།]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "ཁྱོད་ཀྱི་གཞི་བཙུགས་འབད་ནི་ལུ་གཏན་འཁལ་སྦེ་གཅིག་སེལ་འཐུ་འབད་དགོ"
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -969,74 +970,85 @@ msgstr ""
 "འདི་གིས་ཐུམ་སྒྲིལ་ཅིག་བརླག་སྟོར་ཞུགས་ཡོདཔ་ཨིནམ་སྟོནམ་ཨིནམ་དང་ ཕན་མེད་སྦེ་གནས་ཡོདཔ་  ཡང་ན་\n"
 "འདི་གཞན་འབྱུང་ཅིག་ནང་ལས་ལས་རྐྱངམ་ཅིག་འཐོབ་ཚུགསཔ་ཨིན་པས།\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "ག་དེ་སྦེ་ཨིན་རུང་འོག་གི་ཐུམ་སྒྲིལ་ཚུ་གིས་ འདི་ཚབ་བཙུགསཔ་ཨིན:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "ཐུམ་སྒྲིལ་%s་ལུ་གཞི་བཙུགས་ཀྱི་མི་ངོ་མིན་འདུག"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s ་ལོག་གཞི་བཙུགས་འབད་ནི་འདི་མི་སྲིད་པ་ཅིག་ཨིན་པས་ འདི་ཕབ་ལེན་འབད་མི་བཏུབ་པས།\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ་འདི་ཧེ་མ་ལས་རང་འཐོན་རིམ་གསར་ཤོས་ཅིག་ཨིན།\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "%sགི་དོན་ལུ་འཛིན་གྲོལ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་དེ་མ་འཐོབ་པས།"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1052,44 +1064,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "ནང་འགོད་འཛོལ་བ་  ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1097,7 +1109,7 @@ msgstr ""
 "མ་ཚང་བའི་རྟེན་འབྲེལ་  ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།"
 "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)"
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1108,122 +1120,122 @@ msgstr ""
 "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་"
 "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "འབད་ཚར་ཡི།"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB་ལེན་དགོཔ་འདུག་  འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "%s་འབྱུང་ཁུངས་ལེན།\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%sཐུམ་སྒྲིལ་འདི་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་ %sགི་དོན་ལུ་%s རྟེན་འབྲེལ་དེ་ངལ་རང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1232,32 +1244,32 @@ msgstr ""
 "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་"
 "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་  གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་"
 "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།"
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1344,7 +1356,7 @@ msgstr ""
 "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n"
 "                       འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1765,11 +1777,11 @@ msgid "File not found"
 msgstr "ཡིག་སྣོད་འཚོལ་མ་ཐོབ།"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
@@ -1897,7 +1909,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན
 msgid "Unable to accept connection"
 msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།"
 
@@ -1972,8 +1984,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།"
 
 #: methods/connect.cc:240
@@ -2067,48 +2079,48 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ
 msgid "Unknown date format"
 msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "ནང་འཁོད་འཛོལ་བ།"
 
@@ -2116,18 +2128,25 @@ msgstr "ནང་འཁོད་འཛོལ་བ།"
 msgid "Can't mmap an empty file"
 msgstr "ཡིག་སྣོད་སྟོངམ་འདི་mmap་འབད་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu་བཱའིཊིསི་གི་mmap་བཟོ་མ་ཚུགས།"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2515,7 +2534,14 @@ msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་ག
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2527,6 +2553,13 @@ msgstr ""
 "འདི་འབདཝ་ད་ཁྱོད་ཀྱི་ཐད་རི་འབའ་རི་འབད་དགོཔ་ཨིན་པ་ཅིན་ APT::Force-LoopBreak གདམ་ཁ་འདི་ཤུགས་"
 "ལྡན་བཟོ།"
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2737,20 +2770,20 @@ msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མ
 msgid "rename failed, %s (%s -> %s)."
 msgstr "%s (%s -> %s)བསྐྱར་མིང་བཏགས་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།"
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "འོག་གི་ ཨའི་ཌི་་ ལྡེ་མིག་ཚུ་གི་དོན་ལུ་མི་དམང་གི་ལྡེ་མིག་འདི་འཐོབ་མི་ཚུགས་པས:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2759,7 +2792,7 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2768,14 +2801,14 @@ msgstr ""
 " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ "
 "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག "
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "ཐུམ་སྒྲིལ་ ཟུར་ཐོ་ཡིག་སྣོད་ཚུ་ངན་ཅན་འགྱོ་ནུག  ཡིག་སྣོད་ཀྱི་མིང་མིན་འདུག: %s་ཐུམ་སྒྲིལ་གྱི་དོན་ལུ་ས་སྒོ།"
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "ཚད་མ་མཐུན།"
 
@@ -3004,15 +3037,28 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།"
 
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/el.po

@@ -15,7 +15,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_el\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-08-26 18:25+0300\n"
 "Last-Translator: quad-nrg.net <yodesy@quad-nrg.net>\n"
 "Language-Team: Greek <debian-l10n-greek@lists.debian.org>\n"
@@ -163,7 +163,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n"
@@ -545,26 +545,26 @@ msgstr "    Αποτυχία σύνδεσης του %s με το %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Αποσύνδεση ορίου του %sB hit.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s δεν περιέχει εγγραφή παράκαμψης\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s συντηρητής είναι ο %s όχι ο %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s δεν έχει εγγραφή πηγαίας παράκαμψης\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n"
@@ -668,7 +668,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "σφάλμα μεταγλωτισμου - %s"
@@ -815,7 +815,7 @@ msgstr "Εγκατάσταση των πακέτων χωρίς επαλήθευ
 msgid "Some packages could not be authenticated"
 msgstr "Μερικά πακέτα δεν εξαακριβώθηκαν"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Υπάρχουν προβλήματα και δώσατε -y  χωρίς το --force-yes"
 
@@ -832,11 +832,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Αδύνατη η ανάγνωση της λίστας πηγών."
@@ -868,25 +868,26 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο  %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Καθορίσατε συνηθισμένο, αλλά αυτή δεν είναι μια συνηθισμένη εργασία"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Ναι, κανε ότι λέω!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -897,28 +898,28 @@ msgstr ""
 "Για να συνεχίσετε πληκτρολογήστε τη φράση '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Εγκατάλειψη."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Θέλετε να συνεχίσετε [Ν/ο]; "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Αποτυχία ανάκτησης του %s   %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -926,49 +927,49 @@ msgstr ""
 "Αδύνατη η μεταφόρτωση μερικών αρχείων, ίσως αν δοκιμάζατε με apt-get update "
 "ή το --fix-missing;"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "ο συνδυασμός --fix-missing με εναλλαγή μέσων δεν υποστηρίζεται για την ώρα"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Αδύνατη η επίλυση των χαμένων πακέτων."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Εγκατάλειψη της εγκατάστασης."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Σημείωση, επιλέχθηκε το %s αντί του%s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "Παράκαμψη του %s, είναι εγκατεστημένο και η αναβάθμιση δεν έχει οριστεί.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Το πακέτο %s δεν είναι εγκατεστημένο και δεν θα αφαιρεθεί\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Το πακέτο %s είναι εικονικό και παρέχεται από τα:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Εγκατεστημένα]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Θα πρέπει επακριβώς να επιλέξετε ένα για εγκατάσταση."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -980,76 +981,87 @@ msgstr ""
 "Αυτό σημαίνει ότι το πακέτο αυτό λείπει, είναι παλαιωμένο, ή είναι διαθέσιμο "
 "από άλλη πηγή\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Πάραυτα το ακόλουθο πακέτο το αντικαθιστά:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Το πακέτο %s δεν είναι υποψήφιο για εγκατάσταση"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "Η επανεγκατάσταση του %s δεν είναι εφικτή, δεν είναι δυνατή η μεταφόρτωσή "
 "του\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "το %s είναι ήδη η τελευταία έκδοση.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Η έκδοση %s για το %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Η εντολή update δεν παίρνει ορίσματα"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Αδύνατο το κλείδωμα του καταλόγου"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1067,43 +1079,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Αδύνατη η εύρεση του πακέτου %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "το %s έχει εγκατασταθεί με το χέρι\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1111,7 +1123,7 @@ msgstr ""
 "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε "
 "πακέτο (ή καθορίστε μια λύση)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1123,120 +1135,120 @@ msgstr ""
 "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n"
 "μετακινηθεί από τα εισερχόμενα."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Χαλασμένα πακέτα"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Προτεινόμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Συνιστώμενα πακέτα:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Υπολογισμός της αναβάθμισης... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Απέτυχε"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Ετοιμο"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο "
 "υλικό"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον "
 "κωδικάτου"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Μεταφόρτωση Κωδικα %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Απέτυχε η εντολή χτισίματος %s.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Η απογονική διεργασία απέτυχε"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1244,7 +1256,7 @@ msgid ""
 msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1253,32 +1265,32 @@ msgstr ""
 "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες "
 "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s "
 "είναι νεώτερο"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Υποστηριζόμενοι Οδηγοί:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1361,7 +1373,7 @@ msgstr ""
 "για περισσότερες πληροφορίες και επιλογές.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1782,11 +1794,11 @@ msgid "File not found"
 msgstr "Το αρχείο Δε Βρέθηκε"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Αποτυχία εύρεσης της κατάστασης"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Αποτυχία ορισμού του χρόνου τροποποίησης"
 
@@ -1914,7 +1926,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο
 msgid "Unable to accept connection"
 msgstr "Αδύνατη η αποδοχή συνδέσεων"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Πρόβλημα κατά το hashing του αρχείου"
 
@@ -1989,8 +2001,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)"
 
 #: methods/connect.cc:240
@@ -2084,49 +2096,49 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω
 msgid "Unknown date format"
 msgstr "Άγνωστη μορφή ημερομηνίας"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Η επιλογή απέτυχε"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Λήξη χρόνου σύνδεσης"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Σφάλμα στην εγγραφή στο αρχείο"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr ""
 "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Σφάλμα στην ανάγνωση από το διακομιστή"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "Αποτυχία εγγραφής του αρχείου %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Ελαττωματικά δεδομένα επικεφαλίδας"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Η σύνδεση απέτυχε"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Εσωτερικό Σφάλμα"
 
@@ -2134,18 +2146,25 @@ msgstr "Εσωτερικό Σφάλμα"
 msgid "Can't mmap an empty file"
 msgstr "Αδύνατη η απεικόνιση mmap ενός άδειου αρχείου"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Αδύνατη η απεικόνιση μέσω mmap %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2536,7 +2555,14 @@ msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2548,6 +2574,13 @@ msgstr ""
 "είναι καλό, αλλά εάν πραγματικά θέλετε να συνεχίσετε ενεργοποιήστε την "
 "επιλογή APT::Force-LoopBreak option."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2765,19 +2798,19 @@ msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγ
 msgid "rename failed, %s (%s -> %s)."
 msgstr "απέτυχε η μετονομασία, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Ανόμοιο MD5Sum"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Δεν υπάρχει διαθέσιμο δημόσιο κλειδί για τα ακολουθα κλειδιά:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2786,7 +2819,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2795,7 +2828,7 @@ msgstr ""
 "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι "
 "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2803,7 +2836,7 @@ msgstr ""
 "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο "
 "πακέτο %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Ανόμοιο μέγεθος"
 
@@ -3033,14 +3066,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Αδύνατη η διόρθωση του αρχείου"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Η σύνδεση έκλεισε πρόωρα"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Αδύνατη η διόρθωση του αρχείου"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/en_GB.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-11-13 11:47+0000\n"
 "Last-Translator: Neil Williams <linux@codehelp.co.uk>\n"
 "Language-Team: en_GB <en_gb@li.org>\n"
@@ -151,7 +151,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s compiled on %s %s\n"
@@ -524,26 +524,26 @@ msgstr "*** Failed to link %s to %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink limit of %sB hit.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Archive had no package field"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s has no override entry\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s maintainer is %s not %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s has no source override entry\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s has no binary override entry either\n"
@@ -647,7 +647,7 @@ msgstr "Failed to rename %s to %s"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex compilation error - %s"
@@ -792,7 +792,7 @@ msgstr "Install these packages without verification [y/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "Some packages could not be authenticated"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "There are problems and -y was used without --force-yes"
 
@@ -808,11 +808,11 @@ msgstr "Packages need to be removed but remove is disabled."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Internal error, Ordering didn't finish"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Unable to lock the download directory"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "The list of sources could not be read."
@@ -841,25 +841,26 @@ msgstr "After this operation, %sB of additional disk space will be used.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "After this operation, %sB disk space will be freed.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Couldn't determine free space in %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "You don't have enough free space in %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only specified but this is not a trivial operation."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -870,28 +871,28 @@ msgstr ""
 "To continue type in the phrase ‘%s’\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Abort."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Do you want to continue [Y/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Failed to fetch %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Some files failed to download"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Download complete and in download only mode"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -899,47 +900,47 @@ msgstr ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing and media swapping is not currently supported"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Unable to correct missing packages."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Aborting install."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Note, selecting %s instead of %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Skipping %s, it is already installed and upgrade is not set.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Package %s is not installed, so not removed\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Package %s is a virtual package provided by:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Installed]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "You should explicitly select one to install."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -950,58 +951,69 @@ msgstr ""
 "This may mean that the package is missing, has been obsoleted, or\n"
 "is only available from another source\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "However the following packages replace it:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Package %s has no installation candidate"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s is already the newest version.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Release ‘%s’ for ‘%s’ was not found"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Version ‘%s’ for ‘%s’ was not found"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Selected version %s (%s) for %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Couldn't stat source package list %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "The update command takes no arguments"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Unable to lock the list directory"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "We are not supposed to delete stuff, cannot start AutoRemover"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1009,18 +1021,18 @@ msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "The following packages were automatically installed and are no longer "
 "required:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Use 'apt-get autoremove' to remove them."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1038,43 +1050,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "The following information may help to resolve the situation:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Internal Error, AutoRemoved broke stuff"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Internal error, AllUpgrade broke stuff"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Couldn't find task %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Couldn't find package %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, selecting %s for regex ‘%s’\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s set to manually installed.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "You might want to run 'apt-get -f install' to correct these:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1082,7 +1094,7 @@ msgstr ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1094,116 +1106,116 @@ msgstr ""
 "distribution that some required packages have not yet been created\n"
 "or been moved out of Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Broken packages"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "The following extra packages will be installed:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Suggested packages:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Recommended packages:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Calculating upgrade... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Failed"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Done"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Internal error, problem resolver broke stuff"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Must specify at least one package for which to fetch source"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Unable to find a source package for %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Skipping already downloaded file '%s'\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "You don't have enough free space in %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Need to get %sB/%sB of source archives.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Need to get %sB of source archives.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fetch source %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Failed to fetch some archives."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Skipping unpack of already unpacked source in %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Unpack command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Check if the 'dpkg-dev' package is installed.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Build command ‘%s’ failed.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Child process failed"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Must specify at least one package for which you want to check builddeps"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Unable to get build-dependency information for %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s has no build depends.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1212,7 +1224,7 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,31 +1233,31 @@ msgstr ""
 "%s dependency for %s cannot be satisfied because no available versions of "
 "package %s can satisfy version requirements"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Failed to satisfy %s dependency for %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Build-dependencies for %s could not be satisfied."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Failed to process build dependencies"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Supported modules:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1330,7 +1342,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1746,11 +1758,11 @@ msgid "File not found"
 msgstr "File not found"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Failed to stat"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Failed to set modification time"
 
@@ -1878,7 +1890,7 @@ msgstr "Data socket connect timed out"
 msgid "Unable to accept connection"
 msgstr "Unable to accept connection"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problem hashing file"
 
@@ -1953,8 +1965,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Temporary failure resolving ‘%s’"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Something wicked happened resolving ‘%s:%s’ (%i)"
 
 #: methods/connect.cc:240
@@ -2045,47 +2057,47 @@ msgstr "This HTTP server has broken range support"
 msgid "Unknown date format"
 msgstr "Unknown date format"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Select failed"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Connection timed out"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Error writing to output file"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Error writing to file"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Error writing to the file"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error reading from server. Remote end closed connection"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Error reading from server"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Failed to truncate file"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Bad header data"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Connection failed"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Internal error"
 
@@ -2093,18 +2105,25 @@ msgstr "Internal error"
 msgid "Can't mmap an empty file"
 msgstr "Cannot mmap an empty file"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Couldn't make mmap of %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2490,7 +2509,14 @@ msgstr "Type ‘%s’ is not known on line %u in source list %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Malformed line %u in source list %s (vendor id)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2501,6 +2527,13 @@ msgstr ""
 "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."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2709,19 +2742,19 @@ msgstr "IO Error saving source cache"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "rename failed, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum mismatch"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum mismatch"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "There is no public key available for the following key IDs:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2730,7 +2763,7 @@ msgstr ""
 "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)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2739,14 +2772,14 @@ msgstr ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
 "manually fix this package."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "The package index files are corrupted. No Filename: field for package %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Size mismatch"
 
@@ -2974,14 +3007,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Could not patch file"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connection closed prematurely"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Could not patch file"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/es.po

@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.18\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-11-15 21:52+0100\n"
 "Last-Translator: Javier Fernandez-Sanguino <jfs@debian.org>\n"
 "Language-Team: Debian Spanish <debian-l10n-spanish@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado en %s %s\n"
@@ -539,26 +539,26 @@ msgstr "*** No pude enlazar %s con %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink se ha llegado al límite de %sB.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Archivo no tiene campo de paquetes"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr " %s no tiene entrada de predominio\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " el encargado de %s es %s y no %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr " %s no tiene una entrada fuente predominante\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr " %s tampoco tiene una entrada binaria predominante\n"
@@ -662,7 +662,7 @@ msgstr "Fall
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Error de compilación de expresiones regulares - %s"
@@ -807,7 +807,7 @@ msgstr "
 msgid "Some packages could not be authenticated"
 msgstr "Algunos paquetes no se pueden autenticar"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Hay problemas y se utilizó -y sin --force-yes"
 
@@ -823,11 +823,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est
 msgid "Internal error, Ordering didn't finish"
 msgstr "Error interno, no terminó el ordenamiento"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "No se puede bloquear el directorio de descarga"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "No se pudieron leer las listas de fuentes."
@@ -859,25 +859,26 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Se liberarán %sB después de esta operación.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "No pude determinar el espacio libre en %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "No tiene suficiente espacio libre en %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Se especificó Trivial Only pero ésta no es una operación trivial."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Sí, ¡haga lo que le digo!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -888,28 +889,28 @@ msgstr ""
 "Para continuar escriba la frase «%s»\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Abortado."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Desea continuar [S/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Imposible obtener %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Algunos archivos no pudieron descargarse"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Descarga completa y en modo de sólo descarga"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -917,47 +918,47 @@ msgstr ""
 "No se pudieron obtener algunos archivos, ¿quizás deba ejecutar\n"
 "apt-get update o deba intentarlo de nuevo con --fix-missing?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "Actualmente no están soportados --fix-missing e intercambio de medio"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "No se pudieron corregir los paquetes que faltan."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Abortando la instalación."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota, seleccionando %s en lugar de %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Ignorando %s, ya esta instalado y la actualización no esta activada.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "El paquete %s no esta instalado, no se eliminará\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "El paquete %s es un paquete virtual provisto por:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Necesita seleccionar explícitamente uno para instalar."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -968,59 +969,70 @@ msgstr ""
 "a él. Esto puede significar que el paquete falta, está obsoleto o sólo se\n"
 "encuentra disponible desde alguna otra fuente\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Sin embargo, los siguientes paquetes lo reemplazan:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "El paquete %s no tiene candidato para su instalación"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "No es posible reinstalar el paquete %s, no se puede descargar.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ya está en su versión más reciente.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "No se encontró la Distribución '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "No se encontró la versión '%s' para '%s'"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Versión seleccionada %s (%s) para %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "No se puede leer la lista de paquetes fuente %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "El comando de actualización no toma argumentos"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "No se pudo bloquear el directorio de listas"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Se supone que no vamos a eliminar cosas, no se pudo iniciar «AutoRemover»"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1028,18 +1040,18 @@ msgstr ""
 "Se instalaron de forma automática los siguientes paquetes y ya no son "
 "necesarios."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Se instalaron de forma automática los siguientes paquetes y ya no son "
 "necesarios."
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Utilice «apt-get autoremove» para eliminarlos."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1057,43 +1069,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "La siguiente información puede ayudar a resolver la situación:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Error interno, «AutoRemover» rompió cosas"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Error Interno, AllUpgrade rompió cosas"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "No se pudo encontrar la tarea %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "No se pudo encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, seleccionando %s para la expresión regular '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "fijado %s como instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Tal vez quiera ejecutar `apt-get -f install' para corregirlo:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1101,7 +1113,7 @@ msgstr ""
 "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o "
 "especifique una solución)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1113,119 +1125,119 @@ msgstr ""
 "inestable, que algunos paquetes necesarios no han sido creados o han\n"
 "sido movidos fuera de Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Se instalarán los siguientes paquetes extras:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Paquetes sugeridos:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Calculando la actualización... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Falló"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Listo"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Error interno, el sistema de solución de problemas rompió\n"
 "algunas cosas"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Debe especificar al menos un paquete para obtener su código fuente"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "No se pudo encontrar un paquete de fuentes para %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ignorando fichero ya descargado '%s'\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "No tiene suficiente espacio libre en %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Necesito descargar %sB/%sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Necesito descargar %sB de archivos fuente.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Fuente obtenida %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "No se pudieron obtener algunos archivos."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ignorando desempaquetamiento de paquetes ya desempaquetados en %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Falló la orden de desempaquetamiento '%s'.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Compruebe que el paquete «dpkg-dev» esté instalado.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Falló la orden de construcción '%s'.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Falló el proceso hijo"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Debe especificar al menos un paquete para verificar sus\n"
 "dependencias de construcción"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "No se pudo obtener información de dependencias de construcción para %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s no tiene dependencias de construcción.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1234,7 +1246,7 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque no se puede \n"
 "encontrar el paquete %s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1243,32 +1255,32 @@ msgstr ""
 "La dependencia %s en %s no puede satisfacerse porque ninguna versión\n"
 "disponible del paquete %s satisface los requisitos de versión"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "No se pudo satisfacer la dependencia %s para %s: El paquete instalado %s es "
 "demasiado nuevo"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "No se pudo satisfacer la dependencia %s para %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "No se pudieron satisfacer las dependencias de construcción de %s."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "No se pudieron procesar las dependencias de construcción"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1354,7 +1366,7 @@ msgstr ""
 "para más información y opciones.\n"
 "                       Este APT tiene poderes de Super Vaca.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1777,11 +1789,11 @@ msgid "File not found"
 msgstr "Fichero no encontrado"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "No pude leer"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "No pude poner el tiempo de modificación"
 
@@ -1909,7 +1921,7 @@ msgstr "Expir
 msgid "Unable to accept connection"
 msgstr "No pude aceptar la conexión"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Hay problemas enlazando fichero"
 
@@ -1984,8 +1996,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal al resolver '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo raro pasó resolviendo '%s:%s' (%i)"
 
 #: methods/connect.cc:240
@@ -2078,47 +2090,47 @@ msgstr "
 msgid "Unknown date format"
 msgstr "Formato de fecha desconocido"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Falló la selección"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Expiró la conexión"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Error escribiendo al archivo de salida"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Error escribiendo a archivo"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Error escribiendo al archivo"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Error leyendo del servidor, el lado remoto cerró la conexión."
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Error leyendo del servidor"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Falló al truncar el archivo"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Mala cabecera Data"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Fallo la conexión"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Error interno"
 
@@ -2126,18 +2138,25 @@ msgstr "Error interno"
 msgid "Can't mmap an empty file"
 msgstr "No puedo hacer mmap de un fichero vacío"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "No pude hacer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2527,7 +2546,14 @@ msgstr "Tipo '%s' desconocido en la l
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Línea %u mal formada en la lista de fuentes %s (id del fabricante)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2539,6 +2565,13 @@ msgstr ""
 "Esto  generalmente es malo, pero si realmente quiere hacerlo, active \n"
 "la opción  APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2758,21 +2791,21 @@ msgstr "Error de E/S guardando cach
 msgid "rename failed, %s (%s -> %s)."
 msgstr "falló el cambio de nombre, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "La suma MD5 difiere"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "La suma hash difiere"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "No existe ninguna clave pública disponible para los siguientes "
 "identificadores de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2782,7 +2815,7 @@ msgstr ""
 "que necesita arreglar manualmente este paquete (debido a que falta una "
 "arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2791,7 +2824,7 @@ msgstr ""
 "No se pudo localizar un archivo para el paquete %s. Esto puede significar "
 "que necesita arreglar manualmente este paquete."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2799,7 +2832,7 @@ msgstr ""
 "Los archivos de índice de paquetes están corrompidos. El campo 'Filename:' "
 "no existe para para el paquete %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "El tamaño difiere"
 
@@ -3033,14 +3066,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "No pude parchear el fichero"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "La conexión se cerró prematuramente"
 
+#~ msgid "Could not patch file"
+#~ msgstr "No pude parchear el fichero"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/eu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_eu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2009-05-17 00:41+0200\n"
 "Last-Translator: Piarres Beobide <pi@beobide.net>\n"
 "Language-Team: Euskara <debian-l10n-basque@lists.debian.org>\n"
@@ -155,7 +155,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s %s-rentzat %s %s-ean konpilatua\n"
@@ -527,26 +527,26 @@ msgstr "*** Ezin izan da %s %s(r)ekin estekatu"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink-en mugara (%sB) heldu da.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Artxiboak ez du pakete eremurik"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s: ez du override sarrerarik\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s mantentzailea %s da, eta ez %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s: ez du jatorri gainidazketa sarrerarik\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s: ez du bitar gainidazketa sarrerarik\n"
@@ -650,7 +650,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Adierazpen erregularren konpilazio errorea - %s"
@@ -795,7 +795,7 @@ msgstr "Paketeak egiaztapen gabe instalatu [b/E]? "
 msgid "Some packages could not be authenticated"
 msgstr "Zenbait pakete ezin dira egiaztatu"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Arazoak daude, eta -y erabili da --force-yes gabe"
 
@@ -811,11 +811,11 @@ msgstr "Paketeak ezabatu beharra dute baina Ezabatzea ezgaiturik dago."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Barne errorea, ez da ordenatzeaz amaitu"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Ezin da deskarga direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Ezin izan da Iturburu zerrenda irakurri."
@@ -846,25 +846,26 @@ msgstr "Ekintza honen ondoren, %sB gehiago erabiliko dira diskoan.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Ekintza honen ondoren, %sB libratuko dira diskoan.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Ezin da %s(e)n duzun leku librea atzeman."
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "'Trivial Only' zehaztu da, baina hau ez da eragiketa tribial bat."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Bai, egin esandakoa!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -875,28 +876,28 @@ msgstr ""
 "Jarraitzeko, idatzi '%s' esaldia\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Abortatu."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Aurrera jarraitu nahi al duzu [B/e]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Ezin da lortu %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Fitxategi batzuk ezin izan dira deskargatu"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Deskarga amaituta eta deskarga soileko moduan"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -904,47 +905,47 @@ msgstr ""
 "Ezin izan dira artxibo batzuk lortu; beharbada apt-get update exekutatu, edo "
 "--fix-missing aukerarekin saiatu?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing eta euskarri aldaketa ez dira onartzen oraingoz"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Falta diren paketeak ezin dira zuzendu."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Abortatu instalazioa."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Oharra, %s hautatzen %s(r)en ordez\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s saltatzen. Instalatuta dago, eta ez dago bertsio-berritzerik.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "%s paketea ez dago instalatuta, eta, beraz, ez da kenduko\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s pakete birtual bat da, honek hornitua:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Instalatuta]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Zehazki bat hautatu behar duzu instalatzeko."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -955,58 +956,69 @@ msgstr ""
 "egiten dio. Beharbada paketea faltako da, edo zaharkituta egongo da, edo \n"
 "beste iturburu batean bakarrik egongo da erabilgarri\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Baina ondorengo paketeek ordezten dute:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "%s paketeak ez du instalatzeko hautagairik"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s berriro instalatzea ez da posible; ezin da deskargatu.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s bertsiorik berriena da jada.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' banaketa ez da aurkitu"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Hautatutako bertsioa: %s (%s) -- %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Ezin da atzitu %s iturburu paketeen zerrenda"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Eguneratzeko komandoak ez du argumenturik hartzen"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Ezin da zerrenda direktorioa blokeatu"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Suposatu ez dugun zerbait ezabatuko da, ezin da AutoRemover abiarazi"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1014,18 +1026,18 @@ msgstr ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago "
 "behar."
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "'apt-get autoremove' erabili ezabatzeko."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1043,43 +1055,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Informazio honek arazoa konpontzen lagun dezake:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Ezin izan da %s zeregina aurkitu"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Ezin izan da %s paketea aurkitu"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s eskuz instalatua bezala ezarri.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Beharbada `apt-get -f install' exekutatu nahiko duzu hauek zuzentzeko:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1087,7 +1099,7 @@ msgstr ""
 "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo "
 "zehaztu konponbide bat)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1099,117 +1111,117 @@ msgstr ""
 "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n"
 "Sarrerakoetan (Incoming) egoten jarraituko dute."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Hautsitako paketeak"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Ondorengo pakete gehigarriak instalatuko dira:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Iradokitako paketeak:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Gomendatutako paketeak:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Berriketak kalkulatzen... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Huts egin du"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Eginda"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Ez daukazu nahikoa leku libre %s(e)n."
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB/%sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Eskuratu %s iturburua\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Huts egin du zenbat artxibo lortzean."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr ""
 "%s(e)n dagoeneko deskonprimitutako iturburua deskonprimitzea saltatzen\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Eraikitzeko '%s' komandoak huts egin du.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Prozesu umeak huts egin du"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Gutxienez pakete bat zehaztu behar duzu eraikitze mendekotasunak egiaztatzeko"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Ezin izan da %s(r)en eraikitze mendekotasunen informazioa eskuratu"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s: ez du eraikitze mendekotasunik.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1229,7 @@ msgid ""
 msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1238,32 @@ msgstr ""
 "%2$s(r)en %1$s mendekotasuna ezin da bete, ez baitago bertsio-eskakizunak "
 "betetzen dituen %3$s paketearen bertsio erabilgarririk"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: instalatutako %3$s "
 "paketea berriegia da"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Huts egin du %2$s(r)en %1$s mendekotasuna betetzean: %3$s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s(r)en eraikitze mendekotasunak ezin izan dira bete."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Huts egin du eraikitze mendekotasunak prozesatzean"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Onartutako Moduluak:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1336,7 +1348,7 @@ msgstr ""
 "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n"
 "                       APT honek Super Behiaren Ahalmenak ditu.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1755,11 +1767,11 @@ msgid "File not found"
 msgstr "Ez da fitxategia aurkitu"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Huts egin du atzitzean"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Huts egin du aldaketa ordua ezartzean"
 
@@ -1890,7 +1902,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du"
 msgid "Unable to accept connection"
 msgstr "Ezin da konexioa onartu"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Arazoa fitxategiaren hash egitean"
 
@@ -1966,8 +1978,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Aldi baterako akatsa '%s' ebaztean"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Zerbait arraroa pasatu da '%s:%s' (%i) ebaztean"
 
 #: methods/connect.cc:240
@@ -2057,47 +2069,47 @@ msgstr "http zerbitzariak barruti onarpena apurturik du"
 msgid "Unknown date format"
 msgstr "Datu formatu ezezaguna"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Hautapenak huts egin du"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Konexioaren denbora muga gainditu da"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Errorea irteerako fitxategian idaztean"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Errorea fitxategian idaztean"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Errorea zerbitzaritik irakurtzean"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Huts fitxategia mozterakoan"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Goiburu data gaizki dago"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Konexioak huts egin du"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Barne errorea"
 
@@ -2105,12 +2117,12 @@ msgstr "Barne errorea"
 msgid "Can't mmap an empty file"
 msgstr "Ezin da fitxategi huts baten mmap egin"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Ezin izan da %lu byteren mmap egin"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2119,6 +2131,13 @@ msgstr ""
 "MMAP dinamikoa memoriaz kanpo. Mesedez handitu APT::Cache-Limit muga. Uneko "
 "balioa: %lu. (man 5 apt.conf)"
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2508,7 +2527,14 @@ msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2520,6 +2546,13 @@ msgstr ""
 "izaten da, baina hala ere egin nahi baduzu, aktibatu APT::Force-LoopBreak "
 "aukera."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2727,19 +2760,19 @@ msgstr "S/I errorea iturburu katxea gordetzean"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "huts egin du izen-aldaketak, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ez dator bat"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Egiaztapena ez dator bat"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Ez dago gako publiko erabilgarririk hurrengo gako ID hauentzat:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2748,7 +2781,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea. (arkitektura falta delako)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2757,7 +2790,7 @@ msgstr ""
 "Ezin izan dut %s paketeko fitxategi bat lokalizatu. Beharbada eskuz konpondu "
 "beharko duzu paketea."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2765,7 +2798,7 @@ msgstr ""
 "Paketearen indize fitxategiak hondatuta daude. 'Filename:' eremurik ez %s "
 "paketearentzat."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Tamaina ez dator bat"
 
@@ -2996,14 +3029,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Konexioa behar baino lehenago itxi da"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/fi.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.5.26\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-12-11 14:52+0200\n"
 "Last-Translator: Tapio Lehtonen <tale@debian.org>\n"
 "Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
@@ -153,7 +153,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s laitealustalle %s käännöksen päiväys %s %s\n"
@@ -528,26 +528,26 @@ msgstr "*** Linkin %s -> %s luonti ei onnistunut"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLinkin yläraja %st saavutettu.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Arkistossa ei ollut pakettikenttää"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s:llä ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s ylläpitäjä on %s eikä %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s:llä ei ole poikkeustietuetta\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s:llä ei  ole binääristäkään poikkeustietuetta\n"
@@ -651,7 +651,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut"
 msgid "Y"
 msgstr "K"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Käännösvirhe lausekkeessa - %s"
@@ -796,7 +796,7 @@ msgstr "Asennetaanko nämä paketit ilman todennusta [y/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "Joidenkin pakettien alkuperästä ei voitu varmistua"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Oli pulmia ja -y käytettiin ilman valitsinta --force-yes"
 
@@ -812,11 +812,11 @@ msgstr "Paketteja pitäisi poistaa mutta Remove ei ole käytössä."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Tapahtui sisäinen virhe, järjestäminen keskeytyi"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Noutokansiota ei saatu lukittua"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Lähteiden luetteloa ei pystynyt lukemaan."
@@ -846,26 +846,27 @@ msgstr "Toiminnon jälkeen käytetään %s t lisää levytilaa.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Toiminnon jälkeen vapautuu %s t levytilaa.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Kansion %s vapaan tilan määrä ei selvinnyt"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "On määritetty Trivial Only mutta tämä ei ole itsestäänselvä toimenpide."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Kyllä, tee kuten käsketään!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -876,28 +877,28 @@ msgstr ""
 "Jatka kirjoittamalla \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Keskeytä."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Haluatko jatkaa [K/e]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Tiedoston %s nouto ei onnistunut  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Joidenkin tiedostojen nouto ei onnistunut"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Nouto on valmis ja määrätty vain nouto"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -905,47 +906,47 @@ msgstr ""
 "Joidenkin arkistojen nouto ei onnistunut, ehkä \"apt-get update\" auttaa tai "
 "kokeile --fix-missing?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing ja taltion vaihto ei ole nyt tuettu"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Puuttuvia paketteja ei voi korjata."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Asennus keskeytetään."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Huomautus, valitaan %s eikä %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Ohitetaan %s, se on jo asennettu eikä ole komennettu päivitystä.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Pakettia %s ei ole asennettu, niinpä sitä ei poisteta\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Paketti %s on näennäispaketti, jonka kattaa:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Asennettu]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Yksi pitää valita asennettavaksi."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -956,59 +957,70 @@ msgstr ""
 "Tämä voi tarkoittaa paketin puuttuvan, olevan vanhentunut tai\n"
 "saatavilla vain jostain muusta lähteestä\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Seuraavat paketit kuitenkin korvaavat sen:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Paketilla %s ei ole asennettavaa valintaa"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "Paketin %s uudelleenasennus ei ole mahdollista, sitä ei voi noutaa.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s on jo uusin versio.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Julkaisua \"%s\" paketille \"%s\" ei löytynyt"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Valittiin versio %s (%s) paketille %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "stat ei toiminut lähdepakettiluettelolle %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Komento update ei käytä parametreja"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Luettelokansiota ei voitu lukita"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "On tarkoitus olla poistamatta mitään, joten AutoRemover:ia ei voi käynnistää"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1016,18 +1028,18 @@ msgstr ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää "
 "vaadittuja:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Poista ne komennolla \"apt-get autoremove\"."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1045,43 +1057,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Sisäinen virhe, AutoRemover rikkoi jotain"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Tehtävää %s ei löytynyt"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Pakettia %s ei löytynyt"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Saatat haluta suorittaa \"apt-get -f install\" korjaamaan nämä:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1089,7 +1101,7 @@ msgstr ""
 "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" "
 "ilmanpaketteja (tai ratkaise itse)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1100,116 +1112,116 @@ msgstr ""
 "jos käytetään epävakaata jakelua, joitain vaadittuja paketteja ei ole\n"
 "vielä luotu tai siirretty Incoming-kansiosta."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Rikkinäiset paketit"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Ehdotetut paketit:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Suositellut paketit:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Käsitellään päivitystä ... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Ei onnistunut"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Valmis"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Sisäinen virhe, resolver rikkoi jotain"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "On annettava ainakin yksi paketti jonka lähdekoodi noudetaan"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Paketin %s lähdekoodipakettia ei löytynyt"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Kansiossa %s ei ole riittävästi vapaata tilaa"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "On noudettava %st lähdekoodiarkistoja.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Nouda lähdekoodi %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Joidenkin arkistojen noutaminen ei onnistunut."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Ohitetaan purku jo puretun lähdekoodin %s kohdalla\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Purkukomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Paketointikomento \"%s\" ei onnistunut.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Lapsiprosessi kaatui"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Paketille %s ei ole saatavilla riippuvuustietoja"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1229,7 @@ msgid ""
 msgstr ""
 "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1238,32 @@ msgstr ""
 "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio "
 "ei vastaa versioriippuvuuksia"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Riippuvutta %s paketille %s ei voi tyydyttää: Asennettu paketti %s on liian "
 "uusi"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Paketointiriippuvuuksien käsittely ei onnistunut"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Tuetut moduulit:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1335,7 +1347,7 @@ msgstr ""
 "lisätietoja ja lisää valitsimia.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1755,11 +1767,11 @@ msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Komento stat ei toiminut"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Tiedoston muutospäivämäärää ei saatu vaihdettua"
 
@@ -1887,7 +1899,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin"
 msgid "Unable to accept connection"
 msgstr "Yhteyttä ei voitu hyväksyä"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Pulmia tiedoston hajautuksessa"
 
@@ -1962,8 +1974,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Tilapäinen häiriö selvitettäessä \"%s\""
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Jotain kenkkua tapahtui selvitettäessä \"%s: %s\" (%i)"
 
 #: methods/connect.cc:240
@@ -2056,47 +2068,47 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki"
 msgid "Unknown date format"
 msgstr "Tuntematon päiväysmuoto"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Select ei toiminut"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Yhteys aikakatkaistiin"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Tapahtui virhe kirjoitettaessa tiedostoon"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Tapahtui virhe luettaessa palvelimelta"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Tiedoston typistäminen ei onnistunut"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Virheellinen otsikkotieto"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Yhteys ei toiminut"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Sisäinen virhe"
 
@@ -2104,18 +2116,25 @@ msgstr "Sisäinen virhe"
 msgid "Can't mmap an empty file"
 msgstr "Tyhjälle tiedostolle ei voi tehdä mmap:ia"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Ei voitu tehdä %lu tavun mmap:ia"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2501,7 +2520,14 @@ msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2512,6 +2538,13 @@ msgstr ""
 "s Conflicts/Pre-Depends -kehämäärittelyn takia. Tämä on usein pahasta, mutta "
 "jos varmasti haluat tehdä niin, käytä APT::Force-LoopBreak -valitsinta."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2720,19 +2753,19 @@ msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "nimen vaihto ei onnistunut, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum ei täsmää"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Hash Sum täsmää"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Julkisia avaimia ei ole saatavilla, avainten ID:t ovat:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2741,7 +2774,7 @@ msgstr ""
 "En löytänyt pakettia %s vastaavaa tiedostoa. Voit ehkä joutua korjaamaan "
 "tämän paketin itse (puuttuvan arkkitehtuurin vuoksi)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2750,7 +2783,7 @@ msgstr ""
 "Pakettia %s vastaavaa tiedostoa ei löytynyt. Voit ehkä joutua korjaamaan "
 "tämän paketin itse."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2758,7 +2791,7 @@ msgstr ""
 "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-"
 "kenttää."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Koko ei täsmää"
 
@@ -2990,14 +3023,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Tiedostoa %s ei voitu avata"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Yhteys katkesi ennenaikaisesti"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Tiedostoa %s ei voitu avata"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/fr.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2009-09-27 19:36+0200\n"
 "Last-Translator: Christian Perrier <bubulle@debian.org>\n"
 "Language-Team: French <debian-l10n-french@lists.debian.org>\n"
@@ -154,7 +154,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s pour %s compilé sur %s %s\n"
@@ -537,26 +537,26 @@ msgstr "*** Impossible de lier %s à %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Seuil de delink de %so atteint.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "L'archive ne possède pas de champ de paquet"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "%s ne possède pas d'entrée « override »\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr " le responsable de %s est %s et non %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s ne possède pas d'entrée « source override »\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s ne possède pas également pas d'entrée « binary override »\n"
@@ -660,7 +660,7 @@ msgstr "Impossible de changer le nom %s en %s"
 msgid "Y"
 msgstr "O"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erreur de compilation de l'expression rationnelle - %s"
@@ -806,7 +806,7 @@ msgstr "Faut-il installer ces paquets sans vérification (o/N) ? "
 msgid "Some packages could not be authenticated"
 msgstr "Certains paquets n'ont pas pu être authentifiés"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Il y a des problèmes et -y a été employé sans --force-yes"
 
@@ -823,11 +823,11 @@ msgstr ""
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erreur interne. Le tri a été interrompu."
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Impossible de verrouiller le répertoire de téléchargement"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "La liste des sources ne peut être lue."
@@ -859,17 +859,18 @@ msgstr ""
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Après cette opération, %so d'espace disque seront libérés.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Impossible de déterminer l'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr ""
 "L'option --trivial-only a été indiquée mais il ne s'agit pas d'une opération "
@@ -877,11 +878,11 @@ msgstr ""
 
 # The space before the exclamation mark must not be a non-breaking space; this
 # sentence is supposed to be typed by a user who cannot see the difference.
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Oui, faites ce que je vous dis !"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -892,28 +893,28 @@ msgstr ""
 "Pour continuer, tapez la phrase « %s »\n"
 " ?]"
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Annulation."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Souhaitez-vous continuer [O/n] ? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Impossible de récupérer %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Certains fichiers n'ont pu être téléchargés."
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Téléchargement achevé et dans le mode téléchargement uniquement"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -921,48 +922,48 @@ msgstr ""
 "Impossible de récupérer quelques archives, peut-être devrez-vous lancer apt-"
 "get update ou essayer avec --fix-missing ?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "l'option --fix-missing et l'échange de support ne sont pas encore reconnus."
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Impossible de corriger le fait que les paquets manquent."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Annulation de l'installation."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Note, sélection de %s au lieu de %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Passe %s, il est déjà installé et la mise à jour n'est pas prévue.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "Le paquet %s n'est pas installé, et ne peut donc être supprimé\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "Le paquet %s est un paquet virtuel fourni par :\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Installé]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Vous devez explicitement sélectionner un paquet à installer."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -974,61 +975,72 @@ msgstr ""
 "devenu obsolète\n"
 "ou qu'il n'est disponible que sur une autre source\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Cependant les paquets suivants le remplacent :"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "Aucun paquet ne correspond au paquet %s"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr ""
 "La réinstallation de %s est impossible, il ne peut pas être téléchargé.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s est déjà la plus récente version disponible.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "La version  « %s » de « %s » est introuvable"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "La version « %s » de « %s » n'a pu être trouvée"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Version choisie %s (%s) pour %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
-msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n"
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1307
+#, c-format
+msgid "Ignore unavailable target release '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Impossible de localiser la liste des paquets sources %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "La commande de mise à jour ne prend pas d'argument"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Impossible de verrouiller le répertoire de liste"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Aucune suppression n'est sensée se produire : impossible de lancer "
 "« Autoremover »"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
@@ -1036,17 +1048,17 @@ msgstr ""
 "Les paquets suivants ont été installés automatiquement et ne sont plus "
 "nécessaires :"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "%lu paquets ont été installés automatiquement et ne sont plus nécessaires.\n"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Veuillez utiliser « apt-get autoremove » pour les supprimer."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1065,44 +1077,44 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "L'information suivante devrait vous aider à résoudre la situation : "
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr ""
 "Erreur interne, l'outil de suppression automatique a cassé quelque chose."
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erreur interne, AllUpgrade a cassé le boulot !"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Impossible de trouver la tâche %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Impossible de trouver le paquet %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Note, sélectionne %s pour l'expression rationnelle « %s »\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s passé en « installé manuellement ».\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Vous pouvez lancer « apt-get -f install » pour corriger ces problèmes :"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1110,7 +1122,7 @@ msgstr ""
 "Dépendances non satisfaites. Essayez « apt-get -f install » sans paquet\n"
 "(ou indiquez une solution)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1122,119 +1134,119 @@ msgstr ""
 "la distribution unstable, que certains paquets n'ont pas encore\n"
 "été créés ou ne sont pas sortis d'Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Paquets défectueux"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Les paquets supplémentaires suivants seront installés : "
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Paquets suggérés :"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Paquets recommandés :"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Calcul de la mise à jour... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Échec"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Fait"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr ""
 "Erreur interne, la tentative de résolution du problème a cassé certaines "
 "parties"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "Vous devez spécifier au moins un paquet source"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Impossible de trouver une source de paquet pour %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Saut du téléchargement du fichier « %s », déjà téléchargé\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Pas assez d'espace disponible sur %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Nécessité de prendre %so/%so dans les sources.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Nécessité de prendre %so dans les sources.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Récupération des sources %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Échec lors de la récupération de quelques archives."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Saut du décompactage des paquets sources déjà décompactés dans %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "La commande de décompactage « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Veuillez vérifier si le paquet dpkg-dev est installé.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "La commande de construction « %s » a échoué.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Échec du processus fils"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Il faut spécifier au moins un paquet pour vérifier les dépendances de "
 "construction"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Impossible d'obtenir les dépendances de construction pour %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s n'a pas de dépendance de construction.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1243,7 +1255,7 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car le paquet %s ne "
 "peut être trouvé"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1252,32 +1264,33 @@ msgstr ""
 "La dépendance %s vis-à-vis de %s ne peut être satisfaite car aucune version "
 "du paquet %s ne peut satisfaire à la version requise"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Impossible de satisfaire la dépendance %s pour %s : le paquet installé %s "
 "est trop récent"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Impossible de satisfaire les dépendances %s pour %s : %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
-msgstr "Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
+msgstr ""
+"Les dépendances de compilation pour %s ne peuvent pas être satisfaites."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Impossible d'activer les dépendances de construction"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Modules reconnus :"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 msgid ""
 "Usage: apt-get [options] command\n"
 "       apt-get [options] install|remove pkg1 [pkg2 ...]\n"
@@ -1362,7 +1375,7 @@ msgstr ""
 "apt.conf(5) pour plus d'informations et d'option.\n"
 "                      Cet APT a les « Super Cow Powers »\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1793,11 +1806,11 @@ msgid "File not found"
 msgstr "Fichier non trouvé"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Impossible de statuer"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Impossible de modifier l'heure "
 
@@ -1927,7 +1940,7 @@ msgstr "Délai de connexion au port de données dépassé"
 msgid "Unable to accept connection"
 msgstr "Impossible d'accepter une connexion"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problème de hachage du fichier"
 
@@ -2002,13 +2015,14 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Erreur temporaire de résolution de « %s »"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr ""
 "Quelque chose d'imprévisible est survenu lors de la détermination de « %s:%"
 "s » (%i)"
 
-#: methods/connect.cc:240, c-format
+#: methods/connect.cc:240
+#, c-format
 msgid "Unable to connect to %s:%s:"
 msgstr "Impossible de se connecter à %s:%s :"
 
@@ -2099,47 +2113,47 @@ msgstr "Ce serveur http possède un support des limites non-valide"
 msgid "Unknown date format"
 msgstr "Format de date inconnu"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Sélection défaillante"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Délai de connexion dépassé"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Erreur d'écriture du fichier de sortie"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Erreur d'écriture sur un fichier"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Erreur d'écriture sur le fichier"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erreur de lecture depuis le serveur distant et clôture de la connexion"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Erreur de lecture du serveur"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Échec de la troncature du fichier"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Mauvais en-tête de donnée"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Échec de la connexion"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Erreur interne"
 
@@ -2147,12 +2161,12 @@ msgstr "Erreur interne"
 msgid "Can't mmap an empty file"
 msgstr "Impossible de mapper un fichier vide en mémoire"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Impossible de réaliser un mapping de %lu octets en mémoire"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
@@ -2162,6 +2176,13 @@ msgstr ""
 "Vous devriez augmenter la taille de APT::Cache-Limit, dont la valeur "
 "actuelle est de %lu (voir « man 5 apt.conf »)."
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2552,7 +2573,14 @@ msgid "Malformed line %u in source list %s (vendor id)"
 msgstr ""
 "Ligne %u mal formée dans la liste des sources %s (identifiant du fournisseur)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2564,6 +2592,13 @@ msgstr ""
 "Depends. C'est souvent une mauvaise chose, mais si vous souhaitez réellement "
 "le faire, activez l'option APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2792,19 +2827,20 @@ msgstr ""
 msgid "rename failed, %s (%s -> %s)."
 msgstr "impossible de changer le nom, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Somme de contrôle MD5 incohérente"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Somme de contrôle de hachage incohérente"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
-msgstr "Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
+msgstr ""
+"Aucune clé publique n'est disponible pour la/les clé(s) suivante(s) :\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2813,7 +2849,7 @@ msgstr ""
 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
 "devrez corriger ce paquet vous-même (absence d'architecture)."
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2822,7 +2858,7 @@ msgstr ""
 "Impossible de localiser un fichier du paquet %s. Cela signifie que vous "
 "devrez corriger ce paquet vous-même."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2830,7 +2866,7 @@ msgstr ""
 "Les fichiers d'index des paquets sont corrompus. Aucun champ « Filename: » "
 "pour le paquet %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Taille incohérente"
 
@@ -3070,14 +3106,30 @@ msgstr ""
 msgid "Not locked"
 msgstr "Non verrouillé"
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Impossible de corriger le fichier"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "Connexion fermée prématurément"
 
+#~ msgid "No source package '%s' picking '%s' instead\n"
+#~ msgstr "Pas de paquet source « %s ». Utilisation de « %s » à la place\n"
+
+#~ msgid "Could not patch file"
+#~ msgstr "Impossible de corriger le fichier"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/gl.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_gl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-12-17 22:44+0100\n"
 "Last-Translator: mvillarino <mvillarino@users.sourceforge.net>\n"
 "Language-Team: galician <proxecto@trasno.net>\n"
@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s para %s compilado o %s %s\n"
@@ -539,26 +539,26 @@ msgstr "*** Non se puido ligar %s con %s"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " Alcanzouse o límite de desligado de %sB.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "O arquivo non tiña un campo Package"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s non ten unha entrada de \"override\"\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  O mantedor de %s é %s, non %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s non ten unha entrada de \"override\" de código fonte\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s tampouco ten unha entrada de \"override\" de binarios\n"
@@ -662,7 +662,7 @@ msgstr "Non se puido cambiar o nome de %s a %s"
 msgid "Y"
 msgstr "S"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Erro na compilación da expresión regular - %s"
@@ -807,7 +807,7 @@ msgstr "¿Instalar estes paquetes sen verificación [s/N]? "
 msgid "Some packages could not be authenticated"
 msgstr "Non se puido autenticar algúns paquetes"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Houbo problemas e empregouse -y sen --force-yes"
 
@@ -823,11 +823,11 @@ msgstr "Hai que eliminar paquetes pero a eliminación está desactivada."
 msgid "Internal error, Ordering didn't finish"
 msgstr "Erro interno, a ordeación non rematou"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Non se puido bloquear o directorio de descargas"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "Non se puido ler a lista de orixes."
@@ -857,25 +857,26 @@ msgstr "Despois desta operación hanse ocupar %sB de disco adicionais.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "Despois desta operación hanse liberar %sB de disco.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Non se puido determinar o espazo libre en %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Non hai espazo libre de abondo en %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Especificouse \"Só Triviais\" pero esta non é unha operación trivial."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "¡Si, fai o que digo!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -886,28 +887,28 @@ msgstr ""
 "Para continuar escriba a frase \"%s\"\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Abortar."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "¿Quere continuar [S/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Non se puido obter %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Non se puido descargar algúns ficheiros"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "Completouse a descarga no modo de só descargas"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -915,49 +916,49 @@ msgstr ""
 "Non se puido obter algúns arquivos; probe con apt-get update ou --fix-"
 "missing."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr ""
 "O emprego conxunto de --fix-missing e intercambio de discos non está "
 "soportado"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Non se puido corrixir os paquetes non dispoñibles."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "A abortar a instalación."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Nota, escóllese %s no canto de %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "Omítese %s, xa está instalado e non se especificou a actualización.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "O paquete %s non está instalado, así que non se eliminou\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "O paquete %s é un paquete virtual fornecido por:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Instalado]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Debería escoller un para instalar."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -968,77 +969,88 @@ msgstr ""
 "Isto pode significar que o paquete falla, está obsoleto ou só está\n"
 "dispoñible noutra fonte.\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "Nembargantes, os seguintes paquetes substitúeno:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "O paquete %s non ten un candidato para a instalación"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "A reinstalación de %s non é posible, non se pode descargar.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s xa é a versión máis recente.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "Non se atopou a versión \"%s\" de \"%s\""
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "Non se atopou a versión \"%s\" de \"%s\""
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "Escolleuse a versión %s (%s) de %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Non se atopou a lista de paquetes fonte %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "A orde \"update\" non toma argumentos"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Non se puido bloquear o directorio de listas"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "Non se supón que se deban eliminar cousas; non se pode iniciar o "
 "autoeliminador"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "Os seguintes paquetes instaláronse automaticamente e xa non son necesarios:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Empregue \"apt-get autoremove\" para eliminalos."
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1056,43 +1068,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "A seguinte información pode axudar a resolver a situación:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Erro interno, o autoeliminador rompeu cousas"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Erro interno, AllUpgrade rompeu cousas"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Non se puido atopar a tarefa %s"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Non se puido atopar o paquete %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Nota, escóllese %s para a expresión regular \"%s\"\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s cambiouse a instalado manualmente.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Pode querer executar \"apt-get -f install\" corrixir isto:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1100,7 +1112,7 @@ msgstr ""
 "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou "
 "especifique unha solución)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1111,118 +1123,118 @@ msgstr ""
 "unha situación imposible ou, se emprega a distribución inestable, que\n"
 "algúns paquetes solicitados aínda non se crearon ou moveron de Incoming."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Paquetes rotos"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Hanse instalar os seguintes paquetes extra:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Paquetes suxiridos:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Paquetes recomendados:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "A calcular a actualización... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Fallou"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Rematado"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Erro interno, o resolvedor interno rompeu cousas"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle descargar o código fonte"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Non se puido atopar un paquete fonte para %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "Omítese o ficheiro xa descargado \"%s\"\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Non hai espazo libre de abondo en %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "Hai que recibir %sB/%sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "Hai que recibir %sB de arquivos de fonte.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Obter fonte %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Non se puido recibir algúns arquivos."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Omítese o desempaquetamento do código fonte xa desempaquetado en %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "Fallou a orde de desempaquetamento \"%s\".\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Comprobe que o paquete \"dpkg-dev\" estea instalado.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "Fallou a codificación de %s.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "O proceso fillo fallou"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Ten que especificar alomenos un paquete para lle comprobar as dependencias "
 "de compilación"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Non se puido obter a información de dependencias de compilación de %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s non ten dependencias de compilación.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1231,7 +1243,7 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar "
 "o paquete %s"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1240,32 +1252,32 @@ msgstr ""
 "A dependencia \"%s\" de %s non se pode satisfacer porque ningunha versión "
 "dispoñible do paquete %s satisfai os requirimentos de versión"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "Non se puido satisfacer a dependencia \"%s\" de %s: O paquete instalado %s é "
 "novo de máis"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "Non se puido satisfacer a dependencia \"%s\" de %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "Non se puideron satisfacer as dependencias de compilación de %s."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Non se puido procesar as dependencias de compilación"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Módulos soportados:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1353,7 +1365,7 @@ msgstr ""
 "máis información e opcións.\n"
 "                  Este APT ten Poderes de Supervaca.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1771,11 +1783,11 @@ msgid "File not found"
 msgstr "Non se atopou o ficheiro"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Non se atopou"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "Non se puido estabrecer a hora de modificación"
 
@@ -1904,7 +1916,7 @@ msgstr "A conexión do socket de datos esgotou o tempo"
 msgid "Unable to accept connection"
 msgstr "Non se pode aceptar a conexión"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Problema ao calcular o hash do ficheiro"
 
@@ -1979,8 +1991,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Fallo temporal ao resolver \"%s\""
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Algo estraño ocorreu ao resolver \"%s:%s\" (%i)"
 
 #: methods/connect.cc:240
@@ -2075,47 +2087,47 @@ msgstr "Este servidor HTTP ten un soporte de rangos roto"
 msgid "Unknown date format"
 msgstr "Formato de data descoñecido"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Fallou a chamada a select"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "A conexión esgotou o tempo"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Erro ao escribir no ficheiro de saída"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Erro ao escribir nun ficheiro"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Erro ao escribir no ficheiro"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Erro ao ler do servidor. O extremo remoto pechou a conexión"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Erro ao ler do servidor"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "Non se puido truncar o ficheiro"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Datos da cabeceira incorrectos"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "A conexión fallou"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Erro interno"
 
@@ -2123,18 +2135,25 @@ msgstr "Erro interno"
 msgid "Can't mmap an empty file"
 msgstr "Non se pode facer mmap sobre un ficheiro baleiro"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Non se puido facer mmap de %lu bytes"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2521,7 +2540,14 @@ msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2532,6 +2558,13 @@ msgstr ""
 "%s debido a un bucle de Conflictos e Pre-dependencias. Isto adoita ser malo, "
 "pero se o quere facer, active a opción APT::Force-LoopBreak."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2743,20 +2776,20 @@ msgstr "Erro de E/S ao gravar a caché de fontes"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "fallou o cambio de nome, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Os MD5Sum non coinciden"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "Os \"hashes\" non coinciden"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr ""
 "Non hai unha clave pública dispoñible para os seguintes IDs de clave:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2765,7 +2798,7 @@ msgstr ""
 "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man. (Falla a arquitectura)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2774,7 +2807,7 @@ msgstr ""
 "Non se puido atopar un ficheiro para o paquete %s. Isto pode significar que "
 "ten que arranxar este paquete a man."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2782,7 +2815,7 @@ msgstr ""
 "Os ficheiros de índices de paquetes están corrompidos. Non hai un campo "
 "Filename: para o paquete %s."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "Os tamaños non coinciden"
 
@@ -3014,14 +3047,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "Non se puido parchear o ficheiro"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "A conexión pechouse prematuramente"
 
+#~ msgid "Could not patch file"
+#~ msgstr "Non se puido parchear o ficheiro"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/hu.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: hu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-05-11 14:49+0100\n"
 "Last-Translator: SZERVÁC Attila <sas@321.hu>\n"
 "Language-Team: Hungarian <debian-l10n-hungarian>\n"
@@ -156,7 +156,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s erre: %s ekkor fordult: %s %s\n"
@@ -532,26 +532,26 @@ msgstr "*** %s linkelése ehhez: %s sikertelen"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink elérte %sB korlátját.\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "Az archívumnak nem volt csomag mezője"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s nem rendelkezik felülbíráló bejegyzéssel\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %s karbantartója %s, nem %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s nem rendelkezik forrás felülbíráló bejegyzéssel\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s nem rendelkezik bináris felülbíráló bejegyzéssel sem\n"
@@ -655,7 +655,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s"
 msgid "Y"
 msgstr "I"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex fordítási hiba - %s"
@@ -800,7 +800,7 @@ msgstr "Valóban telepíted e csomagokat ellenőrzés nélkül (i/N)? "
 msgid "Some packages could not be authenticated"
 msgstr "Néhány csomag nem hitelesíthető"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "Problémák vannak és a -y -t használtad --force-yes nélkül"
 
@@ -816,11 +816,11 @@ msgstr "Csomagokat kellene eltávolítani, de az Eltávolítás nem engedélyeze
 msgid "Internal error, Ordering didn't finish"
 msgstr "Belső hiba, a rendezés nem zárult"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "Nem tudom zárolni a letöltési könyvtárat"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "A források listája olvashatatlan."
@@ -849,25 +849,26 @@ msgstr "E művelet után további %sB lemez-területetet használok fel.\n"
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "E művelet után %sB lemez-terület szabadul fel.\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "Nem határozható meg a szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "Nincs elég szabad hely itt:  %s."
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "A 'Trivial Only' meg van adva, de ez nem egy triviális művelet."
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Igen, tedd amit mondok!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -878,28 +879,28 @@ msgstr ""
 "A folytatáshoz írd be ezt: '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "Megszakítva."
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "Folytatni akarod [Y/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "Sikertelen letöltés: %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "Néhány fájlt nem sikerült letölteni"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "A letöltés befejeződött a 'csak letöltés' módban"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -907,47 +908,47 @@ msgstr ""
 "Nem lehet letölteni néhány archívumot.\n"
 " Próbáld ki az apt-get update -et vagy a --fix-missing -et."
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing és média csere jelenleg nem támogatott"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "Nem lehet javítani a hiányzó csomagokat."
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "Telepítés megszakítása."
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "Megjegyzés: %s kiválasztása %s helyett\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "%s kihagyása, ez már telepítve van és a frissítés nincs beállítva.\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "A megadott %s csomag nincs telepítve, így hát nem is töröltem\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s egy virtuális csomag, melyet az alábbi csomagok adnak:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [Telepítve]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "Egyet név szerint ki kell jelölnöd a telepítésre."
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -957,73 +958,84 @@ msgstr ""
 "%s csomag nem elérhető, de egy másik hivatkozik rá\n"
 ".A kért csomag tehát: hiányzik, elavult vagy csak más forrásból érhető el\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "De az alábbi csomagok felváltják:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "%s csomagnak nincs e telepítéshez kijelölhető változata"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "%s újratelepítése nem lehetséges, mert nem lehet letölteni.\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s már a legújabb verzió.\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%s' kiadás ehhez: '%s' nem található"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%s' verzió ehhez: '%s' nem található"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "Az update parancsnak nincsenek argumentumai"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "Nem tudom a listakönyvtárat zárolni"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr "Nincs törölnivaló, az AutoRemover nem indítható"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "Az alábbi csomagok automatikusan települtek, de már nem kellenek:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "Töröld az 'apt-get autoremove' paranccsal!"
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1041,43 +1053,43 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "Az alábbi információ segíthet megoldani a helyzetet:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "Belső hiba, az AutoRemover sérült"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "Belső hiba, AllUpgrade megsértett valamit"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "Hiányzó %s feladat"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "Az alábbi csomag nem található: %s"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "Megjegyzés: %s kiválasztása %s reguláris kifejezéshez\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s kézi telepítésre állított.\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "Próbáld futtatni az 'apt-get -f install'-t az alábbiak javításához:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1085,7 +1097,7 @@ msgstr ""
 "Teljesítetlen függőségek. Próbáld az 'apt-get -f install'-t csomagok nélkül "
 "(vagy telepítsd a függőségeket is!)."
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1097,118 +1109,118 @@ msgstr ""
 "használod, akkor néhány igényelt csomag még nem készült el vagy ki\n"
 "lett mozdítva az Incoming-ból."
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "Törött csomagok"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "Az alábbi extra csomagok kerülnek telepítésre:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "Javasolt csomagok:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "Ajánlott csomagok:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "Frissítés kiszámítása... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "Sikertelen"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "Kész"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "Belső hiba, hibafeloldó gond"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "Legalább egy csomagot meg kell adnod, aminek a forrását le kell tölteni"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "Nem található forráscsomag ehhez: %s"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "A már letöltött '%s' fájl kihagyása\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "Nincs elég szabad hely itt: %s"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%sB/%sB forrás-archívumot kell letölteni.\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB forrás-archívumot kell letölteni.\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "Forrás letöltése: %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "Nem sikerült néhány archívumot letölteni."
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "Egy már kibontott forrás kibontásának kihagyása itt: %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "'%s' kibontási parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "Ellenőrizd, hogy a 'dpkg-dev' csomag telepítve van-e.\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "'%s' elkészítési parancs nem sikerült.\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "Hiba a gyermekfolyamatnál"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "Legalább egy csomagot adj meg, aminek a fordítási függőségeit ellenőrizni "
 "kell"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "Nem lehet %s fordítási-függőség információját beszerezni"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "Nincs fordítási függősége a következőnek: %s.\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1217,7 +1229,7 @@ msgstr ""
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomag nem "
 "található"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1226,32 +1238,32 @@ msgstr ""
 "%s függősége ennek: %s, ez nem elégíthető ki, mert a(z) %s csomagnak nincs a "
 "verzió-követelményt kielégítő elérhető verziója."
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%s függőséget %s csomaghoz nem lehet kielégíteni: %s telepített csomag túl "
 "friss."
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%s függőséget %s csomaghoz nem lehet kielégíteni: %s "
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s építési függőségei nem elégíthetőek ki."
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "Nem sikerült az építési függőségeket feldolgozni"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "Támogatott modulok:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1336,7 +1348,7 @@ msgstr ""
 "további információkért és opciókért.\n"
 "                   Ez az APT a SzuperTehén Hatalmával rendelkezik.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1751,11 +1763,11 @@ msgid "File not found"
 msgstr "Nem találom a fájlt"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "Nem érhető el"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "A módosítási időt beállítása sikertelen"
 
@@ -1883,7 +1895,7 @@ msgstr "Az adat sockethez kapcsolódás túllépte az időt"
 msgid "Unable to accept connection"
 msgstr "Nem lehet elfogadni a kapcsolatot"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Probléma a fájl hash értékének meghatározásakor"
 
@@ -1958,8 +1970,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "Átmeneti hiba '%s' feloldása közben"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "Valami rossz történt '%s: %s' feloldásakor (%i)"
 
 #: methods/connect.cc:240
@@ -2048,48 +2060,48 @@ msgstr "Ez a http szerver támogatja a sérült tartományokat "
 msgid "Unknown date format"
 msgstr "Ismeretlen dátum formátum"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "Sikertelen kiválasztás"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "Időtúllépés a kapcsolatban"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "Hiba a kimeneti fájl írásakor"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "Hiba fájl írásakor"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "Hiba a fájl írásakor"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Hiba a kiszolgálóról olvasáskor, a túloldal lezárta a kapcsolatot"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "Hiba a kiszolgálóról olvasáskor"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "%s fájl írása sikertelen"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "Rossz fejlécadat"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "Sikertelen kapcsolódás"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "Belső hiba"
 
@@ -2098,18 +2110,25 @@ msgstr "Belső hiba"
 msgid "Can't mmap an empty file"
 msgstr "Nem lehet mmap-olni egy üres fájlt"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "Nem sikerült %lu bájtot mmap-olni"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2496,7 +2515,14 @@ msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2507,6 +2533,13 @@ msgstr ""
 "alapvető csomagot ami Ütközési/Elő-függőségi hurkot okoz. Ez gyakran rossz, "
 "de ha tényleg ezt akarod tenni, aktiváld az APT::Force-LoopBreak opciót."
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2722,19 +2755,19 @@ msgstr "IO hiba a forrás-gyorsítótár mentésekor"
 msgid "rename failed, %s (%s -> %s)."
 msgstr "sikertelen átnevezés, %s (%s -> %s)."
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "Az MD5Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "A Hash Sum nem megfelelő"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "Nincs elérhető nyilvános kulcs az alábbi kulcs azonosítókhoz:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2743,7 +2776,7 @@ msgstr ""
 "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot. (hiányzó arch. miatt)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2752,14 +2785,14 @@ msgstr ""
 "Nem találtam egy fájlt a(z) %s csomaghoz. Ez azt jelentheti, hogy kézzel "
 "kell kijavítani a csomagot."
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr ""
 "A csomagindex-fájlok megsérültek. Nincs Filename: mező a(z) %s csomaghoz."
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "A méret nem megfelelő"
 
@@ -2987,14 +3020,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "%s fájl foltozása sikertelen"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "A kapcsolat idő előtt lezárult"
 
+#~ msgid "Could not patch file"
+#~ msgstr "%s fájl foltozása sikertelen"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/it.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7.23.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-12-10 16:49+0100\n"
 "PO-Revision-Date: 2009-11-11 21:10+0100\n"
 "Last-Translator: Milo Casagrande <milo@ubuntu.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1135,7 +1135,7 @@ msgstr "Pacchetti raccomandati:"
 msgid "Calculating upgrade... "
 msgstr "Calcolo dell'aggiornamento... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1958 methods/ftp.cc:708 methods/connect.cc:112
 msgid "Failed"
 msgstr "Non riuscito"
 
@@ -1614,7 +1614,7 @@ msgstr "Il file %s/%s sovrascrive quello nel pacchetto %s"
 #: apt-inst/extract.cc:464 apt-pkg/contrib/configuration.cc:843
 #: apt-pkg/contrib/cdromutl.cc:157 apt-pkg/sourcelist.cc:166
 #: apt-pkg/sourcelist.cc:172 apt-pkg/sourcelist.cc:327 apt-pkg/acquire.cc:419
-#: apt-pkg/init.cc:89 apt-pkg/init.cc:97 apt-pkg/clean.cc:33
+#: apt-pkg/init.cc:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33
 #: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287
 #, c-format
 msgid "Unable to read %s"
@@ -1795,34 +1795,34 @@ msgid "Invalid URI, local URIS must not start with //"
 msgstr "URI non valido, gli URI locali non devono iniziare con //"
 
 #. Login must be before getpeername otherwise dante won't work.
-#: methods/ftp.cc:167
+#: methods/ftp.cc:168
 msgid "Logging in"
 msgstr "Accesso in corso"
 
-#: methods/ftp.cc:173
+#: methods/ftp.cc:174
 msgid "Unable to determine the peer name"
 msgstr "Impossibile determinare il nome del nodo"
 
-#: methods/ftp.cc:178
+#: methods/ftp.cc:179
 msgid "Unable to determine the local name"
 msgstr "Impossibile determinare il nome locale"
 
-#: methods/ftp.cc:209 methods/ftp.cc:237
+#: methods/ftp.cc:210 methods/ftp.cc:238
 #, c-format
 msgid "The server refused the connection and said: %s"
 msgstr "Il server ha rifiutato la connessione e riporta: %s"
 
-#: methods/ftp.cc:215
+#: methods/ftp.cc:216
 #, c-format
 msgid "USER failed, server said: %s"
 msgstr "USER non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:222
+#: methods/ftp.cc:223
 #, c-format
 msgid "PASS failed, server said: %s"
 msgstr "PASS non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:242
+#: methods/ftp.cc:243
 msgid ""
 "A proxy server was specified but no login script, Acquire::ftp::ProxyLogin "
 "is empty."
@@ -1830,115 +1830,115 @@ msgstr ""
 "È stato specificato un server proxy, ma nessuno script di accesso: Acquire::"
 "ftp::ProxyLogin è vuoto."
 
-#: methods/ftp.cc:270
+#: methods/ftp.cc:271
 #, c-format
 msgid "Login script command '%s' failed, server said: %s"
 msgstr ""
 "Comando dello script di accesso \"%s\" non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:296
+#: methods/ftp.cc:297
 #, c-format
 msgid "TYPE failed, server said: %s"
 msgstr "TYPE non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:334 methods/ftp.cc:445 methods/rsh.cc:183 methods/rsh.cc:226
+#: methods/ftp.cc:335 methods/ftp.cc:446 methods/rsh.cc:183 methods/rsh.cc:226
 msgid "Connection timeout"
 msgstr "Connessione scaduta"
 
-#: methods/ftp.cc:340
+#: methods/ftp.cc:341
 msgid "Server closed the connection"
 msgstr "Il server ha chiuso la connessione"
 
-#: methods/ftp.cc:343 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
+#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190
 msgid "Read error"
 msgstr "Errore di lettura"
 
-#: methods/ftp.cc:350 methods/rsh.cc:197
+#: methods/ftp.cc:351 methods/rsh.cc:197
 msgid "A response overflowed the buffer."
 msgstr "Una risposta ha superato le dimensioni del buffer."
 
-#: methods/ftp.cc:367 methods/ftp.cc:379
+#: methods/ftp.cc:368 methods/ftp.cc:380
 msgid "Protocol corruption"
 msgstr "Protocollo danneggiato"
 
-#: methods/ftp.cc:451 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
+#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232
 msgid "Write error"
 msgstr "Errore di scrittura"
 
-#: methods/ftp.cc:692 methods/ftp.cc:698 methods/ftp.cc:734
+#: methods/ftp.cc:693 methods/ftp.cc:699 methods/ftp.cc:735
 msgid "Could not create a socket"
 msgstr "Impossibile creare un socket"
 
-#: methods/ftp.cc:703
+#: methods/ftp.cc:704
 msgid "Could not connect data socket, connection timed out"
 msgstr "Impossibile connettersi al socket dati, connessione terminata"
 
-#: methods/ftp.cc:709
+#: methods/ftp.cc:710
 msgid "Could not connect passive socket."
 msgstr "Impossibile connettere socket passivo."
 
-#: methods/ftp.cc:727
+#: methods/ftp.cc:728
 msgid "getaddrinfo was unable to get a listening socket"
 msgstr "Impossibile ottenere un socket in ascolto con getaddrinfo()"
 
-#: methods/ftp.cc:741
+#: methods/ftp.cc:742
 msgid "Could not bind a socket"
 msgstr "Impossibile eseguire bind() su un socket"
 
-#: methods/ftp.cc:745
+#: methods/ftp.cc:746
 msgid "Could not listen on the socket"
 msgstr "Impossibile eseguire listen() su un socket"
 
-#: methods/ftp.cc:752
+#: methods/ftp.cc:753
 msgid "Could not determine the socket's name"
 msgstr "Impossibile determinare il nome del socket"
 
-#: methods/ftp.cc:784
+#: methods/ftp.cc:785
 msgid "Unable to send PORT command"
 msgstr "Impossibile inviare il comando PORT"
 
-#: methods/ftp.cc:794
+#: methods/ftp.cc:795
 #, c-format
 msgid "Unknown address family %u (AF_*)"
 msgstr "Famiglia di indirizzamento %u (AF_*) sconosciuta"
 
-#: methods/ftp.cc:803
+#: methods/ftp.cc:804
 #, c-format
 msgid "EPRT failed, server said: %s"
 msgstr "EPRT non riuscito, il server riporta: %s"
 
-#: methods/ftp.cc:823
+#: methods/ftp.cc:824
 msgid "Data socket connect timed out"
 msgstr "Connessione al socket dati terminata"
 
-#: methods/ftp.cc:830
+#: methods/ftp.cc:831
 msgid "Unable to accept connection"
 msgstr "Impossibile accettare connessioni"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "Si è verificato un problema nel creare l'hash del file"
 
-#: methods/ftp.cc:882
+#: methods/ftp.cc:883
 #, c-format
 msgid "Unable to fetch file, server said '%s'"
 msgstr "Impossibile recuperare il file, il server riporta: \"%s\""
 
-#: methods/ftp.cc:897 methods/rsh.cc:322
+#: methods/ftp.cc:898 methods/rsh.cc:322
 msgid "Data socket timed out"
 msgstr "Socket dati terminato"
 
-#: methods/ftp.cc:927
+#: methods/ftp.cc:928
 #, c-format
 msgid "Data transfer failed, server said '%s'"
 msgstr "Trasferimento dati non riuscito, il server riporta: \"%s\""
 
 #. Get the files information
-#: methods/ftp.cc:1002
+#: methods/ftp.cc:1005
 msgid "Query"
 msgstr "Interrogazione"
 
-#: methods/ftp.cc:1114
+#: methods/ftp.cc:1117
 msgid "Unable to invoke "
 msgstr "Impossibile invocare "
 
@@ -2053,80 +2053,80 @@ msgstr "Impossibile aprire una pipe per %s"
 msgid "Read error from %s process"
 msgstr "Errore di lettura dal processo %s"
 
-#: methods/http.cc:384
+#: methods/http.cc:385
 msgid "Waiting for headers"
 msgstr "In attesa degli header"
 
-#: methods/http.cc:530
+#: methods/http.cc:531
 #, c-format
 msgid "Got a single header line over %u chars"
 msgstr "Ricevuta una singola riga header su %u caratteri"
 
-#: methods/http.cc:538
+#: methods/http.cc:539
 msgid "Bad header line"
 msgstr "Riga header non corretta"
 
-#: methods/http.cc:557 methods/http.cc:564
+#: methods/http.cc:558 methods/http.cc:565
 msgid "The HTTP server sent an invalid reply header"
 msgstr "Il server HTTP ha inviato un header di risposta non valido"
 
-#: methods/http.cc:593
+#: methods/http.cc:594
 msgid "The HTTP server sent an invalid Content-Length header"
 msgstr "Il server HTTP ha inviato un header Content-Length non valido"
 
-#: methods/http.cc:608
+#: methods/http.cc:609
 msgid "The HTTP server sent an invalid Content-Range header"
 msgstr "Il server HTTP ha inviato un header Content-Range non valido"
 
-#: methods/http.cc:610
+#: methods/http.cc:611
 msgid "This HTTP server has broken range support"
 msgstr "Questo server HTTP ha un supporto del range non corretto"
 
-#: methods/http.cc:634
+#: methods/http.cc:635
 msgid "Unknown date format"
 msgstr "Formato della data sconosciuto"
 
-#: methods/http.cc:787
+#: methods/http.cc:790
 msgid "Select failed"
 msgstr "Select non riuscita"
 
-#: methods/http.cc:792
+#: methods/http.cc:795
 msgid "Connection timed out"
 msgstr "Connessione terminata"
 
-#: methods/http.cc:815
+#: methods/http.cc:818
 msgid "Error writing to output file"
 msgstr "Errore nello scrivere sul file di output"
 
-#: methods/http.cc:846
+#: methods/http.cc:849
 msgid "Error writing to file"
 msgstr "Errore nello scrivere su file"
 
-#: methods/http.cc:874
+#: methods/http.cc:877
 msgid "Error writing to the file"
 msgstr "Errore nello scrivere sul file"
 
-#: methods/http.cc:888
+#: methods/http.cc:891
 msgid "Error reading from server. Remote end closed connection"
 msgstr "Errore nel leggere dal server. Il lato remoto ha chiuso la connessione"
 
-#: methods/http.cc:890
+#: methods/http.cc:893
 msgid "Error reading from server"
 msgstr "Errore nel leggere dal server"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215
 msgid "Failed to truncate file"
 msgstr "Troncamento del file non riuscito"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1149
 msgid "Bad header data"
 msgstr "Header dati non corretto"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1166 methods/http.cc:1221
 msgid "Connection failed"
 msgstr "Connessione non riuscita"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1313
 msgid "Internal error"
 msgstr "Errore interno"
 
@@ -2538,7 +2538,7 @@ msgstr "Tipo \"%s\" non riconosciuto alla riga %u nel file %s"
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "La riga %u nel file %s non è corretta (vendor id)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:439
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2621,12 +2621,12 @@ msgstr "Il metodo %s non si è avviato correttamente"
 msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter."
 msgstr "Inserire il disco chiamato \"%s\" nell'unità \"%s\" e premere Invio."
 
-#: apt-pkg/init.cc:132
+#: apt-pkg/init.cc:133
 #, c-format
 msgid "Packaging system '%s' is not supported"
 msgstr "Il sistema di pacchetti \"%s\" non è supportato"
 
-#: apt-pkg/init.cc:148
+#: apt-pkg/init.cc:149
 msgid "Unable to determine a suitable packaging system type"
 msgstr "Impossibile determinare un tipo di sistema appropriato di pacchetti"
 
@@ -2944,78 +2944,98 @@ msgid "Wrote %i records with %i missing files and %i mismatched files\n"
 msgstr ""
 "Scritti %i record con %i file mancanti e %i file senza corrispondenze\n"
 
+#: apt-pkg/indexcopy.cc:530
+#, fuzzy, c-format
+msgid "Skipping nonexistent file %s"
+msgstr "Apertura file di configurazione %s"
+
+#: apt-pkg/indexcopy.cc:536
+#, c-format
+msgid "Can't find authentication record for: %s"
+msgstr ""
+
+#: apt-pkg/indexcopy.cc:542
+#, fuzzy, c-format
+msgid "Hash mismatch for: %s"
+msgstr "Somma hash non corrispondente"
+
 #: apt-pkg/deb/dpkgpm.cc:49
 #, c-format
 msgid "Installing %s"
 msgstr "Installazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:660
+#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661
 #, c-format
 msgid "Configuring %s"
 msgstr "Configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:667
+#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668
 #, c-format
 msgid "Removing %s"
 msgstr "Rimozione di %s"
 
 #: apt-pkg/deb/dpkgpm.cc:52
+#, fuzzy, c-format
+msgid "Completely removing %s"
+msgstr "Pacchetto %s rimosso completamente"
+
+#: apt-pkg/deb/dpkgpm.cc:53
 #, c-format
 msgid "Running post-installation trigger %s"
 msgstr "Esecuzione comando di post installazione %s"
 
-#: apt-pkg/deb/dpkgpm.cc:557
+#: apt-pkg/deb/dpkgpm.cc:558
 #, c-format
 msgid "Directory '%s' missing"
 msgstr "Directory \"%s\" mancante"
 
-#: apt-pkg/deb/dpkgpm.cc:653
+#: apt-pkg/deb/dpkgpm.cc:654
 #, c-format
 msgid "Preparing %s"
 msgstr "Preparazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:654
+#: apt-pkg/deb/dpkgpm.cc:655
 #, c-format
 msgid "Unpacking %s"
 msgstr "Estrazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:659
+#: apt-pkg/deb/dpkgpm.cc:660
 #, c-format
 msgid "Preparing to configure %s"
 msgstr "Preparazione alla configurazione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:661
+#: apt-pkg/deb/dpkgpm.cc:662
 #, c-format
 msgid "Installed %s"
 msgstr "Pacchetto %s installato"
 
-#: apt-pkg/deb/dpkgpm.cc:666
+#: apt-pkg/deb/dpkgpm.cc:667
 #, c-format
 msgid "Preparing for removal of %s"
 msgstr "Preparazione alla rimozione di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:668
+#: apt-pkg/deb/dpkgpm.cc:669
 #, c-format
 msgid "Removed %s"
 msgstr "Pacchetto %s rimosso"
 
-#: apt-pkg/deb/dpkgpm.cc:673
+#: apt-pkg/deb/dpkgpm.cc:674
 #, c-format
 msgid "Preparing to completely remove %s"
 msgstr "Preparazione alla rimozione completa di %s"
 
-#: apt-pkg/deb/dpkgpm.cc:674
+#: apt-pkg/deb/dpkgpm.cc:675
 #, c-format
 msgid "Completely removed %s"
 msgstr "Pacchetto %s rimosso completamente"
 
-#: apt-pkg/deb/dpkgpm.cc:878
+#: apt-pkg/deb/dpkgpm.cc:879
 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n"
 msgstr ""
 "Impossibile scrivere il registro, openpty() non riuscita (forse /dev/pts non "
 "è montato)\n"
 
-#: apt-pkg/deb/dpkgpm.cc:907
+#: apt-pkg/deb/dpkgpm.cc:908
 msgid "Running dpkg"
 msgstr "Esecuzione di dpkg"
 

po/ja.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt 0.7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2008-11-13 09:26+0900\n"
 "Last-Translator: Kenshi Muto <kmuto@debian.org>\n"
 "Language-Team: Debian Japanese List <debian-japanese@lists.debian.org>\n"
@@ -152,7 +152,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s for %s コンパイル日時: %s %s\n"
@@ -528,26 +528,26 @@ msgstr "*** %s を %s にリンクするのに失敗しました"
 msgid " DeLink limit of %sB hit.\n"
 msgstr " リンクを外す制限の %sB に到達しました。\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "アーカイブにパッケージフィールドがありませんでした"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s に override エントリがありません\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  %1$s メンテナは %3$s ではなく %2$s です\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s にソース override エントリがありません\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s にバイナリ override エントリがありません\n"
@@ -651,7 +651,7 @@ msgstr "%s を %s に名前変更できませんでした"
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "正規表現の展開エラー - %s"
@@ -798,7 +798,7 @@ msgstr "検証なしにこれらのパッケージをインストールします
 msgid "Some packages could not be authenticated"
 msgstr "いくつかのパッケージを認証できませんでした"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "問題が発生し、-y オプションが --force-yes なしで使用されました"
 
@@ -814,11 +814,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無
 msgid "Internal error, Ordering didn't finish"
 msgstr "内部エラー、調整が終わっていません"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "ダウンロードディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "ソースのリストを読むことができません。"
@@ -848,25 +848,26 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "この操作後に %sB のディスク容量が解放されます。\n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "%s の空き領域を測定できません"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "%s に充分な空きスペースがありません。"
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "Trivial Only が指定されましたが、これは簡単な操作ではありません。"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "Yes, do as I say!"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -877,28 +878,28 @@ msgstr ""
 "続行するには、'%s' というフレーズをタイプしてください。\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "中断しました。"
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "続行しますか [Y/n]? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "%s の取得に失敗しました  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "いくつかのファイルの取得に失敗しました"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -906,49 +907,49 @@ msgstr ""
 "いくつかのアーカイブが取得できません。apt-get update を実行するか --fix-"
 "missing オプションを付けて試してみてください。"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix-missing とメディア交換は現在同時にはサポートされていません"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "足りないパッケージを直すことができません。"
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "インストールを中断します。"
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "注意、%2$s の代わりに %1$s を選択します\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr ""
 "すでにインストールされておりアップグレードも設定されていないため、%s をスキッ"
 "プします。\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "パッケージ %s はインストールされていないため、削除はできません\n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "%s は以下のパッケージで提供されている仮想パッケージです:\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [インストール済み]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "インストールするパッケージを明示的に選択する必要があります。"
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -959,76 +960,87 @@ msgstr ""
 "おそらく、そのパッケージが見つからないか、もう古くなっているか、\n"
 "あるいは別のソースからのみしか利用できないという状況が考えられます\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "しかし、以下のパッケージで置き換えられています:"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "パッケージ %s にはインストール候補がありません"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "ダウンロードできないため、%s の再インストールは不可能です。\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s はすでに最新バージョンです。\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "'%2$s' のリリース '%1$s' が見つかりませんでした"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "ソースパッケージリスト %s の状態を取得できません"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "update コマンドは引数をとりません"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "list ディレクトリをロックできません"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 "一連のものを削除するようになっていないので、AutoRemover を開始できません"
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr ""
 "以下のパッケージが自動でインストールされましたが、もう必要とされていません:"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr "これらを削除するには 'apt-get autoremove' を利用してください。"
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1046,45 +1058,45 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "以下の情報がこの問題を解決するために役立つかもしれません:"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "内部エラー、AutoRemover が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "内部エラー、AllUpgrade が何かを破壊しました"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, c-format
 msgid "Couldn't find task %s"
 msgstr "タスク %s が見つかりません"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "パッケージ %s が見つかりません"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, c-format
 msgid "%s set to manually installed.\n"
 msgstr "%s は手動でインストールしたと設定されました。\n"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr ""
 "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ"
 "ません:"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
@@ -1092,7 +1104,7 @@ msgstr ""
 "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法"
 "を明示してください)。"
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1104,118 +1116,118 @@ msgstr ""
 "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n"
 "動されていないことが考えられます。"
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "壊れたパッケージ"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "以下の特別パッケージがインストールされます:"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "提案パッケージ:"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "推奨パッケージ:"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "アップグレードパッケージを検出しています ... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "失敗"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "完了"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "内部エラー、問題リゾルバが何かを破壊しました"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr ""
 "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "%s のソースパッケージが見つかりません"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "すでにダウンロードされたファイル '%s' をスキップします\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "%s に充分な空きスペースがありません"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "%sB のソースアーカイブを取得する必要があります。\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ソース %s を取得\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "いくつかのアーカイブの取得に失敗しました。"
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "展開コマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr ""
 "'dpkg-dev' パッケージがインストールされていることを確認してください。\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "ビルドコマンド '%s' が失敗しました。\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "子プロセスが失敗しました"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr ""
 "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "%s のビルド依存情報を取得できません"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s にはビルド依存情報が指定されていません。\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
@@ -1224,7 +1236,7 @@ msgstr ""
 "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと"
 "ができません"
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1233,32 +1245,32 @@ msgstr ""
 "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対"
 "する %1$s の依存関係を満たすことができません"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr ""
 "%2$s の依存関係 %1$s を満たすことができません: インストールされた %3$s パッ"
 "ケージは新しすぎます"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "%s のビルド依存関係を満たすことができませんでした。"
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "ビルド依存関係の処理に失敗しました"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "サポートされているモジュール:"
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1347,7 +1359,7 @@ msgstr ""
 "apt.conf(5) を参照してください。\n"
 "                        この APT は Super Cow Powers 化されています。\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1765,11 +1777,11 @@ msgid "File not found"
 msgstr "ファイルが見つかりません"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "状態の取得に失敗しました"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "変更時刻の設定に失敗しました"
 
@@ -1897,7 +1909,7 @@ msgstr "データソケット接続タイムアウト"
 msgid "Unable to accept connection"
 msgstr "接続を accept できません"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "ファイルのハッシュでの問題"
 
@@ -1972,8 +1984,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "'%s' が一時的に解決できません"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "'%s:%s' (%i) の解決中に問題が起こりました"
 
 #: methods/connect.cc:240
@@ -2064,47 +2076,47 @@ msgstr "http サーバのレンジサポートが壊れています"
 msgid "Unknown date format"
 msgstr "不明な日付フォーマットです"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "select に失敗しました"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "接続タイムアウト"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "出力ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "ファイルへの書き込みでエラーが発生しました"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "サーバからの読み込みに失敗しました"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 msgid "Failed to truncate file"
 msgstr "ファイルの切り詰めに失敗しました"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "不正なヘッダです"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "接続失敗"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "内部エラー"
 
@@ -2112,18 +2124,25 @@ msgstr "内部エラー"
 msgid "Can't mmap an empty file"
 msgstr "空のファイルを mmap できません"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "%lu バイトの mmap ができませんでした"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2509,7 +2528,14 @@ msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2520,6 +2546,13 @@ msgstr ""
 "ケージ %s を削除します。これは多くの場合に問題が起こる原因となります。本当に"
 "これを行いたいなら、APT::Force-LoopBreak オプションを有効にしてください。"
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2736,19 +2769,19 @@ msgstr "ソースキャッシュの保存中に IO エラーが発生しまし
 msgid "rename failed, %s (%s -> %s)."
 msgstr "名前の変更に失敗しました。%s (%s -> %s)"
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum が適合しません"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 msgid "Hash Sum mismatch"
 msgstr "ハッシュサムが適合しません"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "以下の鍵 ID に対して利用可能な公開鍵がありません:\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2757,7 +2790,7 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります (存在しないアーキテクチャのため)。"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2766,7 +2799,7 @@ msgstr ""
 "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動"
 "で修正する必要があります。"
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
@@ -2774,7 +2807,7 @@ msgstr ""
 "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: "
 "フィールドがありません。"
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "サイズが適合しません"
 
@@ -3006,14 +3039,27 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-msgid "Could not patch file"
-msgstr "ファイルにパッチできませんでした"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "途中で接続がクローズされました"
 
+#~ msgid "Could not patch file"
+#~ msgstr "ファイルにパッチできませんでした"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"
 

po/km.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: apt_po_km\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-27 17:32+0200\n"
+"POT-Creation-Date: 2009-11-27 00:15+0100\n"
 "PO-Revision-Date: 2006-10-10 09:48+0700\n"
 "Last-Translator: Khoem Sokhem <khoemsokhem@khmeros.info>\n"
 "Language-Team: Khmer <support@khmeros.info>\n"
@@ -157,7 +157,7 @@ msgstr "       %4i %s\n"
 
 #: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70
 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547
-#: cmdline/apt-get.cc:2651 cmdline/apt-sortpkgs.cc:144
+#: cmdline/apt-get.cc:2653 cmdline/apt-sortpkgs.cc:144
 #, fuzzy, c-format
 msgid "%s %s for %s compiled on %s %s\n"
 msgstr "%s %s សម្រាប់ %s %s បាន​ចងក្រងនៅលើ​%s %s\n"
@@ -532,26 +532,26 @@ msgstr "*** បាន​បរាជ័យ​ក្នុង​ការ​ត
 msgid " DeLink limit of %sB hit.\n"
 msgstr " DeLink កំណត់​នៃ​ការ​វាយ %sB ។\n"
 
-#: ftparchive/writer.cc:387
+#: ftparchive/writer.cc:388
 msgid "Archive had no package field"
 msgstr "ប័ណ្ណសារ​គ្មាន​វាល​កញ្ចប់​"
 
-#: ftparchive/writer.cc:395 ftparchive/writer.cc:610
+#: ftparchive/writer.cc:396 ftparchive/writer.cc:627
 #, c-format
 msgid "  %s has no override entry\n"
 msgstr "  %s គ្មាន​ធាតុធាតុបញ្ចូល​​បដិសេធឡើយ\n"
 
-#: ftparchive/writer.cc:440 ftparchive/writer.cc:698
+#: ftparchive/writer.cc:457 ftparchive/writer.cc:715
 #, c-format
 msgid "  %s maintainer is %s not %s\n"
 msgstr "  អ្នក​ថែទាំ %s គឺ %s មិនមែន​ %s\n"
 
-#: ftparchive/writer.cc:620
+#: ftparchive/writer.cc:637
 #, c-format
 msgid "  %s has no source override entry\n"
 msgstr "  %s គ្មាន​ធាតុ​បដិសេធ​ប្រភព\n"
 
-#: ftparchive/writer.cc:624
+#: ftparchive/writer.cc:641
 #, c-format
 msgid "  %s has no binary override entry either\n"
 msgstr "  %s គ្មាន​ធាតុប​ដិសេធគោល​ពីរ​ដែរ\n"
@@ -655,7 +655,7 @@ msgstr "បរាជ័យ​ក្នុង​ការ​ប្តូរ​ឈ
 msgid "Y"
 msgstr "Y"
 
-#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1720
+#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1718
 #, c-format
 msgid "Regex compilation error - %s"
 msgstr "Regex កំហុស​ការចងក្រង​ - %s"
@@ -800,7 +800,7 @@ msgstr "ដំឡើង​កញ្ចប់​ទាំងនេះ ​ដោ
 msgid "Some packages could not be authenticated"
 msgstr "មិនអាច​ផ្ទៀងផ្ទាត់ភាពត្រឹមត្រូវកញ្ចប់​មួយចំនួន​បានឡើយ​"
 
-#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:886
+#: cmdline/apt-get.cc:734 cmdline/apt-get.cc:890
 msgid "There are problems and -y was used without --force-yes"
 msgstr "មាន​បញ្ហា​ ហើយ -y ត្រូវ​បាន​ប្រើ​ដោយគ្មាន​​ --force​-yes"
 
@@ -816,11 +816,11 @@ msgstr "កញ្ចប់ ​ត្រូវការឲ្យ​យក​ច
 msgid "Internal error, Ordering didn't finish"
 msgstr "កំហុស​ខាងក្នុង​ ការ​រៀប​តាម​លំដាប់​មិន​បាន​បញ្ចប់ឡើយ"
 
-#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2062 cmdline/apt-get.cc:2095
+#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2060 cmdline/apt-get.cc:2093
 msgid "Unable to lock the download directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​ទាញ​យក​បាន​ឡើយ"
 
-#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2143 cmdline/apt-get.cc:2392
+#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2141 cmdline/apt-get.cc:2394
 #: apt-pkg/cachefile.cc:65
 msgid "The list of sources could not be read."
 msgstr "មិន​អាច​អាន​បញ្ជី​ប្រភព​បាន​ឡើយ​ ។"
@@ -849,25 +849,26 @@ msgstr "បន្ទាប់​ពី​ពន្លា​ %sB នៃ​កា
 msgid "After this operation, %sB disk space will be freed.\n"
 msgstr "បន្ទាប់​ពី​ពន្លា​ %sB ទំហំ​ថាសនឹង​​ទំនេរ ។ \n"
 
-#: cmdline/apt-get.cc:866 cmdline/apt-get.cc:2238
+#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2237
+#: cmdline/apt-get.cc:2240
 #, c-format
 msgid "Couldn't determine free space in %s"
 msgstr "មិន​អាច​កំណត់​ទំហំ​ទំនេរ​ក្នុង​ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:876
+#: cmdline/apt-get.cc:880
 #, c-format
 msgid "You don't have enough free space in %s."
 msgstr "អ្នក​គ្មាន​ទំហំ​​ទំនេរ​គ្រប់គ្រាន់​ក្នុង​​ %s ឡើយ ។"
 
-#: cmdline/apt-get.cc:892 cmdline/apt-get.cc:912
+#: cmdline/apt-get.cc:896 cmdline/apt-get.cc:916
 msgid "Trivial Only specified but this is not a trivial operation."
 msgstr "បានបញ្ជាក់​តែប្រតិបត្តិការដែលមិនសំខាន់ប៉ុណ្ណោះ ប៉ុន្តែ​នេះមិនមែនជាប្រតិបត្តិការមិនសំខាន់នោះទេ ។"
 
-#: cmdline/apt-get.cc:894
+#: cmdline/apt-get.cc:898
 msgid "Yes, do as I say!"
 msgstr "បាទ/ចាស ធ្វើ​ដូច​ដែល​ខ្ញុំ​និយាយ !"
 
-#: cmdline/apt-get.cc:896
+#: cmdline/apt-get.cc:900
 #, c-format
 msgid ""
 "You are about to do something potentially harmful.\n"
@@ -878,28 +879,28 @@ msgstr ""
 "ដើម្បី​បន្ត ​​វាយ​ក្នុង​ឃ្លា​ '%s'\n"
 " ?] "
 
-#: cmdline/apt-get.cc:902 cmdline/apt-get.cc:921
+#: cmdline/apt-get.cc:906 cmdline/apt-get.cc:925
 msgid "Abort."
 msgstr "បោះបង់ ។"
 
-#: cmdline/apt-get.cc:917
+#: cmdline/apt-get.cc:921
 msgid "Do you want to continue [Y/n]? "
 msgstr "តើ​អ្នក​ចង់​បន្តឬ​ [បាទ ចាស/ទេ​] ? "
 
-#: cmdline/apt-get.cc:989 cmdline/apt-get.cc:2289 apt-pkg/algorithms.cc:1389
+#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2291 apt-pkg/algorithms.cc:1389
 #, c-format
 msgid "Failed to fetch %s  %s\n"
 msgstr "បរាជ័យ​ក្នុង​ការ​ទៅ​ប្រមូល​យក​ %s  %s\n"
 
-#: cmdline/apt-get.cc:1007
+#: cmdline/apt-get.cc:1011
 msgid "Some files failed to download"
 msgstr "ឯកសារ​មួយ​ចំនួន​បាន​បរាជ័យ​ក្នុង​ការ​ទាញ​យក​"
 
-#: cmdline/apt-get.cc:1008 cmdline/apt-get.cc:2298
+#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2300
 msgid "Download complete and in download only mode"
 msgstr "បានបញ្ចប់ការទាញ​យក​ ហើយ​តែ​ក្នុង​របៀប​​ទាញ​យក​ប៉ុណ្ណោះ"
 
-#: cmdline/apt-get.cc:1014
+#: cmdline/apt-get.cc:1018
 msgid ""
 "Unable to fetch some archives, maybe run apt-get update or try with --fix-"
 "missing?"
@@ -907,47 +908,47 @@ msgstr ""
 "អនុញ្ញាត​ឲ្យ​ទៅ​ប្រមូល​យក​ប័ណ្ណសារ​មួយ​ចំនួន​ ប្រហែល​ជា​រត់​ភាព​ទាន់​សម័យ apt-get ឬ ព្យាយាមប្រើ​ជាមួយ --"
 "fix- ដែលបាត់ឬ់ ?"
 
-#: cmdline/apt-get.cc:1018
+#: cmdline/apt-get.cc:1022
 msgid "--fix-missing and media swapping is not currently supported"
 msgstr "--fix- ដែលបាត់​ និង ​ស្វប​មេឌៀ​ដែល​មិនបាន​​គាំទ្រនៅពេល​បច្ចុប្បន្ន​"
 
-#: cmdline/apt-get.cc:1023
+#: cmdline/apt-get.cc:1027
 msgid "Unable to correct missing packages."
 msgstr "មិន​អាច​កែ​កញ្ចប់​ដែលបាត់បង់​បានឡើយ ។"
 
-#: cmdline/apt-get.cc:1024
+#: cmdline/apt-get.cc:1028
 msgid "Aborting install."
 msgstr "កំពុង​បោះបង់​ការ​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:1082
+#: cmdline/apt-get.cc:1086
 #, c-format
 msgid "Note, selecting %s instead of %s\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s ជំនួស​ %s\n"
 
-#: cmdline/apt-get.cc:1093
+#: cmdline/apt-get.cc:1097
 #, c-format
 msgid "Skipping %s, it is already installed and upgrade is not set.\n"
 msgstr "កំពុង​រំលង​ %s វា​បាន​ដំឡើង​រួចរាល់​ ហើយ​ភាព​ធ្វើឲ្យ​ប្រសើរ​​មិន​ទាន់​កំណត់​​ ។\n"
 
-#: cmdline/apt-get.cc:1111
+#: cmdline/apt-get.cc:1115
 #, c-format
 msgid "Package %s is not installed, so not removed\n"
 msgstr "មិនទាន់បានដំឡើង​កញ្ចប់​ %s ទេ​ ដូច្នេះ មិន​បាន​យកចេញឡើយ \n"
 
-#: cmdline/apt-get.cc:1122
+#: cmdline/apt-get.cc:1126
 #, c-format
 msgid "Package %s is a virtual package provided by:\n"
 msgstr "កញ្ចប់​ %s ជា​កញ្ចប់​និម្មិត​ដែល​បាន​ផ្តល់​ដោយ​ ៖\n"
 
-#: cmdline/apt-get.cc:1134
+#: cmdline/apt-get.cc:1138
 msgid " [Installed]"
 msgstr " [បានដំឡើង​]"
 
-#: cmdline/apt-get.cc:1139
+#: cmdline/apt-get.cc:1143
 msgid "You should explicitly select one to install."
 msgstr "អ្នក​គួរតែ​ជ្រើស​យក​មួយ​​ឲ្យ​ច្បាស់​ដើម្បី​ដំឡើង​ ។"
 
-#: cmdline/apt-get.cc:1144
+#: cmdline/apt-get.cc:1148
 #, c-format
 msgid ""
 "Package %s is not available, but is referred to by another package.\n"
@@ -958,74 +959,85 @@ msgstr ""
 "វា​មានន័យ​ថា​បាត់កញ្ចប់ ​គេ​លែង​ប្រើ ឬ\n"
 "អាច​រក​បាន​ពី​ប្រភព​ផ្សេង​ទៀត\n"
 
-#: cmdline/apt-get.cc:1163
+#: cmdline/apt-get.cc:1167
 msgid "However the following packages replace it:"
 msgstr "ទោះ​យ៉ាងណា​ក៏ដោយ កញ្ចប់​ខាងក្រោម​ជំនួស​វា ៖"
 
-#: cmdline/apt-get.cc:1166
+#: cmdline/apt-get.cc:1170
 #, c-format
 msgid "Package %s has no installation candidate"
 msgstr "កញ្ចប់​ %s មិនមាន​ការដំឡើងសាកល្បងឡើយ"
 
-#: cmdline/apt-get.cc:1186
+#: cmdline/apt-get.cc:1190
 #, c-format
 msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n"
 msgstr "មិនអាចធ្វើការដំឡើង %s ឡើងវិញបានទេ វា​មិនអាចត្រូវបាន​ទាញយកបានឡើយ ។\n"
 
-#: cmdline/apt-get.cc:1194
+#: cmdline/apt-get.cc:1198
 #, c-format
 msgid "%s is already the newest version.\n"
 msgstr "%s ជាកំណែ​ដែលថ្មីបំផុតរួចទៅហើយ ។\n"
 
-#: cmdline/apt-get.cc:1223
+#: cmdline/apt-get.cc:1227
 #, c-format
 msgid "Release '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​ការ​ចេញ​ផ្សាយ​ '%s' សម្រាប់​ '%s' ឡើយ"
 
-#: cmdline/apt-get.cc:1225
+#: cmdline/apt-get.cc:1229
 #, c-format
 msgid "Version '%s' for '%s' was not found"
 msgstr "រក​មិន​ឃើញ​កំណែ​ '%s' សម្រាប់ '%s'"
 
-#: cmdline/apt-get.cc:1231
+#: cmdline/apt-get.cc:1235
 #, c-format
 msgid "Selected version %s (%s) for %s\n"
 msgstr "បានជ្រើស​កំណែ​ %s (%s) សម្រាប់ %s\n"
 
-#: cmdline/apt-get.cc:1348
+#. if (VerTag.empty() == false && Last == 0)
+#: cmdline/apt-get.cc:1305 cmdline/apt-get.cc:1367
+#, c-format
+msgid "Ignore unavailable version '%s' of package '%s'"
+msgstr ""
+
+#: cmdline/apt-get.cc:1307
 #, c-format
-msgid "No source package '%s' picking '%s' instead\n"
+msgid "Ignore unavailable target release '%s' of package '%s'"
 msgstr ""
 
-#: cmdline/apt-get.cc:1385
+#: cmdline/apt-get.cc:1332
+#, fuzzy, c-format
+msgid "Picking '%s' as source package instead of '%s'\n"
+msgstr "មិនអាចថ្លែង បញ្ជី​កញ្ចប់​ប្រភពចប់​ បានឡើយ %s"
+
+#: cmdline/apt-get.cc:1383
 msgid "The update command takes no arguments"
 msgstr "ពាក្យ​បញ្ជា​ដែលធ្វើ​ឲ្យ​ទាន់​សម័យ​គ្មាន​អាគុយម៉ង់​ទេ"
 
-#: cmdline/apt-get.cc:1398
+#: cmdline/apt-get.cc:1396
 msgid "Unable to lock the list directory"
 msgstr "មិន​អាច​ចាក់​សោ​ថត​បញ្ជីបានឡើយ"
 
-#: cmdline/apt-get.cc:1454
+#: cmdline/apt-get.cc:1452
 msgid "We are not supposed to delete stuff, can't start AutoRemover"
 msgstr ""
 
-#: cmdline/apt-get.cc:1503
+#: cmdline/apt-get.cc:1501
 #, fuzzy
 msgid ""
 "The following packages were automatically installed and are no longer "
 "required:"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1505
+#: cmdline/apt-get.cc:1503
 #, fuzzy, c-format
 msgid "%lu packages were automatically installed and are no longer required.\n"
 msgstr "កញ្ចប់​ថ្មី​ខាងក្រោម​នឹង​ត្រូវ​បាន​ដំឡើង​ ៖"
 
-#: cmdline/apt-get.cc:1506
+#: cmdline/apt-get.cc:1504
 msgid "Use 'apt-get autoremove' to remove them."
 msgstr ""
 
-#: cmdline/apt-get.cc:1511
+#: cmdline/apt-get.cc:1509
 msgid ""
 "Hmm, seems like the AutoRemover destroyed something which really\n"
 "shouldn't happen. Please file a bug report against apt."
@@ -1041,51 +1053,51 @@ msgstr ""
 #. "that package should be filed.") << endl;
 #. }
 #.
-#: cmdline/apt-get.cc:1514 cmdline/apt-get.cc:1804
+#: cmdline/apt-get.cc:1512 cmdline/apt-get.cc:1802
 msgid "The following information may help to resolve the situation:"
 msgstr "ព័ត៌មាន​ដូចតទៅនេះ អាចជួយ​ដោះស្រាយ​ស្ថានភាព​បាន ៖"
 
-#: cmdline/apt-get.cc:1518
+#: cmdline/apt-get.cc:1516
 #, fuzzy
 msgid "Internal Error, AutoRemover broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:1537
+#: cmdline/apt-get.cc:1535
 msgid "Internal error, AllUpgrade broke stuff"
 msgstr "កំហុស​ខាងក្នុង ការធ្វើឲ្យប្រសើរ​ទាំងអស់បានធ្វើឲ្យ​ឧបករណ៍​ខូច"
 
-#: cmdline/apt-get.cc:1592
+#: cmdline/apt-get.cc:1590
 #, fuzzy, c-format
 msgid "Couldn't find task %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:1707 cmdline/apt-get.cc:1743
+#: cmdline/apt-get.cc:1705 cmdline/apt-get.cc:1741
 #, c-format
 msgid "Couldn't find package %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ %s បានទេ"
 
-#: cmdline/apt-get.cc:1730
+#: cmdline/apt-get.cc:1728
 #, c-format
 msgid "Note, selecting %s for regex '%s'\n"
 msgstr "ចំណាំ កំពុង​ជ្រើស​ %s សម្រាប់ regex '%s'\n"
 
-#: cmdline/apt-get.cc:1761
+#: cmdline/apt-get.cc:1759
 #, fuzzy, c-format
 msgid "%s set to manually installed.\n"
 msgstr "ប៉ុន្តែ​ %s នឹង​ត្រូវ​បាន​ដំឡើ​ង"
 
-#: cmdline/apt-get.cc:1774
+#: cmdline/apt-get.cc:1772
 msgid "You might want to run `apt-get -f install' to correct these:"
 msgstr "អ្នក​ប្រហែល​ជា​ចង់​រត់ `apt-get -f install' ដើម្បី​កែ​ពួក​វា​ទាំង​នេះ ៖"
 
-#: cmdline/apt-get.cc:1777
+#: cmdline/apt-get.cc:1775
 msgid ""
 "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a "
 "solution)."
 msgstr ""
 "ភាពអស្រ័យ​ដែល​ខុស​គ្នា ។ ព្យាយាម​ 'apt-get -f install' ដោយ​គ្មាន​កញ្ចប់ (ឬ បញ្ជាក់​ដំណោះស្រាយ) ។"
 
-#: cmdline/apt-get.cc:1789
+#: cmdline/apt-get.cc:1787
 msgid ""
 "Some packages could not be installed. This may mean that you have\n"
 "requested an impossible situation or if you are using the unstable\n"
@@ -1097,122 +1109,122 @@ msgstr ""
 "ដែលបាន​ទាមទារនឹងមិនទាន់បានបង្កើត​ឡើយ​\n"
 " ឬ ​បានយក​ចេញ​ពីការមកដល់ ។"
 
-#: cmdline/apt-get.cc:1807
+#: cmdline/apt-get.cc:1805
 msgid "Broken packages"
 msgstr "កញ្ចប់​ដែល​បាន​ខូច​"
 
-#: cmdline/apt-get.cc:1836
+#: cmdline/apt-get.cc:1834
 msgid "The following extra packages will be installed:"
 msgstr "កញ្ចប់​បន្ថែម​ដូចតទៅនេះ នឹងត្រូវបាន​ដំឡើង ៖"
 
-#: cmdline/apt-get.cc:1925
+#: cmdline/apt-get.cc:1923
 msgid "Suggested packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​យោបល់ ៖"
 
-#: cmdline/apt-get.cc:1926
+#: cmdline/apt-get.cc:1924
 msgid "Recommended packages:"
 msgstr "កញ្ចប់​ដែល​បាន​ផ្ដល់​អនុសាសន៍ ៖"
 
-#: cmdline/apt-get.cc:1955
+#: cmdline/apt-get.cc:1953
 msgid "Calculating upgrade... "
 msgstr "កំពុង​គណនា​ការ​ធ្វើ​ឲ្យ​ប្រសើរ... "
 
-#: cmdline/apt-get.cc:1958 methods/ftp.cc:707 methods/connect.cc:112
+#: cmdline/apt-get.cc:1956 methods/ftp.cc:707 methods/connect.cc:112
 msgid "Failed"
 msgstr "បាន​បរាជ័យ"
 
-#: cmdline/apt-get.cc:1963
+#: cmdline/apt-get.cc:1961
 msgid "Done"
 msgstr "ធ្វើរួច​"
 
-#: cmdline/apt-get.cc:2030 cmdline/apt-get.cc:2038
+#: cmdline/apt-get.cc:2028 cmdline/apt-get.cc:2036
 msgid "Internal error, problem resolver broke stuff"
 msgstr "កំហុស​ខាងក្នុង អ្នក​ដោះស្រាយ​បញ្ហា​បានធ្វើឲ្យខូច​ឧបករណ៍"
 
-#: cmdline/apt-get.cc:2138
+#: cmdline/apt-get.cc:2136
 msgid "Must specify at least one package to fetch source for"
 msgstr "យ៉ាងហោចណាស់​ត្រូវ​​បញ្ជាក់​​កញ្ចប់​មួយ ​ដើម្បី​ទៅ​​ប្រមូល​យក​ប្រភព​សម្រាប់"
 
-#: cmdline/apt-get.cc:2168 cmdline/apt-get.cc:2410
+#: cmdline/apt-get.cc:2166 cmdline/apt-get.cc:2412
 #, c-format
 msgid "Unable to find a source package for %s"
 msgstr "មិន​អាច​រក​កញ្ចប់ប្រភព​​សម្រាប់ %s បានឡើយ"
 
-#: cmdline/apt-get.cc:2217
+#: cmdline/apt-get.cc:2215
 #, c-format
 msgid "Skipping already downloaded file '%s'\n"
 msgstr "កំពុង​រំលង​ឯកសារ​ដែល​បាន​ទាញយក​រួច​ '%s'\n"
 
-#: cmdline/apt-get.cc:2248
+#: cmdline/apt-get.cc:2250
 #, c-format
 msgid "You don't have enough free space in %s"
 msgstr "អ្នក​ពុំ​មាន​ទំហំ​ទំនេរ​គ្រប់គ្រាន់​ទេ​នៅក្នុង​ %s ឡើយ"
 
-#: cmdline/apt-get.cc:2254
+#: cmdline/apt-get.cc:2256
 #, c-format
 msgid "Need to get %sB/%sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB/%sB នៃ​ប័ណ្ណសារ​ប្រភព ។\n"
 
-#: cmdline/apt-get.cc:2257
+#: cmdline/apt-get.cc:2259
 #, c-format
 msgid "Need to get %sB of source archives.\n"
 msgstr "ត្រូវការ​យក​ %sB នៃ​ប័ណ្ណសារ​ប្រភព​ ។\n"
 
-#: cmdline/apt-get.cc:2263
+#: cmdline/apt-get.cc:2265
 #, c-format
 msgid "Fetch source %s\n"
 msgstr "ទៅប្រមូល​ប្រភព​ %s\n"
 
-#: cmdline/apt-get.cc:2294
+#: cmdline/apt-get.cc:2296
 msgid "Failed to fetch some archives."
 msgstr "បរាជ័យ​ក្នុងការទៅប្រមូលយក​ប័ណ្ណសារ​មួយចំនួន ។"
 
-#: cmdline/apt-get.cc:2322
+#: cmdline/apt-get.cc:2324
 #, c-format
 msgid "Skipping unpack of already unpacked source in %s\n"
 msgstr "កំពុង​រំលង​ការស្រាយ​នៃប្រភព​ដែលបានស្រាយរួច​នៅក្នុង %s\n"
 
-#: cmdline/apt-get.cc:2334
+#: cmdline/apt-get.cc:2336
 #, c-format
 msgid "Unpack command '%s' failed.\n"
 msgstr "ពាក្យ​បញ្ជា​ស្រាយ '%s' បាន​បរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2335
+#: cmdline/apt-get.cc:2337
 #, c-format
 msgid "Check if the 'dpkg-dev' package is installed.\n"
 msgstr "ពិនិត្យ​ប្រសិន​បើកញ្ចប់ 'dpkg-dev' មិន​ទាន់​បាន​ដំឡើង​ ។\n"
 
-#: cmdline/apt-get.cc:2352
+#: cmdline/apt-get.cc:2354
 #, c-format
 msgid "Build command '%s' failed.\n"
 msgstr "សាងសង​ពាក្យ​បញ្ជា​ '%s' បានបរាជ័យ​ ។\n"
 
-#: cmdline/apt-get.cc:2371
+#: cmdline/apt-get.cc:2373
 msgid "Child process failed"
 msgstr "ដំណើរ​ការ​កូន​បាន​បរាជ័យ​"
 
-#: cmdline/apt-get.cc:2387
+#: cmdline/apt-get.cc:2389
 msgid "Must specify at least one package to check builddeps for"
 msgstr "ត្រូវតែ​បញ្ជាក់​យ៉ាងហោចណាស់​មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់"
 
-#: cmdline/apt-get.cc:2415
+#: cmdline/apt-get.cc:2417
 #, c-format
 msgid "Unable to get build-dependency information for %s"
 msgstr "មិន​អាច​សាងសង់​​ព័ត៌មាន​ភាពអស្រ័យ​សម្រាប់ %s"
 
-#: cmdline/apt-get.cc:2435
+#: cmdline/apt-get.cc:2437
 #, c-format
 msgid "%s has no build depends.\n"
 msgstr "%s មិនមានភាពអាស្រ័យ​ស្ថាបនាឡើយ​ ។\n"
 
-#: cmdline/apt-get.cc:2487
+#: cmdline/apt-get.cc:2489
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because the package %s cannot be "
 "found"
 msgstr "%s ភាពអស្រ័យ​សម្រាប់​ %s មិន​អាច​ធ្វើ​ឲ្យ​ពេញចិត្ត​ ព្រោះ​រក​​ %s កញ្ចប់​មិន​ឃើញ​ "
 
-#: cmdline/apt-get.cc:2540
+#: cmdline/apt-get.cc:2542
 #, c-format
 msgid ""
 "%s dependency for %s cannot be satisfied because no available versions of "
@@ -1221,30 +1233,30 @@ msgstr ""
 "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាច​តម្រូវចិត្តបានទេ ព្រោះ មិនមាន​កំណែ​នៃកញ្ចប់ %s ដែលអាច​តម្រូវចិត្ត​"
 "តម្រូវការ​កំណែបានឡើយ"
 
-#: cmdline/apt-get.cc:2576
+#: cmdline/apt-get.cc:2578
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក"
 
-#: cmdline/apt-get.cc:2603
+#: cmdline/apt-get.cc:2605
 #, c-format
 msgid "Failed to satisfy %s dependency for %s: %s"
 msgstr "បរាជ័យ​ក្នុងការ​តម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s"
 
-#: cmdline/apt-get.cc:2619
+#: cmdline/apt-get.cc:2621
 #, c-format
 msgid "Build-dependencies for %s could not be satisfied."
 msgstr "ភាពអាស្រ័យ​ដែល​បង្កើត​ %s មិន​អាច​បំពេញ​សេចក្ដី​ត្រូវការ​បាន​ទេ ។"
 
-#: cmdline/apt-get.cc:2624
+#: cmdline/apt-get.cc:2626
 msgid "Failed to process build dependencies"
 msgstr "បាន​បរាជ័យ​ក្នុង​ការ​ដំណើរ​​ការ​បង្កើត​ភាព​អាស្រ័យ"
 
-#: cmdline/apt-get.cc:2656
+#: cmdline/apt-get.cc:2658
 msgid "Supported modules:"
 msgstr "ម៉ូឌុល​ដែល​គាំទ្រ ៖ "
 
-#: cmdline/apt-get.cc:2697
+#: cmdline/apt-get.cc:2699
 #, fuzzy
 msgid ""
 "Usage: apt-get [options] command\n"
@@ -1327,7 +1339,7 @@ msgstr ""
 "pages for more information and options.\n"
 "                       This APT has Super Cow Powers.\n"
 
-#: cmdline/apt-get.cc:2864
+#: cmdline/apt-get.cc:2866
 msgid ""
 "NOTE: This is only a simulation!\n"
 "      apt-get needs root privileges for real execution.\n"
@@ -1741,11 +1753,11 @@ msgid "File not found"
 msgstr "រកឯកសារ​មិន​ឃើញ​"
 
 #: methods/copy.cc:43 methods/gzip.cc:141 methods/gzip.cc:150
-#: methods/rred.cc:234 methods/rred.cc:243
+#: methods/rred.cc:483 methods/rred.cc:492
 msgid "Failed to stat"
 msgstr "បរាជ័យ​ក្នុងការថ្លែង"
 
-#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:240
+#: methods/copy.cc:80 methods/gzip.cc:147 methods/rred.cc:489
 msgid "Failed to set modification time"
 msgstr "បរាជ័យក្នុងការកំណត់​ពេលវេលា​ការកែប្រែ​"
 
@@ -1872,7 +1884,7 @@ msgstr "ការតភ្ជាប់​រន្ធ​​ទិន្នន័
 msgid "Unable to accept connection"
 msgstr "មិនអាច​ទទួលយក​ការតភ្ជាប់​បានឡើយ"
 
-#: methods/ftp.cc:869 methods/http.cc:996 methods/rsh.cc:303
+#: methods/ftp.cc:869 methods/http.cc:997 methods/rsh.cc:303
 msgid "Problem hashing file"
 msgstr "បញ្ហា​ធ្វើឲ្យខូច​ឯកសារ"
 
@@ -1947,8 +1959,8 @@ msgid "Temporary failure resolving '%s'"
 msgstr "ការ​ដោះស្រាយ​ភាព​បរាជ័យ​​បណ្តោះអាសន្ន '%s'"
 
 #: methods/connect.cc:193
-#, c-format
-msgid "Something wicked happened resolving '%s:%s' (%i)"
+#, fuzzy, c-format
+msgid "Something wicked happened resolving '%s:%s' (%i - %s)"
 msgstr "ការ​ដោះស្រាយ​អ្វី​អាក្រក់ដែល​បាន​កើត​ឡើង​ '%s:%s' (%i)"
 
 #: methods/connect.cc:240
@@ -2036,48 +2048,48 @@ msgstr "ម៉ាស៊ីន​បម្រើ HTTP នេះបាន​ខូ
 msgid "Unknown date format"
 msgstr "មិនស្គាល់​ទ្រង់ទ្រាយ​កាលបរិច្ឆេទ"
 
-#: methods/http.cc:787
+#: methods/http.cc:788
 msgid "Select failed"
 msgstr "ជ្រើស​បាន​បរាជ័យ​"
 
-#: methods/http.cc:792
+#: methods/http.cc:793
 msgid "Connection timed out"
 msgstr "ការតភ្ជាប់​បាន​អស់ពេល​"
 
-#: methods/http.cc:815
+#: methods/http.cc:816
 msgid "Error writing to output file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារលទ្ធផល"
 
-#: methods/http.cc:846
+#: methods/http.cc:847
 msgid "Error writing to file"
 msgstr "កំហុស​ក្នុងការ​សរសេរទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:874
+#: methods/http.cc:875
 msgid "Error writing to the file"
 msgstr "កំហុសក្នុងការ​សរសេរ​ទៅកាន់​ឯកសារ"
 
-#: methods/http.cc:888
+#: methods/http.cc:889
 msgid "Error reading from server. Remote end closed connection"
 msgstr "កំហុស​ក្នុងការ​អាន​ពី​ម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់​ពីចម្ងាយ​បានបិទការតភ្ជាប់"
 
-#: methods/http.cc:890
+#: methods/http.cc:891
 msgid "Error reading from server"
 msgstr "កំហុស​ក្នុងការអាន​ពី​ម៉ាស៊ីន​បម្រើ"
 
-#: methods/http.cc:981 apt-pkg/contrib/mmap.cc:215
+#: methods/http.cc:982 apt-pkg/contrib/mmap.cc:233
 #, fuzzy
 msgid "Failed to truncate file"
 msgstr "បរាជ័យ​ក្នុងការ​សរសេរ​ឯកសារ %s"
 
-#: methods/http.cc:1146
+#: methods/http.cc:1147
 msgid "Bad header data"
 msgstr "ទិន្នន័យ​បឋមកថា​ខូច"
 
-#: methods/http.cc:1163 methods/http.cc:1218
+#: methods/http.cc:1164 methods/http.cc:1219
 msgid "Connection failed"
 msgstr "ការតភ្ជាប់​បាន​បរាជ័យ​"
 
-#: methods/http.cc:1310
+#: methods/http.cc:1311
 msgid "Internal error"
 msgstr "កំហុស​ខាង​ក្នុង​"
 
@@ -2085,18 +2097,25 @@ msgstr "កំហុស​ខាង​ក្នុង​"
 msgid "Can't mmap an empty file"
 msgstr "មិនអាច mmap ឯកសារទទេ​បានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:187
+#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202
 #, c-format
 msgid "Couldn't make mmap of %lu bytes"
 msgstr "មិន​អាច​បង្កើត​ mmap នៃ​ %lu បៃបានឡើយ"
 
-#: apt-pkg/contrib/mmap.cc:234
+#: apt-pkg/contrib/mmap.cc:252
 #, c-format
 msgid ""
 "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. "
 "Current value: %lu. (man 5 apt.conf)"
 msgstr ""
 
+#: apt-pkg/contrib/mmap.cc:347
+#, c-format
+msgid ""
+"The size of a MMap has already reached the defined limit of %lu bytes,abort "
+"the try to grow the MMap."
+msgstr ""
+
 #. d means days, h means hours, min means minutes, s means seconds
 #: apt-pkg/contrib/strutl.cc:346
 #, c-format
@@ -2483,7 +2502,14 @@ msgstr "ប្រភេទ​ '%s' មិន​ស្គាល់នៅលើប
 msgid "Malformed line %u in source list %s (vendor id)"
 msgstr "បន្ទាត់​ Malformed  %u ក្នុង​បញ្ជី​ប្រភព​ %s (លេខសម្គាល់​ក្រុមហ៊ុន​លក់)"
 
-#: apt-pkg/packagemanager.cc:436
+#: apt-pkg/packagemanager.cc:321 apt-pkg/packagemanager.cc:576
+#, c-format
+msgid ""
+"Could not perform immediate configuration on '%s'.Please see man 5 apt.conf "
+"under APT::Immediate-Configure for details. (%d)"
+msgstr ""
+
+#: apt-pkg/packagemanager.cc:437
 #, c-format
 msgid ""
 "This installation run will require temporarily removing the essential "
@@ -2494,6 +2520,13 @@ msgstr ""
 "ភាពអាស្រ័យជាមុន ។ ជាញឹកញាប់គឺ មិនត្រឹមត្រូវ ប៉ុន្តែ ប្រសិនបើអ្នក​ពិតជាចង់ធ្វើវា ធ្វើឲ្យជម្រើស APT::"
 "Force-LoopBreak សកម្ម ។"
 
+#: apt-pkg/packagemanager.cc:475
+#, c-format
+msgid ""
+"Could not perform immediate configuration on already unpacked '%s'.Please "
+"see man 5 apt.conf under APT::Immediate-Configure for details."
+msgstr ""
+
 #: apt-pkg/pkgrecords.cc:32
 #, c-format
 msgid "Index file type '%s' is not supported"
@@ -2700,20 +2733,20 @@ msgstr "IO កំហុសក្នុងការររក្សាទុក​
 msgid "rename failed, %s (%s -> %s)."
 msgstr "ប្តូរ​ឈ្មោះ​បានបរាជ័យ​, %s (%s -> %s) ។"
 
-#: apt-pkg/acquire-item.cc:395
+#: apt-pkg/acquire-item.cc:396
 msgid "MD5Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411
+#: apt-pkg/acquire-item.cc:657 apt-pkg/acquire-item.cc:1419
 #, fuzzy
 msgid "Hash Sum mismatch"
 msgstr "MD5Sum មិន​ផ្គួផ្គង​"
 
-#: apt-pkg/acquire-item.cc:1106
+#: apt-pkg/acquire-item.cc:1114
 msgid "There is no public key available for the following key IDs:\n"
 msgstr "គ្មាន​កូនសោ​សាធារណៈ​អាច​រក​បាន​ក្នុងកូនសោ IDs ខាងក្រោម​នេះទេ ៖\n"
 
-#: apt-pkg/acquire-item.cc:1216
+#: apt-pkg/acquire-item.cc:1224
 #, c-format
 msgid ""
 "I wasn't able to locate a file for the %s package. This might mean you need "
@@ -2722,7 +2755,7 @@ msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បាន​ទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។ "
 "(ដោយសារ​​បាត់​ស្ថាបត្យកម្ម)"
 
-#: apt-pkg/acquire-item.cc:1275
+#: apt-pkg/acquire-item.cc:1283
 #, c-format
 msgid ""
 "I wasn't able to locate file for the %s package. This might mean you need to "
@@ -2730,13 +2763,13 @@ msgid ""
 msgstr ""
 "ខ្ញុំ​មិន​អាច​រកទីតាំង​ឯកសារ​សម្រាប់​កញ្ចប់ %s បានទេ ។ ​មាន​ន័យ​ថា​អ្នក​ត្រូវការ​ជួសជុល​កញ្ចប់​នេះ​ដោយ​ដៃ ។"
 
-#: apt-pkg/acquire-item.cc:1316
+#: apt-pkg/acquire-item.cc:1324
 #, c-format
 msgid ""
 "The package index files are corrupted. No Filename: field for package %s."
 msgstr "កញ្ចប់​ឯកសារ​លិបិក្រម​ត្រូវ​បាន​ខូច ។ គ្មាន​ឈ្មោះ​ឯកសារ ៖ វាល​សម្រាប់​កញ្ចប់នេះ​ទេ​ %s ។"
 
-#: apt-pkg/acquire-item.cc:1403
+#: apt-pkg/acquire-item.cc:1411
 msgid "Size mismatch"
 msgstr "ទំហំ​មិនបាន​ផ្គួផ្គង​"
 
@@ -2963,15 +2996,28 @@ msgstr ""
 msgid "Not locked"
 msgstr ""
 
-#: methods/rred.cc:219
-#, fuzzy
-msgid "Could not patch file"
-msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+#: methods/rred.cc:465
+#, c-format
+msgid ""
+"Could not patch %s with mmap and with file operation usage - the patch seems "
+"to be corrupt."
+msgstr ""
+
+#: methods/rred.cc:470
+#, c-format
+msgid ""
+"Could not patch %s with mmap (but no mmap specific fail) - the patch seems "
+"to be corrupt."
+msgstr ""
 
 #: methods/rsh.cc:330
 msgid "Connection closed prematurely"
 msgstr "បាន​បិទ​ការ​តភ្ជាប់​មុន​ពេល"
 
+#, fuzzy
+#~ msgid "Could not patch file"
+#~ msgstr "មិន​អាច​បើក​ឯកសារ​ %s បានឡើយ"
+
 #~ msgid "%4i %s\n"
 #~ msgstr "%4i %s\n"