diff options
109 files changed, 22562 insertions, 12476 deletions
diff --git a/.bzrignore b/.bzrignore index ac276b3fb..7c4b11b10 100644 --- a/.bzrignore +++ b/.bzrignore @@ -11,14 +11,17 @@ configure buildlib/config.sub buildlib/config.guess +# abichecker related files/dir +abicheck/apt_build.xml +abicheck/apt_installed.xml +abicheck/compat_reports/ +abicheck/descriptors_storage/ +abicheck/header_compile_errors/ +abicheck/test_results/ +abicheck/tests/ + # generated files in the progress to build all # apt man pages and other documentation -doc/*.1 -doc/*.5 -doc/*.8 -doc/*/*.1 -doc/*/*.5 -doc/*/*.8 -doc/*/apt.ent -doc/*/*.xml -doc/*/*.sgml +./doc/*/ +!./doc/examples/ +!./doc/po/ @@ -1,4 +1,32 @@ -The project hierachy stands at: +The project contributors: + +Michael Vogt <mvo@debian.org> +- Development, bug fixes + +David Kalnischkies <kalnischkies+debian@gmail.com> +- Development, bug fixes + +Christian Perrier <bubulle@debian.org> +- Translations hero/coordinator + + +Past Contributors: + +Robert Collins <robert.collins@canonical.com> +- Change the package index Info methods to allow apt-cache policy to be useful + when using several different archives on the same host. + +Julian Andres Klode +- Development, bug fixes + +Eugene V. Lyubimkin +- Development, bug fixes + +Otavio Salvador +- Development, bug fixes + +Luca Bruno +- Development, bug fixes CVS:jgg Jason Gunthorpe <jgg@debian.org> - The Mad Cow incarnate @@ -9,11 +37,6 @@ CVS:mdz Matt Zimmerman <mdz@debian.org> CVS:piefel Michael Piefel <piefel@debian.org> - i18n and l10n -Michael Vogt <mvo@debian.org> -- Development and bug fixes - -Past Contributors: - CVS:che Ben Gertzfield <che@debian.org> - Packaging and Releases diff --git a/abicheck/abi-compliance-checker.pl b/abicheck/abi-compliance-checker.pl new file mode 100644 index 000000000..7fd8ab173 --- /dev/null +++ b/abicheck/abi-compliance-checker.pl @@ -0,0 +1,7325 @@ +#!/usr/bin/perl +########################################################################### +# ABI-compliance-checker v1.13, lightweight tool for statically checking +# backward binary compatibility of shared C/C++ libraries in Linux. +# Copyright (C) The Linux Foundation +# Copyright (C) Institute for System Programming, RAS +# Author: Andrey Ponomarenko +# +# This program is free software: you can 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 of the License, or +# (at your option) any later version. +# +# This program 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 this program. If not, see <http://www.gnu.org/licenses/>. +########################################################################### +use Getopt::Long; +Getopt::Long::Configure ("posix_default", "no_ignore_case"); +use Data::Dumper; + +my $ABI_COMPLIANCE_CHECKER_VERSION = "1.13"; +my ($Help, $ShowVersion, %Descriptor, $TargetLibraryName, $HeaderCheckingMode_Separately, $GenerateDescriptor, $TestSystem, $DumpInfo_DescriptorPath, $CheckHeadersOnly, $InterfacesListPath, $AppPath, $ShowExpendTime); + +my $CmdName = get_FileName($0); +GetOptions("h|help!" => \$Help, + "v|version!" => \$ShowVersion, +#general options + "l|library=s" => \$TargetLibraryName, + "d1|descriptor1=s" => \$Descriptor{1}{"Path"}, + "d2|descriptor2=s" => \$Descriptor{2}{"Path"}, +#extra options + "app|application=s" => \$AppPath, + "symbols_list|int_list=s" => \$InterfacesListPath, + "dump_abi|dump_info=s" => \$DumpInfo_DescriptorPath, + "headers_only!" => \$CheckHeadersOnly, +#other options + "d|descriptor_template!" => \$GenerateDescriptor, + "separately!" => \$HeaderCheckingMode_Separately, + "test!" => \$TestSystem, + "time!" => \$ShowExpendTime +) or exit(1); + +sub HELP_MESSAGE() +{ + print STDERR <<"EOM" + +NAME: + $CmdName - check ABI compatibility of shared C/C++ library versions + +DESCRIPTION: + Lightweight tool for statically checking backward binary compatibility of shared C/C++ libraries + in Linux. It checks header files along with shared objects in two library versions and searches + for ABI changes that may lead to incompatibility. Breakage of the binary compatibility may result + in crashing or incorrect behavior of applications built with an old version of a library when + it is running with a new one. + + ABI Compliance Checker was intended for library developers that are interested in ensuring + backward binary compatibility. Also it can be used for checking forward binary compatibility + and checking applications portability to the new library version. + + This tool is free software: you can redistribute it and/or modify it under the terms of the GNU GPL. + +USAGE: + $CmdName [options] + +EXAMPLE OF USE: + $CmdName -l <library_name> -d1 <1st_version_descriptor> -d2 <2nd_version_descriptor> + +GENERAL OPTIONS: + -h|-help + Print this help. + + -v|-version + Print version. + + -l|-library <name> + Library name (without version). + It affects only on the path and the title of the report. + + -d1|-descriptor1 <path> + Path to descriptor of 1st library version. + + -d2|-descriptor2 <path> + Path to descriptor of 2nd library version. + +EXTRA OPTIONS: + -app|-application <path> + This option allow to specify the application that should be tested for portability + to the new library version. + + -dump_abi|-dump_info <descriptor_path> + Dump library ABI information using specified descriptor. + This command will create '<library>_<ver1>.abi.tar.gz' file in the directory 'abi_dumps/<library>/'. + You can transfer it anywhere and pass instead of library descriptor. + + -headers_only + Check header files without shared objects. It is easy to run, but may provide + a low quality ABI compliance report with false positives and without + detecting of added/withdrawn interfaces. + + -symbols_list|-int_list <path> + This option allow to specify a file with a list of interfaces (mangled names in C++) + that should be checked, other library interfaces will not be checked. + +OTHER OPTIONS: + -d|-descriptor_template + Create library descriptor template 'library-descriptor.xml' in the current directory. + + -separately + Check headers individually. This mode requires more time for checking ABI compliance, + but possible compiler errors in one header can't affect others. + + -test + Run internal tests (create two binary-incompatible versions of an artificial library + and run ABI-Compliance-Checker on it). + +DESCRIPTOR EXAMPLE: + <version> + 1.28.0 + </version> + + <headers> + /usr/local/atk/atk-1.28.0/include/ + </headers> + + <libs> + /usr/local/atk/atk-1.28.0/lib/libatk-1.0.so + </libs> + + <include_paths> + /usr/include/glib-2.0/ + /usr/lib/glib-2.0/include/ + </include_paths> + + +Report bugs to <abi-compliance-checker\@linuxtesting.org> +For more information, please see: http://ispras.linux-foundation.org/index.php/ABI_compliance_checker +EOM + ; +} + +my $Descriptor_Template = "<?xml version=\"1.0\" encoding=\"UTF-8\"?> +<descriptor> + +<!-- Template for the library version descriptor --> + +<!-- + Necessary sections + --> + +<version> + <!-- Version of the library --> +</version> + +<headers> + <!-- The list of paths to header files and/or + directories with header files, one per line --> +</headers> + +<libs> + <!-- The list of paths to shared objects and/or + directories with shared objects, one per line --> +</libs> + +<!-- + Additional sections + --> + +<include_paths> + <!-- The list of paths to be searched for header files + needed for compiling of library headers, one per line --> +</include_paths> + +<gcc_options> + <!-- Additional gcc options, one per line --> +</gcc_options> + +<opaque_types> + <!-- The list of opaque types, one per line --> +</opaque_types> + +<skip_interfaces> + <!-- The list of functions (mangled/symbol names in C++) + that should be skipped while testing, one per line --> +</skip_interfaces> + +<include_preamble> + <!-- The list of header files that should be included before other headers, one per line. + For example, it is a tree.h for libxml2 and ft2build.h for freetype2 --> +</include_preamble> + +</descriptor>"; + +my %Operator_Indication = ( +"not" => "~", +"assign" => "=", +"andassign" => "&=", +"orassign" => "|=", +"xorassign" => "^=", +"or" => "|", +"xor" => "^", +"addr" => "&", +"and" => "&", +"lnot" => "!", +"eq" => "==", +"ne" => "!=", +"lt" => "<", +"lshift" => "<<", +"lshiftassign" => "<<=", +"rshiftassign" => ">>=", +"call" => "()", +"mod" => "%", +"modassign" => "%=", +"subs" => "[]", +"land" => "&&", +"lor" => "||", +"rshift" => ">>", +"ref" => "->", +"le" => "<=", +"deref" => "*", +"mult" => "*", +"preinc" => "++", +"delete" => " delete", +"vecnew" => " new[]", +"vecdelete" => " delete[]", +"predec" => "--", +"postinc" => "++", +"postdec" => "--", +"plusassign" => "+=", +"plus" => "+", +"minus" => "-", +"minusassign" => "-=", +"gt" => ">", +"ge" => ">=", +"new" => " new", +"multassign" => "*=", +"divassign" => "/=", +"div" => "/", +"neg" => "-", +"pos" => "+", +"memref" => "->*", +"compound" => "," +); + +sub num_to_str($) +{ + my $Number = $_[0]; + if(int($Number)>3) + { + return $Number."th"; + } + elsif(int($Number)==1) + { + return "1st"; + } + elsif(int($Number)==2) + { + return "2nd"; + } + elsif(int($Number)==3) + { + return "3rd"; + } + else + { + return ""; + } +} + +#Global variables +my $REPORT_PATH; +my %ERR_PATH; +my $POINTER_SIZE; +my $MAX_COMMAND_LINE_ARGUMENTS = 4096; +my %Cache; +my %FuncAttr; +my %LibInfo; +my %HeaderCompileError; +my $StartTime; +my %CompilerOptions; +my %AddedInt; +my %WithdrawnInt; +my @RecurLib; +my %CheckedSoLib; + +#Constants checking +my %ConstantsSrc; +my %Constants; + +#Types +my %TypeDescr; +my %TemplateInstance_Func; +my %TemplateInstance; +my %OpaqueTypes; +my %Tid_TDid; +my %CheckedTypes; +my %Typedef_BaseName; +my %StdCxxTypedef; +my %TName_Tid; +my %EnumMembName_Id; + +#Interfaces +my %FuncDescr; +my %ClassFunc; +my %ClassVirtFunc; +my %ClassIdVirtFunc; +my %ClassId; +my %tr_name; +my %mangled_name; +my %InternalInterfaces; +my %InterfacesList; +my %InterfacesList_App; +my %CheckedInterfaces; +my %DepInterfaces; + +#Headers +my %Include_Preamble; +my %Headers; +my %HeaderName_Destinations; +my %Header_Dependency; + +#Shared objects +my %SoLib_DefaultPath; + +#Merging +my %CompleteSignature; +my @RecurTypes; +my %Interface_Library; +my %Library_Interface; +my %Language; +my %SoNames_All; +my $Version; + +#Symbols versioning +my %SymVer; + +#Problem descriptions +my %CompatProblems; +my %ConstantProblems; + +#Rerorts +my $ContentID = 1; +my $ContentSpanStart = "<span class=\"section\" onclick=\"javascript:showContent(this, 'CONTENT_ID')\">\n"; +my $ContentSpanEnd = "</span>\n"; +my $ContentDivStart = "<div id=\"CONTENT_ID\" style=\"display:none;\">\n"; +my $ContentDivEnd = "</div>\n"; +my $Content_Counter = 0; + +sub readDescriptor($) +{ + my $LibVersion = $_[0]; + if(not -e $Descriptor{$LibVersion}{"Path"}) + { + return; + } + my $Descriptor_File = readFile($Descriptor{$LibVersion}{"Path"}); + $Descriptor_File =~ s/\/\*(.|\n)+?\*\///g; + $Descriptor_File =~ s/<\!--(.|\n)+?-->//g; + if(not $Descriptor_File) + { + print "ERROR: descriptor d$LibVersion is empty\n"; + exit(1); + } + $Descriptor{$LibVersion}{"Version"} = parseTag(\$Descriptor_File, "version"); + if(not $Descriptor{$LibVersion}{"Version"}) + { + print "ERROR: version in the descriptor d$LibVersion was not specified (section <version>)\n\n"; + exit(1); + } + $Descriptor{$LibVersion}{"Headers"} = parseTag(\$Descriptor_File, "headers"); + if(not $Descriptor{$LibVersion}{"Headers"}) + { + print "ERROR: header files in the descriptor d$LibVersion were not specified (section <headers>)\n"; + exit(1); + } + if(not $CheckHeadersOnly) + { + $Descriptor{$LibVersion}{"Libs"} = parseTag(\$Descriptor_File, "libs"); + if(not $Descriptor{$LibVersion}{"Libs"}) + { + print "ERROR: shared objects in the descriptor d$LibVersion were not specified (section <libs>)\n"; + exit(1); + } + } + $Descriptor{$LibVersion}{"Include_Paths"} = parseTag(\$Descriptor_File, "include_paths"); + $Descriptor{$LibVersion}{"Gcc_Options"} = parseTag(\$Descriptor_File, "gcc_options"); + foreach my $Option (split("\n", $Descriptor{$LibVersion}{"Gcc_Options"})) + { + $Option =~ s/\A\s+|\s+\Z//g; + next if(not $Option); + $CompilerOptions{$LibVersion} .= " ".$Option; + } + $Descriptor{$LibVersion}{"Opaque_Types"} = parseTag(\$Descriptor_File, "opaque_types"); + foreach my $Type_Name (split("\n", $Descriptor{$LibVersion}{"Opaque_Types"})) + { + $Type_Name =~ s/\A\s+|\s+\Z//g; + next if(not $Type_Name); + $OpaqueTypes{$LibVersion}{$Type_Name} = 1; + } + $Descriptor{$LibVersion}{"Skip_interfaces"} = parseTag(\$Descriptor_File, "skip_interfaces"); + foreach my $Interface_Name (split("\n", $Descriptor{$LibVersion}{"Skip_interfaces"})) + { + $Interface_Name =~ s/\A\s+|\s+\Z//g; + next if(not $Interface_Name); + $InternalInterfaces{$LibVersion}{$Interface_Name} = 1; + } + $Descriptor{$LibVersion}{"Include_Preamble"} = parseTag(\$Descriptor_File, "include_preamble"); + my $Position = 0; + foreach my $Header_Name (split("\n", $Descriptor{$LibVersion}{"Include_Preamble"})) + { + $Header_Name =~ s/\A\s+|\s+\Z//g; + next if(not $Header_Name); + $Include_Preamble{$LibVersion}{$Header_Name}{"Position"} = $Position; + $Position+=1; + } + my $Descriptors_Dir = "descriptors_storage/$TargetLibraryName"; + system("mkdir", "-p", $Descriptors_Dir); + my $Descriptor_Name = $TargetLibraryName."_".$Descriptor{$LibVersion}{"Version"}.".desc"; + if($Descriptor{$LibVersion}{"Path"} ne $Descriptors_Dir."/".$Descriptor_Name) + { + system("cp", "-f", $Descriptor{$LibVersion}{"Path"}, $Descriptors_Dir."/".$Descriptor_Name); + } + $ERR_PATH{$LibVersion} = "header_compile_errors/$TargetLibraryName/".$Descriptor{$LibVersion}{"Version"}; +} + +sub parseTag($$) +{ + my ($CodeRef, $Tag) = @_; + return "" if(not $CodeRef or not ${$CodeRef} or not $Tag); + if(${$CodeRef} =~ s/\<$Tag\>((.|\n)+?)\<\/$Tag\>//) + { + my $Content = $1; + $Content=~s/(\A\s+|\s+\Z)//g; + return $Content; + } + else + { + return ""; + } +} + +my %check_node=( +"array_type"=>1, +"binfo"=>1, +"boolean_type"=>1, +"complex_type"=>1, +"const_decl"=>1, +"enumeral_type"=>1, +"field_decl"=>1, +"function_decl"=>1, +"function_type"=>1, +"identifier_node"=>1, +"integer_cst"=>1, +"integer_type"=>1, +"method_type"=>1, +"namespace_decl"=>1, +"parm_decl"=>1, +"pointer_type"=>1, +"real_cst"=>1, +"real_type"=>1, +"record_type"=>1, +"reference_type"=>1, +"string_cst"=>1, +"template_decl"=>1, +"template_type_parm"=>1, +"tree_list"=>1, +"tree_vec"=>1, +"type_decl"=>1, +"union_type"=>1, +"var_decl"=>1, +"void_type"=>1); + +sub getInfo($) +{ + my $InfoPath = $_[0]; + return if(not $InfoPath or not -f $InfoPath); + my $InfoPath_New = $InfoPath.".1"; + #my $Keywords = join("\\|", keys(%check_node));#|grep "$Keywords" + system("sed ':a;N;\$!ba;s/\\n[^\@]//g' ".esc($InfoPath)."|sed 's/ [ ]\\+/ /g' > ".esc($InfoPath_New)); + system("rm", "-fr", $InfoPath); + #getting info + open(INFO, $InfoPath_New) || die ("can't open file '\$InfoPath_New\': $!\n"); + while(<INFO>) + { + chomp; + if(/\A@([0-9]+)[ ]+([a-zA-Z_]+)[ ]+(.*)\Z/) + { + next if(not $check_node{$2}); + $LibInfo{$Version}{$1}{"info_type"}=$2; + $LibInfo{$Version}{$1}{"info"}=$3; + } + } + close(INFO); + system("rm", "-fr", $InfoPath_New); + #processing info + setTemplateParams_All(); + getTypeDescr_All(); + getFuncDescr_All(); + getVarDescr_All(); + %LibInfo = (); + %TemplateInstance = (); +} + +sub setTemplateParams_All() +{ + foreach (keys(%{$LibInfo{$Version}})) + { + if($LibInfo{$Version}{$_}{"info_type"} eq "template_decl") + { + setTemplateParams($_); + } + } +} + +sub setTemplateParams($) +{ + my $TypeInfoId = $_[0]; + my $Info = $LibInfo{$Version}{$TypeInfoId}{"info"}; + if($Info =~ /(inst|spcs)[ ]*:[ ]*@([0-9]+) /) + { + my $TmplInst_InfoId = $2; + setTemplateInstParams($TmplInst_InfoId); + my $TmplInst_Info = $LibInfo{$Version}{$TmplInst_InfoId}{"info"}; + while($TmplInst_Info =~ /chan[ ]*:[ ]*@([0-9]+) /) + { + $TmplInst_InfoId = $1; + $TmplInst_Info = $LibInfo{$Version}{$TmplInst_InfoId}{"info"}; + setTemplateInstParams($TmplInst_InfoId); + } + } +} + +sub setTemplateInstParams($) +{ + my $TmplInst_Id = $_[0]; + my $Info = $LibInfo{$Version}{$TmplInst_Id}{"info"}; + my ($Params_InfoId, $ElemId) = (); + if($Info =~ /purp[ ]*:[ ]*@([0-9]+) /) + { + $Params_InfoId = $1; + } + if($Info =~ /valu[ ]*:[ ]*@([0-9]+) /) + { + $ElemId = $1; + } + if($Params_InfoId and $ElemId) + { + my $Params_Info = $LibInfo{$Version}{$Params_InfoId}{"info"}; + while($Params_Info =~ s/ ([0-9]+)[ ]*:[ ]*@([0-9]+) //) + { + my ($Param_Pos, $Param_TypeId) = ($1, $2); + return if($LibInfo{$Version}{$Param_TypeId}{"info_type"} eq "template_type_parm"); + if($LibInfo{$ElemId}{"info_type"} eq "function_decl") + { + $TemplateInstance_Func{$Version}{$ElemId}{$Param_Pos} = $Param_TypeId; + } + else + { + $TemplateInstance{$Version}{getTypeDeclId($ElemId)}{$ElemId}{$Param_Pos} = $Param_TypeId; + } + } + } +} + +sub getTypeDeclId($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /name[ ]*:[ ]*@([0-9]+)/) + { + return $1; + } + else + { + return ""; + } +} + +sub isFuncPtr($) +{ + my $Ptd = pointTo($_[0]); + if($Ptd) + { + if(($LibInfo{$Version}{$_[0]}{"info"} =~ m/unql[ ]*:/) and not ($LibInfo{$Version}{$_[0]}{"info"} =~ m/qual[ ]*:/)) + { + return 0; + } + elsif(($LibInfo{$Version}{$_[0]}{"info_type"} eq "pointer_type") and ($LibInfo{$Version}{$Ptd}{"info_type"} eq "function_type" or $LibInfo{$Version}{$Ptd}{"info_type"} eq "method_type")) + { + return 1; + } + else + { + return 0; + } + } + else + { + return 0; + } +} + +sub pointTo($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /ptd[ ]*:[ ]*@([0-9]+)/) + { + return $1; + } + else + { + return ""; + } +} + +sub getTypeDescr_All() +{ + foreach (sort {int($a)<=>int($b)} keys(%{$LibInfo{$Version}})) + { + if($LibInfo{$Version}{$_}{"info_type"}=~/_type\Z/ and $LibInfo{$Version}{$_}{"info_type"}!~/function_type|method_type/) + { + getTypeDescr(getTypeDeclId($_), $_); + } + } + $TypeDescr{$Version}{""}{-1}{"Name"} = "..."; + $TypeDescr{$Version}{""}{-1}{"Type"} = "Intrinsic"; + $TypeDescr{$Version}{""}{-1}{"Tid"} = -1; +} + +sub getTypeDescr($$) +{ + my ($TypeDeclId, $TypeId) = @_; + $Tid_TDid{$Version}{$TypeId} = $TypeDeclId; + %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getTypeAttr($TypeDeclId, $TypeId); + if(not $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}) + { + delete($TypeDescr{$Version}{$TypeDeclId}{$TypeId}); + return; + } + if(not $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}}) + { + $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; + } +} + +sub getTypeAttr($$) +{ + my ($TypeDeclId, $TypeId) = @_; + my ($BaseTypeSpec, %TypeAttr) = (); + if($TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}) + { + return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; + } + $TypeAttr{"Tid"} = $TypeId; + $TypeAttr{"TDid"} = $TypeDeclId; + $TypeAttr{"Type"} = getTypeType($TypeDeclId, $TypeId); + if($TypeAttr{"Type"} eq "Unknown") + { + return (); + } + elsif($TypeAttr{"Type"} eq "FuncPtr") + { + %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getFuncPtrAttr(pointTo($TypeId), $TypeDeclId, $TypeId); + $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; + return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; + } + elsif($TypeAttr{"Type"} eq "Array") + { + ($TypeAttr{"BaseType"}{"Tid"}, $TypeAttr{"BaseType"}{"TDid"}, $BaseTypeSpec) = selectBaseType($TypeDeclId, $TypeId); + my %BaseTypeAttr = getTypeAttr($TypeAttr{"BaseType"}{"TDid"}, $TypeAttr{"BaseType"}{"Tid"}); + my $ArrayElemNum = getSize($TypeId)/8; + $ArrayElemNum = $ArrayElemNum/$BaseTypeAttr{"Size"} if($BaseTypeAttr{"Size"}); + $TypeAttr{"Size"} = $ArrayElemNum; + if($ArrayElemNum) + { + $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}."[".$ArrayElemNum."]"; + } + else + { + $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}."[]"; + } + $TypeAttr{"Name"} = correctName($TypeAttr{"Name"}); + $TypeAttr{"Library"} = $BaseTypeAttr{"Library"}; + $TypeAttr{"Header"} = $BaseTypeAttr{"Header"}; + %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = %TypeAttr; + $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; + return %TypeAttr; + } + elsif($TypeAttr{"Type"} =~ /Intrinsic|Union|Struct|Enum|Class/) + { + if($TemplateInstance{$Version}{$TypeDeclId}{$TypeId}) + { + my @Template_Params = (); + foreach my $Param_Pos (sort {int($a)<=>int($b)} keys(%{$TemplateInstance{$Version}{$TypeDeclId}{$TypeId}})) + { + my $Type_Id = $TemplateInstance{$Version}{$TypeDeclId}{$TypeId}{$Param_Pos}; + my $Param = get_TemplateParam($Type_Id); + if($Param eq "") + { + return (); + } + @Template_Params = (@Template_Params, $Param); + } + %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getTrivialTypeAttr($TypeDeclId, $TypeId); + $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"} = $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}."< ".join(", ", @Template_Params)." >"; + $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"} = correctName($TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}); + $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; + return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; + } + else + { + %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = getTrivialTypeAttr($TypeDeclId, $TypeId); + return %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}}; + } + } + else + { + ($TypeAttr{"BaseType"}{"Tid"}, $TypeAttr{"BaseType"}{"TDid"}, $BaseTypeSpec) = selectBaseType($TypeDeclId, $TypeId); + my %BaseTypeAttr = getTypeAttr($TypeAttr{"BaseType"}{"TDid"}, $TypeAttr{"BaseType"}{"Tid"}); + if($BaseTypeSpec and $BaseTypeAttr{"Name"}) + { + if(($TypeAttr{"Type"} eq "Pointer") and $BaseTypeAttr{"Name"}=~/\([\*]+\)/) + { + $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}; + $TypeAttr{"Name"} =~ s/\(([*]+)\)/($1*)/g; + } + else + { + $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}." ".$BaseTypeSpec; + } + } + elsif($BaseTypeAttr{"Name"}) + { + $TypeAttr{"Name"} = $BaseTypeAttr{"Name"}; + } + if($TypeAttr{"Type"} eq "Typedef") + { + $TypeAttr{"Name"} = getNameByInfo($TypeDeclId); + $TypeAttr{"NameSpace"} = getNameSpace($TypeDeclId); + if($TypeAttr{"NameSpace"}) + { + $TypeAttr{"Name"} = $TypeAttr{"NameSpace"}."::".$TypeAttr{"Name"}; + } + ($TypeAttr{"Header"}, $TypeAttr{"Line"}) = getLocation($TypeDeclId); + if($TypeAttr{"NameSpace"}=~/\Astd(::|\Z)/ and $BaseTypeAttr{"NameSpace"}=~/\Astd(::|\Z)/) + { + $StdCxxTypedef{$Version}{$BaseTypeAttr{"Name"}} = $TypeAttr{"Name"}; + } + $Typedef_BaseName{$Version}{$TypeAttr{"Name"}} = $BaseTypeAttr{"Name"}; + } + if(not $TypeAttr{"Size"}) + { + if($TypeAttr{"Type"} eq "Pointer") + { + $TypeAttr{"Size"} = $POINTER_SIZE; + } + else + { + $TypeAttr{"Size"} = $BaseTypeAttr{"Size"}; + } + } + $TypeAttr{"Name"} = correctName($TypeAttr{"Name"}); + $TypeAttr{"Library"} = $BaseTypeAttr{"Library"}; + $TypeAttr{"Header"} = $BaseTypeAttr{"Header"} if(not $TypeAttr{"Header"}); + %{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}} = %TypeAttr; + $TName_Tid{$Version}{$TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"Name"}} = $TypeId; + return %TypeAttr; + } +} + +sub get_TemplateParam($) +{ + my $Type_Id = $_[0]; + if(getNodeType($Type_Id) eq "integer_cst") + { + return getNodeIntCst($Type_Id); + } + elsif(getNodeType($Type_Id) eq "string_cst") + { + return getNodeStrCst($Type_Id); + } + else + { + my $Type_DId = getTypeDeclId($Type_Id); + my %ParamAttr = getTypeAttr($Type_DId, $Type_Id); + if(not $ParamAttr{"Name"}) + { + return ""; + } + if($ParamAttr{"Name"}=~/\>/) + { + if($StdCxxTypedef{$Version}{$ParamAttr{"Name"}}) + { + return $StdCxxTypedef{$Version}{$ParamAttr{"Name"}}; + } + elsif(my $Covered = cover_stdcxx_typedef($ParamAttr{"Name"})) + { + return $Covered; + } + else + { + return $ParamAttr{"Name"}; + } + } + else + { + return $ParamAttr{"Name"}; + } + } +} + +sub cover_stdcxx_typedef($) +{ + my $TypeName = $_[0]; + my $TypeName_Covered = $TypeName; + while($TypeName=~s/>[ ]*(const|volatile|restrict| |\*|\&)\Z/>/g){}; + if(my $Cover = $StdCxxTypedef{$Version}{$TypeName}) + { + $TypeName = esc_l($TypeName); + $TypeName_Covered=~s/$TypeName/$Cover /g; + } + return correctName($TypeName_Covered); +} + +sub getNodeType($) +{ + return $LibInfo{$Version}{$_[0]}{"info_type"}; +} + +sub getNodeIntCst($) +{ + my $CstId = $_[0]; + my $CstTypeId = getTreeAttr($CstId, "type"); + if($EnumMembName_Id{$Version}{$CstId}) + { + return $EnumMembName_Id{$Version}{$CstId}; + } + elsif($LibInfo{$Version}{$_[0]}{"info"} =~ /low[ ]*:[ ]*([^ ]+) /) + { + if($1 eq "0") + { + if(getNodeType($CstTypeId) eq "boolean_type") + { + return "false"; + } + else + { + return "0"; + } + } + elsif($1 eq "1") + { + if(getNodeType($CstTypeId) eq "boolean_type") + { + return "true"; + } + else + { + return "1"; + } + } + else + { + return $1; + } + } + else + { + return ""; + } +} + +sub getNodeStrCst($) +{ + if($LibInfo{$Version}{$_[0]}{"info"} =~ /low[ ]*:[ ]*(.+)[ ]+lngt/) + { + return $1; + } + else + { + return ""; + } +} + +sub esc_l($) +{ + my $String = $_[0]; + $String=~s/([()*])/\\$1/g; + return $String; +} + +sub getFuncPtrAttr($$$) +{ + my ($FuncTypeId, $TypeDeclId, $TypeId) = @_; + my $FuncInfo = $LibInfo{$Version}{$FuncTypeId}{"info"}; + my $FuncInfo_Type = $LibInfo{$Version}{$FuncTypeId}{"info_type"}; + my $FuncPtrCorrectName = ""; + my %TypeAttr = ("Size"=>$POINTER_SIZE, "Type"=>"FuncPtr", "TDid"=>$TypeDeclId, "Tid"=>$TypeId); + my @ParamTypeName; + if($FuncInfo =~ /retn[ ]*:[ ]*\@([0-9]+) /) + { + my $ReturnTypeId = $1; + my %ReturnAttr = getTypeAttr(getTypeDeclId($ReturnTypeId), $ReturnTypeId); + $FuncPtrCorrectName .= $ReturnAttr{"Name"}; + $TypeAttr{"Return"} = $ReturnTypeId; + } + if($FuncInfo =~ /prms[ ]*:[ ]*@([0-9]+) /) + { + my $ParamTypeInfoId = $1; + my $Position = 0; + while($ParamTypeInfoId) + { + my $ParamTypeInfo = $LibInfo{$Version}{$ParamTypeInfoId}{"info"}; + last if($ParamTypeInfo !~ /valu[ ]*:[ ]*@([0-9]+) /); + my $ParamTypeId = $1; + my %ParamAttr = getTypeAttr(getTypeDeclId($ParamTypeId), $ParamTypeId); + last if($ParamAttr{"Name"} eq "void"); + $TypeAttr{"Memb"}{$Position}{"type"} = $ParamTypeId; + push(@ParamTypeName, $ParamAttr{"Name"}); + last if($ParamTypeInfo !~ /chan[ ]*:[ ]*@([0-9]+) /); + $ParamTypeInfoId = $1; + $Position+=1; + } + } + if($FuncInfo_Type eq "function_type") + { + $FuncPtrCorrectName .= " (*) (".join(", ", @ParamTypeName).")"; + } + elsif($FuncInfo_Type eq "method_type") + { + if($FuncInfo =~ /clas[ ]*:[ ]*@([0-9]+) /) + { + my $ClassId = $1; + my $ClassName = $TypeDescr{$Version}{getTypeDeclId($ClassId)}{$ClassId}{"Name"}; + if($ClassName) + { + $FuncPtrCorrectName .= " ($ClassName\:\:*) (".join(", ", @ParamTypeName).")"; + } + else + { + $FuncPtrCorrectName .= " (*) (".join(", ", @ParamTypeName).")"; + } + } + else + { + $FuncPtrCorrectName .= " (*) (".join(", ", @ParamTypeName).")"; + } + } + $TypeAttr{"Name"} = correctName($FuncPtrCorrectName); + return %TypeAttr; +} + +sub getTypeName($) +{ + my $Info = $LibInfo{$Version}{$_[0]}{"info"}; + if($Info =~ /name[ ]*:[ ]*@([0-9]+) /) + { + return getNameByInfo($1); + } + else + { + if($LibInfo{$Version}{$_[0]}{"info_type"} eq "integer_type") + { + if($LibInfo{$Version}{$_[0]}{"info"} =~ /unsigned/) + { + return "unsigned int"; + } + else + { + return "int"; + } + } + else + { + return ""; + } + } +} + +sub selectBaseType($$) +{ + my ($TypeDeclId, $TypeId) = @_; + my $TypeInfo = $LibInfo{$Version}{$TypeId}{"info"}; + my $BaseTypeDeclId; + my $Type_Type = getTypeType($TypeDeclId, $TypeId); + #qualifications + if(($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*c /) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) + { + return ($1, getTypeDeclId($1), "const"); + } + elsif(($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*r /) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) + { + return ($1, getTypeDeclId($1), "restrict"); + } + elsif(($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*v /) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) + { + return ($1, getTypeDeclId($1), "volatile"); + } + elsif((not ($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:/)) and ($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@([0-9]+) /)) + {#typedefs + return ($1, getTypeDeclId($1), ""); + } + elsif($LibInfo{$Version}{$TypeId}{"info_type"} eq "reference_type") + { + if($TypeInfo =~ /refd[ ]*:[ ]*@([0-9]+) /) + { + return ($1, getTypeDeclId($1), "&"); + } + else + { + return (0, 0, ""); + } + } + elsif($LibInfo{$Version}{$TypeId}{"info_type"} eq "array_type") + { + if($TypeInfo =~ /elts[ ]*:[ ]*@([0-9]+) /) + { + return ($1, getTypeDeclId($1), ""); + } + else + { + return (0, 0, ""); + } + } + elsif($LibInfo{$Version}{$TypeId}{"info_type"} eq "pointer_type") + { + if($TypeInfo =~ /ptd[ ]*:[ ]*@([0-9]+) /) + { + return ($1, getTypeDeclId($1), "*"); + } + else + { + return (0, 0, ""); + } + } + else + { + return (0, 0, ""); + } +} + +sub getFuncDescr_All() +{ + foreach (sort {int($b)<=>int($a)} keys(%{$LibInfo{$Version}})) + { + if($LibInfo{$Version}{$_}{"info_type"} eq "function_decl") + { + getFuncDescr($_); + } + } +} + +sub getVarDescr_All() +{ + foreach (sort {int($b)<=>int($a)} keys(%{$LibInfo{$Version}})) + { + if($LibInfo{$Version}{$_}{"info_type"} eq "var_decl") + { + getVarDescr($_); + } + } +} + +sub getVarDescr($) +{ + my $FuncInfoId = $_[0]; + if($LibInfo{$Version}{getNameSpaceId($FuncInfoId)}{"info_type"} eq "function_decl") + { + return; + } + ($FuncDescr{$Version}{$FuncInfoId}{"Header"}, $FuncDescr{$Version}{$FuncInfoId}{"Line"}) = getLocation($FuncInfoId); + if((not $FuncDescr{$Version}{$FuncInfoId}{"Header"}) or ($FuncDescr{$Version}{$FuncInfoId}{"Header"}=~/\<built\-in\>|\<internal\>/)) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + $FuncDescr{$Version}{$FuncInfoId}{"ShortName"} = getNameByInfo($FuncInfoId); + $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = getFuncMnglName($FuncInfoId); + if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and $FuncDescr{$Version}{$FuncInfoId}{"MnglName"}!~/\A_Z/) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + if(not $FuncDescr{$Version}{$FuncInfoId}{"MnglName"}) + { + $FuncDescr{$Version}{$FuncInfoId}{"Name"} = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; + $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; + } + if(not is_in_library($FuncDescr{$Version}{$FuncInfoId}{"MnglName"}, $Version) and not $CheckHeadersOnly) + { + delete $FuncDescr{$Version}{$FuncInfoId}; + return; + } + $FuncDescr{$Version}{$FuncInfoId}{"Return"} = getTypeId($FuncInfoId); + delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}) if(not $FuncDescr{$Version}{$FuncInfoId}{"Return"}); + $FuncDescr{$Version}{$FuncInfoId}{"Data"} = 1; + set_Class_And_Namespace($FuncInfoId); + setFuncAccess($FuncInfoId); + if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} =~ /\A_ZTV/) + { + delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}); + } + if($FuncDescr{$Version}{$FuncInfoId}{"ShortName"} =~ /\A_Z/) + { + delete($FuncDescr{$Version}{$FuncInfoId}{"ShortName"}); + } +} + +sub getTrivialTypeAttr($$) +{ + my ($TypeInfoId, $TypeId) = @_; + my %TypeAttr = (); + return if(getTypeTypeByTypeId($TypeId)!~/Intrinsic|Union|Struct|Enum/); + setTypeAccess($TypeId, \%TypeAttr); + ($TypeAttr{"Header"}, $TypeAttr{"Line"}) = getLocation($TypeInfoId); + if(($TypeAttr{"Header"} eq "<built-in>") or ($TypeAttr{"Header"} eq "<internal>")) + { + delete($TypeAttr{"Header"}); + } + $TypeAttr{"Name"} = getNameByInfo($TypeInfoId); + $TypeAttr{"Name"} = getTypeName($TypeId) if(not $TypeAttr{"Name"}); + my $NameSpaceId = getNameSpaceId($TypeInfoId); + if($NameSpaceId ne $TypeId) + { + $TypeAttr{"NameSpace"} = getNameSpace($TypeInfoId); + } + if($TypeAttr{"NameSpace"} and isNotAnon($TypeAttr{"Name"})) + { + $TypeAttr{"Name"} = $TypeAttr{"NameSpace"}."::".$TypeAttr{"Name"}; + } + $TypeAttr{"Name"} = correctName($TypeAttr{"Name"}); + if(isAnon($TypeAttr{"Name"})) + { + $TypeAttr{"Name"} = "anon-"; + $TypeAttr{"Name"} .= $TypeAttr{"Header"}."-".$TypeAttr{"Line"}; + } + $TypeAttr{"Size"} = getSize($TypeId)/8; + $TypeAttr{"Type"} = getTypeType($TypeInfoId, $TypeId); + if($TypeAttr{"Type"} eq "Struct" and has_methods($TypeId)) + { + $TypeAttr{"Type"} = "Class"; + } + if(($TypeAttr{"Type"} eq "Struct") or ($TypeAttr{"Type"} eq "Class")) + { + setBaseClasses($TypeInfoId, $TypeId, \%TypeAttr); + } + setTypeMemb($TypeInfoId, $TypeId, \%TypeAttr); + $TypeAttr{"Tid"} = $TypeId; + $TypeAttr{"TDid"} = $TypeInfoId; + $Tid_TDid{$Version}{$TypeId} = $TypeInfoId; + if(not $TName_Tid{$Version}{$TypeAttr{"Name"}}) + { + $TName_Tid{$Version}{$TypeAttr{"Name"}} = $TypeId; + } + return %TypeAttr; +} + +sub has_methods($) +{ + my $TypeId = $_[0]; + my $Info = $LibInfo{$Version}{$TypeId}{"info"}; + return ($Info=~/(fncs)[ ]*:[ ]*@([0-9]+) /); +} + +sub setBaseClasses($$$) +{ + my ($TypeInfoId, $TypeId, $TypeAttr) = @_; + my $Info = $LibInfo{$Version}{$TypeId}{"info"}; + if($Info =~ /binf[ ]*:[ ]*@([0-9]+) /) + { + $Info = $LibInfo{$Version}{$1}{"info"}; + while($Info =~ /accs[ ]*:[ ]*([a-z]+) /) + { + last if($Info !~ s/accs[ ]*:[ ]*([a-z]+) //); + my $Access = $1; + last if($Info !~ s/binf[ ]*:[ ]*@([0-9]+) //); + my $BInfoId = $1; + my $ClassId = getBinfClassId($BInfoId); + if($Access eq "pub") + { + $TypeAttr->{"BaseClass"}{$ClassId} = "public"; + } + elsif($Access eq "prot") + { + $TypeAttr->{"BaseClass"}{$ClassId} = "protected"; + } + elsif($Access eq "priv") + { + $TypeAttr->{"BaseClass"}{$ClassId} = "private"; + } + else + { + $TypeAttr->{"BaseClass"}{$ClassId} = "private"; + } + } + } +} + +sub getBinfClassId($) +{ + my $Info = $LibInfo{$Version}{$_[0]}{"info"}; + $Info =~ /type[ ]*:[ ]*@([0-9]+) /; + return $1; +} + +sub get_func_signature($) +{ + my $FuncInfoId = $_[0]; + my $PureSignature = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; + my @ParamTypes = (); + foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$FuncDescr{$Version}{$FuncInfoId}{"Param"}})) + {#checking parameters + my $ParamType_Id = $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$ParamPos}{"type"}; + my $ParamType_Name = uncover_typedefs($TypeDescr{$Version}{getTypeDeclId($ParamType_Id)}{$ParamType_Id}{"Name"}); + @ParamTypes = (@ParamTypes, $ParamType_Name); + } + $PureSignature = $PureSignature."(".join(", ", @ParamTypes).")"; + $PureSignature = delete_keywords($PureSignature); + return correctName($PureSignature); +} + +sub delete_keywords($) +{ + my $TypeName = $_[0]; + $TypeName =~ s/(\W|\A)(enum |struct |union |class )/$1/g; + return $TypeName; +} + +sub uncover_typedefs($) +{ + my $TypeName = $_[0]; + return "" if(not $TypeName); + return $Cache{"uncover_typedefs"}{$Version}{$TypeName} if(defined $Cache{"uncover_typedefs"}{$Version}{$TypeName}); + my ($TypeName_New, $TypeName_Pre) = (correctName($TypeName), ""); + while($TypeName_New ne $TypeName_Pre) + { + $TypeName_Pre = $TypeName_New; + my $TypeName_Copy = $TypeName_New; + my %Words = (); + while($TypeName_Copy=~s/(\W|\A)([a-z_][\w:]*)(\W|\Z)//io) + { + my $Word = $2; + next if(not $Word or $Word=~/\A(true|false|const|int|long|void|short|float|unsigned|char|double|class|struct|union|enum)\Z/); + $Words{$Word} = 1; + } + foreach my $Word (keys(%Words)) + { + my $BaseType_Name = $Typedef_BaseName{$Version}{$Word}; + next if($TypeName_New=~/(\W|\A)(struct $Word|union $Word|enum $Word)(\W|\Z)/); + next if(not $BaseType_Name); + if($BaseType_Name=~/\([*]+\)/) + { + $TypeName_New =~ /$Word(.*)\Z/; + my $Type_Suffix = $1; + $TypeName_New = $BaseType_Name; + if($TypeName_New =~ s/\(([*]+)\)/($1 $Type_Suffix)/) + { + $TypeName_New = correctName($TypeName_New); + } + } + else + { + if($TypeName_New =~ s/(\W|\A)$Word(\W|\Z)/$1$BaseType_Name$2/g) + { + $TypeName_New = correctName($TypeName_New); + } + } + } + } + $Cache{"uncover_typedefs"}{$Version}{$TypeName} = $TypeName_New; + return $TypeName_New; +} + +sub isInternal($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + return 0 if($FuncInfo !~ /mngl[ ]*:[ ]*@([0-9]+) /); + my $FuncMnglNameInfoId = $1; + return ($LibInfo{$Version}{$FuncMnglNameInfoId}{"info"} =~ /\*[ ]*INTERNAL[ ]*\*/); +} + +sub set_Class_And_Namespace($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; + if($FuncInfo =~ /scpe[ ]*:[ ]*@([0-9]+) /) + { + my $NameSpaceInfoId = $1; + if($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "namespace_decl") + { + my $NameSpaceInfo = $LibInfo{$Version}{$NameSpaceInfoId}{"info"}; + if($NameSpaceInfo =~ /name[ ]*:[ ]*@([0-9]+) /) + { + my $NameSpaceId = $1; + my $NameSpaceIdentifier = $LibInfo{$Version}{$NameSpaceId}{"info"}; + if($NameSpaceIdentifier =~ /strg[ ]*:[ ]*(.*)[ ]+lngt/) + { + my $NameSpace = $1; + $NameSpace =~ s/[ ]+\Z//g; + $FuncDescr{$Version}{$FuncInfoId}{"NameSpace"} = $NameSpace; + } + } + } + elsif($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "record_type") + { + $FuncDescr{$Version}{$FuncInfoId}{"Class"} = $NameSpaceInfoId; + } + } +} + +sub getFuncDescr($) +{ + my $FuncInfoId = $_[0]; + return if(isInternal($FuncInfoId)); + ($FuncDescr{$Version}{$FuncInfoId}{"Header"}, $FuncDescr{$Version}{$FuncInfoId}{"Line"}) = getLocation($FuncInfoId); + if(not $FuncDescr{$Version}{$FuncInfoId}{"Header"} or $FuncDescr{$Version}{$FuncInfoId}{"Header"}=~/\<built\-in\>|\<internal\>/) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + setFuncAccess($FuncInfoId); + setFuncKind($FuncInfoId); + if($FuncDescr{$Version}{$FuncInfoId}{"PseudoTemplate"}) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + $FuncDescr{$Version}{$FuncInfoId}{"Type"} = getFuncType($FuncInfoId); + $FuncDescr{$Version}{$FuncInfoId}{"Return"} = getFuncReturn($FuncInfoId); + delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}) if(not $FuncDescr{$Version}{$FuncInfoId}{"Return"}); + $FuncDescr{$Version}{$FuncInfoId}{"ShortName"} = getFuncShortName(getFuncOrig($FuncInfoId)); + if($FuncDescr{$Version}{$FuncInfoId}{"ShortName"} =~ /\._/) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + if(defined $TemplateInstance_Func{$Version}{$FuncInfoId}) + { + my @TmplParams = (); + foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$TemplateInstance_Func{$Version}{$FuncInfoId}})) + { + my $Param = get_TemplateParam($TemplateInstance_Func{$Version}{$FuncInfoId}{$ParamPos}); + if($Param eq "") + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + push(@TmplParams, $Param); + } + $FuncDescr{$Version}{$FuncInfoId}{"ShortName"} .= "<".join(", ", @TmplParams).">"; + } + setFuncParams($FuncInfoId); + $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = getFuncMnglName($FuncInfoId); + if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and $FuncDescr{$Version}{$FuncInfoId}{"MnglName"}!~/\A_Z/) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + + if((is_in_library($FuncDescr{$Version}{$FuncInfoId}{"ShortName"}, $Version) or $CheckHeadersOnly) and not $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and ($FuncDescr{$Version}{$FuncInfoId}{"Type"} eq "Function")) + { + $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; + } + set_Class_And_Namespace($FuncInfoId); + if(not $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} and not $FuncDescr{$Version}{$FuncInfoId}{"Class"}) + {#this section only for c++ functions without class that have not been mangled in the tree + $FuncDescr{$Version}{$FuncInfoId}{"MnglName"} = $mangled_name{get_func_signature($FuncInfoId)}; + } + if(not is_in_library($FuncDescr{$Version}{$FuncInfoId}{"MnglName"}, $Version) and not $CheckHeadersOnly) + {#src only + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + if($FuncDescr{$Version}{$FuncInfoId}{"Constructor"} or $FuncDescr{$Version}{$FuncInfoId}{"Destructor"}) + { + delete($FuncDescr{$Version}{$FuncInfoId}{"Return"}); + } + my $FuncBody = getFuncBody($FuncInfoId); + if($FuncBody eq "defined") + { + $FuncDescr{$Version}{$FuncInfoId}{"InLine"} = 1; + } + if($CheckHeadersOnly and $FuncDescr{$Version}{$FuncInfoId}{"InLine"}) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + if(($FuncDescr{$Version}{$FuncInfoId}{"Type"} eq "Method") or $FuncDescr{$Version}{$FuncInfoId}{"Constructor"} or $FuncDescr{$Version}{$FuncInfoId}{"Destructor"}) + { + if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"}!~/\A_Z/) + { + delete($FuncDescr{$Version}{$FuncInfoId}); + return; + } + } + if(getFuncSpec($FuncInfoId) eq "Virt") + {#virtual methods + $FuncDescr{$Version}{$FuncInfoId}{"Virt"} = 1; + } + if(getFuncSpec($FuncInfoId) eq "PureVirt") + {#pure virtual methods + $FuncDescr{$Version}{$FuncInfoId}{"PureVirt"} = 1; + } + if($FuncDescr{$Version}{$FuncInfoId}{"MnglName"} =~ /\A_Z/ and $FuncDescr{$Version}{$FuncInfoId}{"Class"}) + { + if($FuncDescr{$Version}{$FuncInfoId}{"Type"} eq "Function") + {#static methods + $FuncDescr{$Version}{$FuncInfoId}{"Static"} = 1; + } + } + if(getFuncLink($FuncInfoId) eq "Static") + { + $FuncDescr{$Version}{$FuncInfoId}{"Static"} = 1; + } + delete($FuncDescr{$Version}{$FuncInfoId}{"Type"}); +} + +sub getFuncBody($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($FuncInfo =~ /body[ ]*:[ ]*undefined(\ |\Z)/i) + { + return "undefined"; + } + elsif($FuncInfo =~ /body[ ]*:[ ]*@([0-9]+)(\ |\Z)/i) + { + return "defined"; + } + else + { + return ""; + } +} + +sub getTypeShortName($) +{ + my $TypeName = $_[0]; + $TypeName =~ s/\<.*\>//g; + $TypeName =~ s/.*\:\://g; + return $TypeName; +} + +sub getBackRef($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /name[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getTypeId($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /type[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getFuncId($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($FuncInfo =~ /type[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub setTypeMemb($$) +{ + my ($TypeDeclId, $TypeId, $TypeAttr) = @_; + my $TypeInfo = $LibInfo{$Version}{$TypeId}{"info"}; + my $TypeMembInfoId; + my $TypeType = $TypeAttr->{"Type"}; + my $Position = 0; + my $BasePosition = 0; + my $TypeTypeInfoId; + my $StructMembName; + if($TypeType eq "Enum") + { + $TypeMembInfoId = getEnumMembInfoId($TypeId); + while($TypeMembInfoId) + { + $TypeAttr->{"Memb"}{$Position}{"value"} = getEnumMembVal($TypeMembInfoId); + my $MembName = getEnumMembName($TypeMembInfoId); + $TypeAttr->{"Memb"}{$Position}{"name"} = getEnumMembName($TypeMembInfoId); + $EnumMembName_Id{$Version}{getTreeAttr($TypeMembInfoId, "valu")} = ($TypeAttr->{"NameSpace"})?$TypeAttr->{"NameSpace"}."::".$MembName:$MembName; + $TypeMembInfoId = getNextMembInfoId($TypeMembInfoId); + $Position += 1; + } + } + elsif(($TypeType eq "Struct") or ($TypeType eq "Class") or ($TypeType eq "Union")) + { + $TypeMembInfoId = getStructMembInfoId($TypeId); + while($TypeMembInfoId) + { + if($LibInfo{$Version}{$TypeMembInfoId}{"info_type"} ne "field_decl") + { + $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); + next; + } + $StructMembName = getStructMembName($TypeMembInfoId); + if($StructMembName =~ /_vptr\./) + {#virtual tables + $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); + next; + } + if(not $StructMembName) + {#base classes + #$TypeAttr->{"Base"}{$BasePosition}{"type"} = getStructMembType($TypeMembInfoId); + #$TypeAttr->{"Base"}{$BasePosition}{"access"} = getStructMembAccess($TypeMembInfoId); + $BasePosition += 1; + $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); + next; + } + $TypeAttr->{"Memb"}{$Position}{"type"} = getStructMembType($TypeMembInfoId); + $TypeAttr->{"Memb"}{$Position}{"name"} = $StructMembName; + $TypeAttr->{"Memb"}{$Position}{"access"} = getStructMembAccess($TypeMembInfoId); + $TypeAttr->{"Memb"}{$Position}{"bitfield"} = getStructMembBitFieldSize($TypeMembInfoId); + + $TypeMembInfoId = getNextStructMembInfoId($TypeMembInfoId); + $Position += 1; + } + } +} + +sub setFuncParams($) +{ + my $FuncInfoId = $_[0]; + my $ParamInfoId = getFuncParamInfoId($FuncInfoId); + my $FunctionType = getFuncType($FuncInfoId); + if($FunctionType eq "Method") + { + $ParamInfoId = getNextElem($ParamInfoId); + } + my $Position = 0; + while($ParamInfoId) + { + my $ParamTypeId = getFuncParamType($ParamInfoId); + last if($TypeDescr{$Version}{getTypeDeclId($ParamTypeId)}{$ParamTypeId}{"Name"} eq "void"); + if($TypeDescr{$Version}{getTypeDeclId($ParamTypeId)}{$ParamTypeId}{"Type"} eq "Restrict") + {#delete restrict spec + $ParamTypeId = getRestrictBase($ParamTypeId); + } + $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"type"} = $ParamTypeId; + $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"name"} = getFuncParamName($ParamInfoId); + if(not $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"name"}) + { + $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"name"} = "p".($Position+1); + } + $ParamInfoId = getNextElem($ParamInfoId); + $Position += 1; + } + if(detect_nolimit_args($FuncInfoId)) + { + $FuncDescr{$Version}{$FuncInfoId}{"Param"}{$Position}{"type"} = -1; + } +} + +sub detect_nolimit_args($) +{ + my $FuncInfoId = $_[0]; + my $FuncTypeId = getFuncTypeId($FuncInfoId); + my $ParamListElemId = getFuncParamTreeListId($FuncTypeId); + my $HaveVoid = 0; + my $Position = 0; + while($ParamListElemId) + { + my $ParamTypeId = getTreeAttr($ParamListElemId, "valu"); + if($TypeDescr{$Version}{getTypeDeclId($ParamTypeId)}{$ParamTypeId}{"Name"} eq "void") + { + $HaveVoid = 1; + last; + } + $ParamListElemId = getNextElem($ParamListElemId); + $Position += 1; + } + return ($Position>=1 and not $HaveVoid); +} + +sub getFuncParamTreeListId($) +{ + my $FuncTypeId = $_[0]; + if($LibInfo{$Version}{$FuncTypeId}{"info"} =~ /prms[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getTreeAttr($$) +{ + my ($Id, $Attr) = @_; + if($LibInfo{$Version}{$Id}{"info"} =~ /$Attr[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getRestrictBase($) +{ + my $TypeId = $_[0]; + my $TypeDeclId = getTypeDeclId($TypeId); + my $BaseTypeId = $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"BaseType"}{"Tid"}; + my $BaseTypeDeclId = $TypeDescr{$Version}{$TypeDeclId}{$TypeId}{"BaseType"}{"TDid"}; + return $BaseTypeId; +} + +sub setFuncAccess($) +{ + my $FuncInfoId = $_[0]; + if($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /accs[ ]*:[ ]*([a-zA-Z]+) /) + { + my $Access = $1; + if($Access eq "prot") + { + $FuncDescr{$Version}{$FuncInfoId}{"Protected"} = 1; + } + elsif($Access eq "priv") + { + $FuncDescr{$Version}{$FuncInfoId}{"Private"} = 1; + } + } +} + +sub setTypeAccess($$) +{ + my ($TypeId, $TypeAttr) = @_; + my $TypeInfo = $LibInfo{$Version}{$TypeId}{"info"}; + if($TypeInfo =~ /accs[ ]*:[ ]*([a-zA-Z]+) /) + { + my $Access = $1; + if($Access eq "prot") + { + $TypeAttr->{"Protected"} = 1; + } + elsif($Access eq "priv") + { + $TypeAttr->{"Private"} = 1; + } + } +} + +sub setFuncKind($) +{ + my $FuncInfoId = $_[0]; + if($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /pseudo tmpl/) + { + $FuncDescr{$Version}{$FuncInfoId}{"PseudoTemplate"} = 1; + } + elsif($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /note[ ]*:[ ]*constructor /) + { + $FuncDescr{$Version}{$FuncInfoId}{"Constructor"} = 1; + } + elsif($LibInfo{$Version}{$FuncInfoId}{"info"} =~ /note[ ]*:[ ]*destructor /) + { + $FuncDescr{$Version}{$FuncInfoId}{"Destructor"} = 1; + } +} + +sub getFuncSpec($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; + if($FuncInfo =~ m/spec[ ]*:[ ]*pure /) + { + return "PureVirt"; + } + elsif($FuncInfo =~ m/spec[ ]*:[ ]*virt /) + { + return "Virt"; + } + else + { + if($FuncInfo =~ /spec[ ]*:[ ]*([a-zA-Z]+) /) + { + return $1; + } + else + { + return ""; + } + } +} + +sub getFuncClass($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; + if($FuncInfo =~ /scpe[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getFuncLink($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; + if($FuncInfo =~ /link[ ]*:[ ]*static /) + { + return "Static"; + } + else + { + if($FuncInfo =~ /link[ ]*:[ ]*([a-zA-Z]+) /) + { + return $1; + } + else + { + return ""; + } + } +} + +sub getNextElem($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; + if($FuncInfo =~ /chan[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getFuncParamInfoId($) +{ + my $FuncInfoId = $_[0]; + my $FuncInfo = $LibInfo{$Version}{$FuncInfoId}{"info"}; + if($FuncInfo =~ /args[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getFuncParamType($) +{ + my $ParamInfoId = $_[0]; + my $ParamInfo = $LibInfo{$Version}{$ParamInfoId}{"info"}; + if($ParamInfo =~ /type[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getFuncParamName($) +{ + my $ParamInfoId = $_[0]; + my $ParamInfo = $LibInfo{$Version}{$ParamInfoId}{"info"}; + return "" if($ParamInfo !~ /name[ ]*:[ ]*@([0-9]+) /); + my $NameInfoId = $1; + return "" if($LibInfo{$Version}{$NameInfoId}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); + my $FuncParamName = $1; + $FuncParamName =~ s/[ ]+\Z//g; + return $FuncParamName; +} + +sub getEnumMembInfoId($) +{ + my $TypeInfoId = $_[0]; + my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; + if($TypeInfo =~ /csts[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getStructMembInfoId($) +{ + my $TypeInfoId = $_[0]; + my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; + if($TypeInfo =~ /flds[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getNameSpace($) +{ + my $TypeInfoId = $_[0]; + my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; + return "" if($TypeInfo !~ /scpe[ ]*:[ ]*@([0-9]+) /); + my $NameSpaceInfoId = $1; + if($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "namespace_decl") + { + my $NameSpaceInfo = $LibInfo{$Version}{$NameSpaceInfoId}{"info"}; + if($NameSpaceInfo =~ /name[ ]*:[ ]*@([0-9]+) /) + { + my $NameSpaceId = $1; + my $NameSpaceIdentifier = $LibInfo{$Version}{$NameSpaceId}{"info"}; + return "" if($NameSpaceIdentifier !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); + my $NameSpace = $1; + $NameSpace =~ s/[ ]+\Z//g; + my $BaseNameSpace = getNameSpace($NameSpaceInfoId); + $NameSpace = $BaseNameSpace."::".$NameSpace if($BaseNameSpace); + return $NameSpace; + } + else + { + return ""; + } + } + elsif($LibInfo{$Version}{$NameSpaceInfoId}{"info_type"} eq "record_type") + { + my %NameSpaceAttr = getTypeAttr(getTypeDeclId($NameSpaceInfoId), $NameSpaceInfoId); + return $NameSpaceAttr{"Name"}; + } + else + { + return ""; + } +} + +sub getNameSpaceId($) +{ + my $TypeInfoId = $_[0]; + my $TypeInfo = $LibInfo{$Version}{$TypeInfoId}{"info"}; + if($TypeInfo =~ /scpe[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getEnumMembName($) +{ + my $TypeMembInfoId = $_[0]; + return "" if($LibInfo{$Version}{$TypeMembInfoId}{"info"} !~ /purp[ ]*:[ ]*@([0-9]+)/); + my $Purp = $1; + return "" if($LibInfo{$Version}{$Purp}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); + my $EnumMembName = $1; + $EnumMembName =~ s/[ ]+\Z//g; + return $EnumMembName; +} + +sub getStructMembName($) +{ + my $TypeMembInfoId = $_[0]; + return "" if($LibInfo{$Version}{$TypeMembInfoId}{"info"} !~ /name[ ]*:[ ]*@([0-9]+) /); + my $NameInfoId = $1; + return "" if($LibInfo{$Version}{$NameInfoId}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); + my $StructMembName = $1; + $StructMembName =~ s/[ ]+\Z//g; + return $StructMembName; +} + +sub getEnumMembVal($) +{ + my $TypeMembInfoId = $_[0]; + return "" if($LibInfo{$Version}{$TypeMembInfoId}{"info"} !~ /valu[ ]*:[ ]*@([0-9]+) /); + my $Valu = $1; + if($LibInfo{$Version}{$Valu}{"info"} =~ /low[ ]*:[ ]*(-?[0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getSize($) +{ + my $Info = $LibInfo{$Version}{$_[0]}{"info"}; + if($Info =~ /size[ ]*:[ ]*@([0-9]+) /) + { + my $SizeInfoId = $1; + if($LibInfo{$Version}{$SizeInfoId}{"info"} =~ /low[ ]*:[ ]*(-?[0-9]+) /) + { + return $1; + } + else + { + return ""; + } + } + else + { + return 0; + } +} + +sub getStructMembType($) +{ + my $TypeMembInfoId = $_[0]; + if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /type[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getStructMembBitFieldSize($) +{ + my $TypeMembInfoId = $_[0]; + if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ / bitfield /) + { + return getSize($TypeMembInfoId); + } + else + { + return 0; + } +} + +sub getStructMembAccess($) +{ + my $MembInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($MembInfo =~ /accs[ ]*:[ ]*([a-zA-Z]+) /) + { + my $Access = $1; + if($Access eq "prot") + { + return "protected"; + } + elsif($Access eq "priv") + { + return "private"; + } + else + { + return "public"; + } + } + else + { + return "public"; + } +} + +sub getNextMembInfoId($) +{ + my $TypeMembInfoId = $_[0]; + if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /chan[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getNextStructMembInfoId($) +{ + my $TypeMembInfoId = $_[0]; + if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /chan[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub fieldHasName($) +{ + my $TypeMembInfoId = $_[0]; + if($LibInfo{$Version}{$TypeMembInfoId}{"info_type"} eq "field_decl") + { + if($LibInfo{$Version}{$TypeMembInfoId}{"info"} =~ /name[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return ""; + } + } + else + { + return 0; + } +} + +sub getTypeHeader($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) + { + return ($1, $2); + } + else + { + return (); + } +} + +sub register_header($$$) +{ + my ($Destination, $Position, $LibVersion) = @_; + return if(not $Destination); + if($Destination=~/\A\// and not -f $Destination) + { + print "\nERROR: specified header \'$Destination\' does not exist\n"; + return; + } + my $Header_Name = get_FileName($Destination); + $Headers{$LibVersion}{$Destination}{"Name"} = $Header_Name; + $Headers{$LibVersion}{$Destination}{"Position"} = $Position; + $Headers{$LibVersion}{$Destination}{"Identity"} = $Destination; + $HeaderName_Destinations{$LibVersion}{$Header_Name}{$Destination} = 1; +} + +sub headerSearch($) +{ + my $LibVersion = $_[0]; + foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Include_Paths"})) + { + $Dest =~ s/\A\s+|\s+\Z//g; + next if(not $Dest); + if(not -e $Dest) + { + print "ERROR: can't access \'$Dest\'\n"; + } + $Header_Dependency{$LibVersion}{$Dest} = 1; + } + foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Headers"})) + {#fill %Header_Dependency + if(-d $Dest) + { + foreach my $Dir (cmd_find($Dest,"d","")) + { + chomp($Dir); + $Header_Dependency{$LibVersion}{$Dir} = 1; + } + } + elsif(-f $Dest) + { + $Header_Dependency{$LibVersion}{get_Dir($Dest)} = 1; + } + } + my $Position = 0; + foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Headers"})) + { + $Dest =~ s/\A\s+|\s+\Z//g; + next if(not $Dest); + if(is_header($Dest, $LibVersion)) + { + register_header($Dest, $Position, $LibVersion); + $Position += 1; + } + elsif(-d $Dest) + { + foreach my $Destination (sort {lc($a) cmp lc($b)} (cmd_find($Dest,"f",""))) + { + chomp($Destination); + next if(not is_header($Destination, $LibVersion)); + register_header($Destination, $Position, $LibVersion); + $Position += 1; + } + } + else + { + print "WARNING: \'$Dest\' was not found in the specified include paths\n"; + register_header($Dest, $Position, $LibVersion); + $Position += 1; + } + } + if(keys(%{$Headers{$LibVersion}})==1) + { + my $Destination = (keys(%{$Headers{$LibVersion}}))[0]; + $Headers{$LibVersion}{$Destination}{"Identity"} = $Headers{$LibVersion}{$Destination}{"Name"}; + } + foreach my $Header_Name (keys(%{$HeaderName_Destinations{$LibVersion}})) + {#set relative paths (for dublicates) + if(keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})>1) + { + my $FirstDest = (keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}}))[0]; + my $Prefix = get_Dir($FirstDest); + while($Prefix =~ /\A(.+)\/[^\/]+\Z/) + { + my $NewPrefix = $1; + my $Changes_Number = 0; + my %Identity = (); + foreach my $Dest (keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})) + { + if($Dest =~ /\A$Prefix\/(.*)\Z/) + { + $Identity{$Dest} = $1; + $Changes_Number+=1; + } + } + if($Changes_Number eq keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})) + { + foreach my $Dest (keys(%{$HeaderName_Destinations{$LibVersion}{$Header_Name}})) + { + $Headers{$LibVersion}{$Dest}{"Identity"} = $Identity{$Dest}; + } + last; + } + $Prefix = $NewPrefix; + } + } + } + if(not keys(%{$Headers{$LibVersion}})) + { + print "ERROR: header files were not found\n"; + exit(1); + } +} + +sub get_FileName($) +{ + my $Path = $_[0]; + if($Path =~ /\A(.*\/)([^\/]*)\Z/) + { + return $2; + } + else + { + return $Path; + } +} + +sub get_Dir($) +{ + my $Path = $_[0]; + return "" if($Path =~ m*\A\./*); + if($Path =~ /\A(.*)\/([^\/]*)\Z/) + { + return $1; + } + else + { + return ""; + } +} + +sub esc($) +{ + my $Str = $_[0]; + $Str =~ s/([()\[\]{}$ &'"`;,<>])/\\$1/g; + return $Str; +} + +sub getLocation($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) + { + return ($1, $2); + } + else + { + return (); + } +} + +sub getHeader($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) + { + return $1; + } + else + { + return ""; + } +} + +sub getLine($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($TypeInfo =~ /srcp[ ]*:[ ]*([0-9a-zA-Z\_\-\<\>\.\+]+):([0-9]+) /) + { + return $2; + } + else + { + return ""; + } +} + +sub getTypeType($$) +{ + my ($TypeDeclId, $TypeId) = @_; + return "Const" if($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*c / and $LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@/); + return "Typedef" if($LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:/ and $LibInfo{$Version}{$TypeId}{"info"} !~ /qual[ ]*:/); + return "Volatile" if($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*v / and $LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@/); + return "Restrict" if($LibInfo{$Version}{$TypeId}{"info"} =~ /qual[ ]*:[ ]*r / and $LibInfo{$Version}{$TypeId}{"info"} =~ /unql[ ]*:[ ]*\@/); + my $TypeType = getTypeTypeByTypeId($TypeId); + if($TypeType eq "Struct") + { + if($TypeDeclId and $LibInfo{$Version}{$TypeDeclId}{"info_type"} eq "template_decl") + { + return "Template"; + } + else + { + return "Struct"; + } + } + else + { + return $TypeType; + } + +} + +sub getTypeTypeByTypeId($) +{ + my $TypeId = $_[0]; + my $TypeType = $LibInfo{$Version}{$TypeId}{"info_type"}; + if($TypeType =~ /integer_type|real_type|boolean_type|void_type|complex_type/) + { + return "Intrinsic"; + } + elsif(isFuncPtr($TypeId)) + { + return "FuncPtr"; + } + elsif($TypeType eq "pointer_type") + { + return "Pointer"; + } + elsif($TypeType eq "reference_type") + { + return "Ref"; + } + elsif($TypeType eq "union_type") + { + return "Union"; + } + elsif($TypeType eq "enumeral_type") + { + return "Enum"; + } + elsif($TypeType eq "record_type") + { + return "Struct"; + } + elsif($TypeType eq "array_type") + { + return "Array"; + } + elsif($TypeType eq "complex_type") + { + return "Intrinsic"; + } + elsif($TypeType eq "function_type") + { + return "FunctionType"; + } + elsif($TypeType eq "method_type") + { + return "MethodType"; + } + else + { + return "Unknown"; + } +} + +sub getNameByInfo($) +{ + my $TypeInfo = $LibInfo{$Version}{$_[0]}{"info"}; + return "" if($TypeInfo !~ /name[ ]*:[ ]*@([0-9]+) /); + my $TypeNameInfoId = $1; + return "" if($LibInfo{$Version}{$TypeNameInfoId}{"info"} !~ /strg[ ]*:[ ]*(.*)[ ]+lngt/); + my $TypeName = $1; + $TypeName =~ s/[ ]+\Z//g; + return $TypeName; +} + +sub getFuncShortName($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($FuncInfo =~ / operator /) + { + if($FuncInfo =~ /note[ ]*:[ ]*conversion /) + { + return "operator ".get_TypeName($FuncDescr{$Version}{$_[0]}{"Return"}); + } + else + { + return "" if($FuncInfo !~ / operator[ ]+([a-zA-Z]+) /); + return "operator".$Operator_Indication{$1}; + } + } + else + { + return "" if($FuncInfo !~ /name[ ]*:[ ]*@([0-9]+) /); + my $FuncNameInfoId = $1; + return "" if($LibInfo{$Version}{$FuncNameInfoId}{"info"} !~ /strg[ ]*:[ ]*([^ ]*)[ ]+lngt/); + return $1; + } +} + +sub getFuncMnglName($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + return "" if($FuncInfo !~ /mngl[ ]*:[ ]*@([0-9]+) /); + my $FuncMnglNameInfoId = $1; + return "" if($LibInfo{$Version}{$FuncMnglNameInfoId}{"info"} !~ /strg[ ]*:[ ]*([^ ]*)[ ]+/); + my $FuncMnglName = $1; + $FuncMnglName =~ s/[ ]+\Z//g; + return $FuncMnglName; +} + +sub getFuncReturn($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + return "" if($FuncInfo !~ /type[ ]*:[ ]*@([0-9]+) /); + my $FuncTypeInfoId = $1; + return "" if($LibInfo{$Version}{$FuncTypeInfoId}{"info"} !~ /retn[ ]*:[ ]*@([0-9]+) /); + my $FuncReturnTypeId = $1; + if($TypeDescr{$Version}{getTypeDeclId($FuncReturnTypeId)}{$FuncReturnTypeId}{"Type"} eq "Restrict") + {#delete restrict spec + $FuncReturnTypeId = getRestrictBase($FuncReturnTypeId); + } + return $FuncReturnTypeId; +} + +sub getFuncOrig($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($FuncInfo =~ /orig[ ]*:[ ]*@([0-9]+) /) + { + return $1; + } + else + { + return $_[0]; + } +} + +sub unmangleArray(@) +{ + if($#_>$MAX_COMMAND_LINE_ARGUMENTS) + { + my @Half = splice(@_, 0, ($#_+1)/2); + return (unmangleArray(@Half), unmangleArray(@_)) + } + else + { + my $UnmangleCommand = "c++filt ".join(" ", @_); + return split("\n", `$UnmangleCommand`); + } +} + +sub get_Signature($$) +{ + my ($Interface, $LibVersion) = @_; + return $Cache{"get_Signature"}{$Interface}{$LibVersion} if($Cache{"get_Signature"}{$Interface}{$LibVersion}); + my ($MnglName, $SymbolVersion) = ($Interface, ""); + if($Interface =~ /\A([^@]+)[\@]+([^@]+)\Z/) + { + ($MnglName, $SymbolVersion) = ($1, $2); + } + if($MnglName =~ /\A(_ZGV|_ZTI|_ZTS|_ZTT|_ZTV|_ZThn|_ZTv0_n)/) + { + $Cache{"get_Signature"}{$Interface}{$LibVersion} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); + return $Cache{"get_Signature"}{$Interface}{$LibVersion}; + } + if(not $CompleteSignature{$LibVersion}{$Interface}) + { + if($Interface =~ /\A_Z/) + { + $Cache{"get_Signature"}{$Interface}{$LibVersion} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); + return $Cache{"get_Signature"}{$Interface}{$LibVersion}; + } + else + { + $Cache{"get_Signature"}{$Interface}{$LibVersion} = $Interface; + return $Interface; + } + } + my ($Func_Signature, @Param_Types_FromUnmangledName) = (); + my $ShortName = $CompleteSignature{$LibVersion}{$Interface}{"ShortName"}; + if($Interface =~ /\A_Z/) + { + if($CompleteSignature{$LibVersion}{$Interface}{"Class"}) + { + $Func_Signature = get_TypeName($CompleteSignature{$LibVersion}{$Interface}{"Class"}, $LibVersion)."::".(($CompleteSignature{$LibVersion}{$Interface}{"Destructor"})?"~":"").$ShortName; + } + else + { + $Func_Signature = $ShortName; + } + @Param_Types_FromUnmangledName = get_Signature_Parts($tr_name{$MnglName}, 0); + } + else + { + $Func_Signature = $MnglName; + } + my @ParamArray = (); + foreach my $Pos (sort {int($a) <=> int($b)} keys(%{$CompleteSignature{$LibVersion}{$Interface}{"Param"}})) + { + next if($Pos eq ""); + my $ParamTypeId = $CompleteSignature{$LibVersion}{$Interface}{"Param"}{$Pos}{"type"}; + my $ParamTypeName = $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$ParamTypeId}}{$ParamTypeId}{"Name"}; + $ParamTypeName = $Param_Types_FromUnmangledName[$Pos] if(not $ParamTypeName); + if(my $ParamName = $CompleteSignature{$LibVersion}{$Interface}{"Param"}{$Pos}{"name"}) + { + if($ParamTypeName=~/\([*]+\)/) + { + $ParamTypeName=~s/\(([*]+)\)/\($1$ParamName\)/; + push(@ParamArray, $ParamTypeName); + } + else + { + push(@ParamArray, $ParamTypeName." ".$ParamName); + } + } + else + { + push(@ParamArray, $ParamTypeName); + } + } + if(not $CompleteSignature{$LibVersion}{$Interface}{"Data"}) + { + if($Interface=~/\A_Z/) + { + if($CompleteSignature{$LibVersion}{$Interface}{"Constructor"}) + { + if($Interface=~/C1/) + { + $Func_Signature .= " [in-charge]"; + } + elsif($Interface=~/C2/) + { + $Func_Signature .= " [not-in-charge]"; + } + } + elsif($CompleteSignature{$LibVersion}{$Interface}{"Destructor"}) + { + if($Interface=~/D1/) + { + $Func_Signature .= " [in-charge]"; + } + elsif($Interface=~/D2/) + { + $Func_Signature .= " [not-in-charge]"; + } + elsif($Interface=~/D0/) + { + $Func_Signature .= " [in-charge-deleting]"; + } + } + } + $Func_Signature .= " (".join(", ", @ParamArray).")"; + } + if($Interface=~/\A_ZNK/) + { + $Func_Signature .= " const"; + } + $Func_Signature .= "\@".$SymbolVersion if($SymbolVersion); + $Cache{"get_Signature"}{$Interface}{$LibVersion} = $Func_Signature; + return $Func_Signature; +} + +sub getVarNameByAttr($) +{ + my $FuncInfoId = $_[0]; + my $VarName; + return "" if(not $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}); + if($FuncDescr{$Version}{$FuncInfoId}{"Class"}) + { + $VarName .= $TypeDescr{$Version}{getTypeDeclId($FuncDescr{$Version}{$FuncInfoId}{"Class"})}{$FuncDescr{$Version}{$FuncInfoId}{"Class"}}{"Name"}; + $VarName .= "::"; + } + $VarName .= $FuncDescr{$Version}{$FuncInfoId}{"ShortName"}; + return $VarName; +} + +sub mangleFuncName($) +{ + my $FuncId = $_[0]; +} + +sub getFuncType($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + return "" if($FuncInfo !~ /type[ ]*:[ ]*@([0-9]+) /); + my $FuncTypeInfoId = $1; + my $FunctionType = $LibInfo{$Version}{$FuncTypeInfoId}{"info_type"}; + if($FunctionType eq "method_type") + { + return "Method"; + } + elsif($FunctionType eq "function_type") + { + return "Function"; + } + else + { + return $FunctionType; + } +} + +sub getFuncTypeId($) +{ + my $FuncInfo = $LibInfo{$Version}{$_[0]}{"info"}; + if($FuncInfo =~ /type[ ]*:[ ]*@([0-9]+)( |\Z)/) + { + return $1; + } + else + { + return 0; + } +} + +sub isNotAnon($) +{ + return (not isAnon($_[0])); +} + +sub isAnon($) +{ + return (($_[0] =~ m/\.\_[0-9]+/) or ($_[0] =~ m/anon-/)); +} + +sub unmangled_Compact($$) +#Removes all non-essential (for C++ language) whitespace from a string. If +#the whitespace is essential it will be replaced with exactly one ' ' +#character. Works correctly only for unmangled names. +#If level > 1 is supplied, can relax its intent to compact the string. +{ + my $result=$_[0]; + my $level = $_[1] || 1; + my $o1 = ($level>1)?' ':''; + #First, we reduce all spaces that we can + my $coms='[-()<>:*&~!|+=%@~"?.,/[^'."']"; + my $coms_nobr='[-()<:*&~!|+=%@~"?.,'."']"; + my $clos='[),;:\]]'; + $result=~s/^\s+//gm; + $result=~s/\s+$//gm; + $result=~s/((?!\n)\s)+/ /g; + $result=~s/(\w+)\s+($coms+)/$1$o1$2/gm; + #$result=~s/(\w)(\()/$1$o1$2/gm if $o1; + $result=~s/($coms+)\s+(\w+)/$1$o1$2/gm; + $result=~s/(\()\s+(\w)/$1$2/gm if $o1; + $result=~s/(\w)\s+($clos)/$1$2/gm; + $result=~s/($coms+)\s+($coms+)/$1 $2/gm; + $result=~s/($coms_nobr+)\s+($coms+)/$1$o1$2/gm; + $result=~s/($coms+)\s+($coms_nobr+)/$1$o1$2/gm; + #don't forget about >> and <:. In unmangled names global-scope modifier + #is not used, so <: will always be a digraph and requires no special treatment. + #We also try to remove other parts that are better to be removed here than in other places + #double-cv + $result=~s/\bconst\s+const\b/const/gm; + $result=~s/\bvolatile\s+volatile\b/volatile/gm; + $result=~s/\bconst\s+volatile\b\s+const\b/const volatile/gm; + $result=~s/\bvolatile\s+const\b\s+volatile\b/const volatile/gm; + #Place cv in proper order + $result=~s/\bvolatile\s+const\b/const volatile/gm; + return $result; +} + +sub unmangled_PostProcess($) +{ + my $result = $_[0]; + #s/\bunsigned int\b/unsigned/g; + $result =~ s/\bshort unsigned int\b/unsigned short/g; + $result =~ s/\bshort int\b/short/g; + $result =~ s/\blong long unsigned int\b/unsigned long long/g; + $result =~ s/\blong unsigned int\b/unsigned long/g; + $result =~ s/\blong long int\b/long long/g; + $result =~ s/\blong int\b/long/g; + $result =~ s/\)const\b/\) const/g; + $result =~ s/\blong long unsigned\b/unsigned long long/g; + $result =~ s/\blong unsigned\b/unsigned long/g; + return $result; +} + +# From libtodb2/libtodb.pm +# Trim string spaces. +sub trim($) +{ + my $string = shift; + $string =~ s/^\s+//; + $string =~ s/\s+$//; + return $string; +} + +sub correctName($) +{#type name correction + my $CorrectName = $_[0]; + $CorrectName = unmangled_Compact($CorrectName, 1); + $CorrectName = unmangled_PostProcess($CorrectName); + return $CorrectName; +} + +sub getDump_AllInOne() +{ + return if(not keys(%Headers)); + `mkdir -p temp && rm -f temp/*`; + my $Header_Depend = ""; + foreach my $Dep (sort {length($a) <=> length($b)} keys(%{$Header_Dependency{$Version}})) + { + $Header_Depend .= " -I".esc($Dep); + } + my $Lib_VersionName = esc($TargetLibraryName)."_v".$Version; + open(LIB_HEADER, ">temp/$TargetLibraryName"."_v$Version.h"); + foreach my $Preamble_Header (sort {int($Include_Preamble{$Version}{$a}{"Position"})<=>int($Include_Preamble{$Version}{$b}{"Position"})} keys(%{$Include_Preamble{$Version}})) + { + print LIB_HEADER "#include <$Preamble_Header>\n"; + } + foreach my $Destination (sort {int($Headers{$Version}{$a}{"Position"})<=>int($Headers{$Version}{$b}{"Position"})} keys(%{$Headers{$Version}})) + { + my $HName = get_FileName($Destination); + next if($Include_Preamble{$Version}{$Destination} or ($Include_Preamble{$Version}{$HName} and $HeaderName_Destinations{$Version}{$HName} and keys(%{$HeaderName_Destinations{$Version}{$HName}})==1)); + print LIB_HEADER "#include <$Destination>\n"; + } + close(LIB_HEADER); + system("g++ >".esc($ERR_PATH{$Version})." 2>&1 -fdump-translation-unit temp/$Lib_VersionName.h $CompilerOptions{$Version} $Header_Depend"); + if($?) + { + print "WARNING: some errors have occured while compiling header(s), fix it first!\nyou can see compilation errors in the file \'$ERR_PATH{$Version}\'\n"; + } + $ConstantsSrc{$Version} = cmd_preprocessor("temp/$Lib_VersionName.h", $CompilerOptions{$Version}." ".$Header_Depend, "define\\ \\|undef\\ \\|#[ ]\\+[0-9]\\+ \".*\""); + system("mkdir", "-p", "header_compile_errors/$TargetLibraryName/temp/"); + system("cp", "-f", "temp/$TargetLibraryName"."_v$Version.h", "header_compile_errors/$TargetLibraryName/temp/"); + return (split("\n", `find . -maxdepth 1 -name "$Lib_VersionName\.h*\.tu"`))[0]; +} + +sub getDump_Separately($) +{ + `mkdir -p temp`; + `rm -f temp/*`; + my $Destination = $_[0]; + my $Header_Depend = ""; + foreach my $Dep (sort {length($a) <=> length($b)} keys(%{$Header_Dependency{$Version}})) + { + $Header_Depend .= " -I".esc($Dep); + } + my $Lib_VersionName = esc($TargetLibraryName)."_v".$Version; + open(LIB_HEADER, ">temp/$TargetLibraryName"."_v$Version.h"); + foreach my $Preamble_Header (sort {int($Include_Preamble{$Version}{$a}{"Position"})<=>int($Include_Preamble{$Version}{$b}{"Position"})} keys(%{$Include_Preamble{$Version}})) + { + print LIB_HEADER "#include <$Preamble_Header>\n"; + } + my $Destination_HName = get_FileName($Destination); + if(not ( $Include_Preamble{$Version}{$Destination} or ($Include_Preamble{$Version}{$Destination_HName} and $HeaderName_Destinations{$Version}{$Destination_HName} and keys(%{$HeaderName_Destinations{$Version}{$Destination_HName}})==1) )) + { + print LIB_HEADER "#include <$Destination>\n"; + } + close(LIB_HEADER); + system("g++ >>".esc($ERR_PATH{$Version})." 2>&1 -fdump-translation-unit temp/$Lib_VersionName.h $CompilerOptions{$Version} $Header_Depend"); + if($?) + { + $HeaderCompileError{get_FileName($Destination)} = 1; + } + $ConstantsSrc{$Version} .= cmd_preprocessor("temp/$Lib_VersionName.h", $CompilerOptions{$Version}." ".$Header_Depend, "define\\ \\|undef\\ \\|#[ ]\\+[0-9]\\+ \".*\""); + return (split("\n", `find . -maxdepth 1 -name "$Lib_VersionName\.h*\.tu"`))[0]; +} + +sub cmd_file($) +{ + my $Path = $_[0]; + return "" if(not $Path or not -e $Path); + my $Cmd = "file ".esc($Path); + my $Cmd_Out = `$Cmd`; + return $Cmd_Out; +} + +sub cmd_preprocessor($$$) +{ + my ($Path, $AddOpt, $Grep) = @_; + return "" if(not $Path or not -f $Path); + my $Cmd = "g++ -dD -E -x c++-header ".esc($Path)." 2>/dev/null $AddOpt"; + if($Grep) + { + $Cmd .= " | grep \"$Grep\""; + } + my $Cmd_Out = `$Cmd`; + return $Cmd_Out; +} + +sub cmd_cat($$) +{ + my ($Path, $Grep) = @_; + return "" if(not $Path or not -e $Path); + my $Cmd = "cat ".esc($Path); + if($Grep) + { + $Cmd .= " | grep \"$Grep\""; + } + my $Cmd_Out = `$Cmd`; + return $Cmd_Out; +} + +sub cmd_find($$$) +{ + my ($Path, $Type, $Name) = @_; + return () if(not $Path or not -e $Path); + my $Cmd = "find ".esc($Path); + if($Type) + { + $Cmd .= " -type $Type"; + } + if($Name) + { + $Cmd .= " -name \"$Name\""; + } + return split("\n", `$Cmd`); +} + +sub cmd_tar($) +{ + my $Path = $_[0]; + return "" if(not $Path or not -e $Path); + my $Cmd = "tar -xvzf ".esc($Path); + my $Cmd_Out = `$Cmd`; + return $Cmd_Out; +} + +sub is_header($$) +{ + my ($Destination, $LibVersion) = @_; + return 0 if(-d $Destination); + return 1 if($Destination =~ /\.(h|hh|hhh|hpp|tcc)\Z/i); + return 0 if($Destination =~ /\.\w+\Z/i);#cpp|c|gch|tu|fs|pas + if($Destination =~ /\A\//) + { + return (cmd_file($Destination) =~ /:[ ]*ASCII C[\+]* program text/); + } + else + { + foreach my $Prefix (keys(%{$Header_Dependency{$LibVersion}})) + { + my $Path = $Prefix."/".$Destination; + if(-f $Path) + { + if(cmd_file($Path) =~ /:[ ]*ASCII C[\+]* program text/) + { + return 1; + } + } + } + return 0; + } +} + +sub parseHeaders_AllInOne($) +{ + $Version = $_[0]; + print "checking header(s) ".$Descriptor{$Version}{"Version"}." ...\n"; + system("mkdir", "-p", "header_compile_errors/".$TargetLibraryName); + system("rm", "-fr", $ERR_PATH{$Version}); + my $DumpPath = getDump_AllInOne(); + if(not $DumpPath) + { + print "\nERROR: can't create gcc syntax tree for header(s)\nyou can see compilation errors in the file '$ERR_PATH{$Version}'\n"; + exit(1); + } + getInfo($DumpPath); + parse_constants(); + system("rm", "-fr", "temp"); +} + +sub parseHeader($) +{ + my $Destination = $_[0]; + my $DumpPath = getDump_Separately($Destination); + if(not $DumpPath) + { + print "ERROR: can't create gcc syntax tree for header\nyou can see compilation errors in the file '$ERR_PATH{$Version}'\n"; + exit(1); + } + getInfo($DumpPath); + parse_constants(); + system("rm", "-fr", "temp"); +} + +sub is_in_library($$) +{ + my ($MnglName, $LibVersion) = @_; + return ($Interface_Library{$LibVersion}{$MnglName} or ($SymVer{$LibVersion}{$MnglName} and $Interface_Library{$LibVersion}{$SymVer{$LibVersion}{$MnglName}})); +} + +sub prepareInterfaces($) +{ + my $LibVersion = $_[0]; + my (@MnglNames, @UnMnglNames) = (); + if($CheckHeadersOnly) + { + foreach my $FuncInfoId (sort keys(%{$FuncDescr{$LibVersion}})) + { + if($FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"} =~ /\A_Z/) + { + push(@MnglNames, $FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}); + } + } + if($#MnglNames > -1) + { + @UnMnglNames = reverse(unmangleArray(@MnglNames)); + foreach my $FuncInfoId (sort keys(%{$FuncDescr{$LibVersion}})) + { + if($FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"} =~ /\A_Z/) + { + my $UnmangledName = pop(@UnMnglNames); + $tr_name{$FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}} = $UnmangledName; + } + } + } + } + my (%NotMangled_Int, %Mangled_Int) = (); + foreach my $FuncInfoId (keys(%{$FuncDescr{$LibVersion}})) + { + my $MnglName = $FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}; + if($MnglName=~/\A_Z/) + { + $Mangled_Int{$FuncInfoId} = $MnglName; + } + else + { + $NotMangled_Int{$FuncInfoId} = $MnglName; + } + next if(not $MnglName or not is_in_library($MnglName, $LibVersion) and not $CheckHeadersOnly); + next if($MnglName =~ /\A_Z/ and $tr_name{$MnglName} =~ /\.\_[0-9]/); + next if(not $FuncDescr{$LibVersion}{$FuncInfoId}{"Header"}); + %{$CompleteSignature{$LibVersion}{$MnglName}} = %{$FuncDescr{$LibVersion}{$FuncInfoId}}; + #interface and its symlink have same signatures + if($SymVer{$LibVersion}{$MnglName}) + { + %{$CompleteSignature{$LibVersion}{$SymVer{$LibVersion}{$MnglName}}} = %{$FuncDescr{$LibVersion}{$FuncInfoId}}; + } + delete($FuncDescr{$LibVersion}{$FuncInfoId}); + } + if(keys(%Mangled_Int)) + { + foreach my $Interface_Id (keys(%NotMangled_Int)) + { + delete($CompleteSignature{$LibVersion}{$NotMangled_Int{$Interface_Id}}); + } + } +} + +my %UsedType; +sub cleanData($) +{ + my $LibVersion = $_[0]; + foreach my $FuncInfoId (keys(%{$FuncDescr{$LibVersion}})) + { + my $MnglName = $FuncDescr{$LibVersion}{$FuncInfoId}{"MnglName"}; + if(not $MnglName or not is_in_library($MnglName, $LibVersion) and not $CheckHeadersOnly) + { + delete($FuncDescr{$LibVersion}{$FuncInfoId}); + next; + } + if(defined $InterfacesListPath and not $InterfacesList{$MnglName}) + { + delete($FuncDescr{$LibVersion}{$FuncInfoId}); + next; + } + if(defined $AppPath and not $InterfacesList_App{$MnglName}) + { + delete($FuncDescr{$LibVersion}{$FuncInfoId}); + next; + } + my %FuncInfo = %{$FuncDescr{$LibVersion}{$FuncInfoId}}; + detect_TypeUsing($Tid_TDid{$LibVersion}{$FuncInfo{"Return"}}, $FuncInfo{"Return"}, $LibVersion); + detect_TypeUsing($Tid_TDid{$LibVersion}{$FuncInfo{"Class"}}, $FuncInfo{"Class"}, $LibVersion); + foreach my $Param_Pos (keys(%{$FuncInfo{"Param"}})) + { + my $Param_TypeId = $FuncInfo{"Param"}{$Param_Pos}{"type"}; + detect_TypeUsing($Tid_TDid{$LibVersion}{$Param_TypeId}, $Param_TypeId, $LibVersion); + } + } + foreach my $TDid (keys(%{$TypeDescr{$LibVersion}})) + { + foreach my $Tid (keys(%{$TypeDescr{$LibVersion}{$TDid}})) + { + if(not $UsedType{$LibVersion}{$TDid}{$Tid}) + { + delete($TypeDescr{$LibVersion}{$TDid}{$Tid}); + if(not keys(%{$TypeDescr{$LibVersion}{$TDid}})) + { + delete($TypeDescr{$LibVersion}{$TDid}); + } + delete($Tid_TDid{$LibVersion}{$Tid}) if($Tid_TDid{$LibVersion}{$Tid} eq $TDid); + } + } + } +} + +sub detect_TypeUsing($$$) +{ + my ($TypeDeclId, $TypeId, $LibVersion) = @_; + return if($UsedType{$LibVersion}{$TypeDeclId}{$TypeId}); + my %Type = get_Type($TypeDeclId, $TypeId, $LibVersion); + if($Type{"Type"} =~ /Struct|Union|Class|FuncPtr|Enum/) + { + $UsedType{$LibVersion}{$TypeDeclId}{$TypeId} = 1; + foreach my $Memb_Pos (keys(%{$Type{"Memb"}})) + { + my $Member_TypeId = $Type{"Memb"}{$Memb_Pos}{"type"}; + detect_TypeUsing($Tid_TDid{$LibVersion}{$Member_TypeId}, $Member_TypeId, $LibVersion); + } + if($Type{"Type"} eq "FuncPtr") + { + my $ReturnType = $Type{"Return"}; + detect_TypeUsing($Tid_TDid{$LibVersion}{$ReturnType}, $ReturnType, $LibVersion); + } + } + elsif($Type{"Type"} =~ /Const|Pointer|Ref|Volatile|Restrict|Array|/) + { + $UsedType{$LibVersion}{$TypeDeclId}{$TypeId} = 1; + detect_TypeUsing($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); + } + elsif($Type{"Type"} eq "Intrinsic") + { + $UsedType{$LibVersion}{$TypeDeclId}{$TypeId} = 1; + } + else + { + delete($TypeDescr{$LibVersion}{$TypeDeclId}{$TypeId}); + if(not keys(%{$TypeDescr{$LibVersion}{$TypeDeclId}})) + { + delete($TypeDescr{$LibVersion}{$TypeDeclId}); + } + delete($Tid_TDid{$LibVersion}{$TypeId}) if($Tid_TDid{$LibVersion}{$TypeId} eq $TypeDeclId); + } +} + +sub initializeClassVirtFunc($) +{ + my $LibVersion = $_[0]; + foreach my $Interface (keys(%{$CompleteSignature{$LibVersion}})) + { + if($CompleteSignature{$LibVersion}{$Interface}{"Virt"}) + { + my $ClassName = $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$CompleteSignature{$LibVersion}{$Interface}{"Class"}}}{$CompleteSignature{$LibVersion}{$Interface}{"Class"}}{"Name"}; + $ClassVirtFunc{$LibVersion}{$ClassName}{$Interface} = 1; + $ClassIdVirtFunc{$LibVersion}{$CompleteSignature{$LibVersion}{$Interface}{"Class"}}{$Interface} = 1; + $ClassId{$LibVersion}{$ClassName} = $CompleteSignature{$LibVersion}{$Interface}{"Class"}; + } + } +} + +sub checkVirtFuncRedefinitions($) +{ + my $LibVersion = $_[0]; + foreach my $Class_Name (keys(%{$ClassVirtFunc{$LibVersion}})) + { + $CheckedTypes{$Class_Name} = 1; + foreach my $VirtFuncName (keys(%{$ClassVirtFunc{$LibVersion}{$Class_Name}})) + { + $CompleteSignature{$LibVersion}{$VirtFuncName}{"VirtualRedefine"} = find_virtual_method_in_base_classes($VirtFuncName, $ClassId{$LibVersion}{$Class_Name}, $LibVersion); + } + } +} + +sub setVirtFuncPositions($) +{ + my $LibVersion = $_[0]; + foreach my $Class_Name (keys(%{$ClassVirtFunc{$LibVersion}})) + { + $CheckedTypes{$Class_Name} = 1; + my $Position = 0; + foreach my $VirtFuncName (sort {int($CompleteSignature{$LibVersion}{$a}{"Line"}) <=> int($CompleteSignature{$LibVersion}{$b}{"Line"})} keys(%{$ClassVirtFunc{$LibVersion}{$Class_Name}})) + { + if($ClassVirtFunc{1}{$Class_Name}{$VirtFuncName} and $ClassVirtFunc{2}{$Class_Name}{$VirtFuncName} and not $CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"} and not $CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}) + { + $CompleteSignature{$LibVersion}{$VirtFuncName}{"Position"} = $Position; + $Position += 1; + } + } + } +} + +sub check_VirtualTable($$) +{ + my ($TargetFunction, $LibVersion) = @_; + my $Class_Id = $CompleteSignature{$LibVersion}{$TargetFunction}{"Class"}; + my $Class_DId = $Tid_TDid{$LibVersion}{$Class_Id}; + my %Class_Type = get_Type($Class_DId, $Class_Id, $LibVersion); + $CheckedTypes{$Class_Type{"Name"}} = 1; + foreach my $VirtFuncName (keys(%{$ClassVirtFunc{2}{$Class_Type{"Name"}}})) + {#Added + if($ClassId{1}{$Class_Type{"Name"}} and not $ClassVirtFunc{1}{$Class_Type{"Name"}}{$VirtFuncName} and $AddedInt{$VirtFuncName}) + { + if($CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}) + { + if($TargetFunction eq $VirtFuncName) + { + my $BaseClass_Id = $CompleteSignature{2}{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}{"Class"}; + my %BaseClass_Type = get_Type($Tid_TDid{2}{$BaseClass_Id}, $BaseClass_Id, 2); + my $BaseClass_Name = $BaseClass_Type{"Name"}; + %{$CompatProblems{$TargetFunction}{"Virtual_Function_Redefinition"}{$tr_name{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}}}=( + "Type_Name"=>$Class_Type{"Name"}, + "Type_Type"=>$Class_Type{"Type"}, + "Header"=>$CompleteSignature{2}{$TargetFunction}{"Header"}, + "Line"=>$CompleteSignature{2}{$TargetFunction}{"Line"}, + "Target"=>$tr_name{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}, + "Signature"=>$tr_name{$TargetFunction}, + "Old_Value"=>$tr_name{$CompleteSignature{2}{$VirtFuncName}{"VirtualRedefine"}}, + "New_Value"=>$tr_name{$TargetFunction}, + "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, + "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); + } + } + elsif($TargetFunction ne $VirtFuncName) + { + %{$CompatProblems{$TargetFunction}{"Added_Virtual_Function"}{$tr_name{$VirtFuncName}}}=( + "Type_Name"=>$Class_Type{"Name"}, + "Type_Type"=>$Class_Type{"Type"}, + "Header"=>$Class_Type{"Header"}, + "Line"=>$Class_Type{"Line"}, + "Target"=>$tr_name{$VirtFuncName}, + "Signature"=>$tr_name{$TargetFunction}, + "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, + "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); + } + } + } + foreach my $VirtFuncName (keys(%{$ClassVirtFunc{1}{$Class_Type{"Name"}}})) + {#Withdrawn + if($ClassId{2}{$Class_Type{"Name"}} and not $ClassVirtFunc{2}{$Class_Type{"Name"}}{$VirtFuncName} and $WithdrawnInt{$VirtFuncName}) + { + if($CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}) + { + if($TargetFunction eq $VirtFuncName) + { + my $BaseClass_Id = $CompleteSignature{1}{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}{"Class"}; + my $BaseClass_Name = $TypeDescr{1}{$Tid_TDid{1}{$BaseClass_Id}}{$BaseClass_Id}{"Name"}; + %{$CompatProblems{$TargetFunction}{"Virtual_Function_Redefinition_B"}{$tr_name{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}}}=( + "Type_Name"=>$Class_Type{"Name"}, + "Type_Type"=>$Class_Type{"Type"}, + "Header"=>$CompleteSignature{2}{$TargetFunction}{"Header"}, + "Line"=>$CompleteSignature{2}{$TargetFunction}{"Line"}, + "Target"=>$tr_name{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}, + "Signature"=>$tr_name{$TargetFunction}, + "Old_Value"=>$tr_name{$TargetFunction}, + "New_Value"=>$tr_name{$CompleteSignature{1}{$VirtFuncName}{"VirtualRedefine"}}, + "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, + "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); + } + } + else + { + %{$CompatProblems{$TargetFunction}{"Withdrawn_Virtual_Function"}{$tr_name{$VirtFuncName}}}=( + "Type_Name"=>$Class_Type{"Name"}, + "Type_Type"=>$Class_Type{"Type"}, + "Header"=>$Class_Type{"Header"}, + "Line"=>$Class_Type{"Line"}, + "Target"=>$tr_name{$VirtFuncName}, + "Signature"=>$tr_name{$TargetFunction}, + "Old_SoName"=>$Interface_Library{1}{$TargetFunction}, + "New_SoName"=>$Interface_Library{2}{$TargetFunction} ); + } + } + } +} + +sub find_virtual_method_in_base_classes($$$) +{ + my ($VirtFuncName, $Checked_ClassId, $LibVersion) = @_; + foreach my $BaseClass_Id (keys(%{$TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$Checked_ClassId}}{$Checked_ClassId}{"BaseClass"}})) + { + my $VirtMethodInClass = find_virtual_method_in_class($VirtFuncName, $BaseClass_Id, $LibVersion); + if($VirtMethodInClass) + { + return $VirtMethodInClass; + } + my $VirtMethodInBaseClasses = find_virtual_method_in_base_classes($VirtFuncName, $BaseClass_Id, $LibVersion); + if($VirtMethodInBaseClasses) + { + return $VirtMethodInBaseClasses; + } + } + return ""; +} + +sub find_virtual_method_in_class($$$) +{ + my ($VirtFuncName, $Checked_ClassId, $LibVersion) = @_; + my $Suffix = getFuncSuffix($VirtFuncName, $LibVersion); + foreach my $Checked_VirtFuncName (keys(%{$ClassIdVirtFunc{$LibVersion}{$Checked_ClassId}})) + { + if($Suffix eq getFuncSuffix($Checked_VirtFuncName, $LibVersion) + and ((not $CompleteSignature{$LibVersion}{$VirtFuncName}{"Constructor"} and not $CompleteSignature{$LibVersion}{$VirtFuncName}{"Destructor"} and $CompleteSignature{$LibVersion}{$VirtFuncName}{"ShortName"} eq $CompleteSignature{$LibVersion}{$Checked_VirtFuncName}{"ShortName"}) or ($CompleteSignature{$LibVersion}{$VirtFuncName}{"Constructor"} or $CompleteSignature{$LibVersion}{$VirtFuncName}{"Destructor"}))) + { + return $Checked_VirtFuncName; + } + } + return ""; +} + +sub getFuncSuffix($$) +{ + my ($FuncName, $LibVersion) = @_; + my $ClassId = $CompleteSignature{$LibVersion}{$FuncName}{"Class"}; + my $ClassName = $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$ClassId}}{$ClassId}{"Name"}; + my $ShortName = $CompleteSignature{$LibVersion}{$FuncName}{"ShortName"}; + my $Suffix = $tr_name{$FuncName}; + $Suffix =~ s/\A$ClassName\:\:[~]*$ShortName[ ]*//g; + return $Suffix; +} + +sub isRecurType($$$$) +{ + foreach (@RecurTypes) + { + if($_->{"Tid1"} eq $_[0] + and $_->{"TDid1"} eq $_[1] + and $_->{"Tid2"} eq $_[2] + and $_->{"TDid2"} eq $_[3]) + { + return 1; + } + } + return 0; +} + +sub find_MemberPair_Pos_byName($$) +{ + my ($Member_Name, $Pair_Type) = @_; + foreach my $MemberPair_Pos (sort keys(%{$Pair_Type->{"Memb"}})) + { + if($Pair_Type->{"Memb"}{$MemberPair_Pos}{"name"} eq $Member_Name) + { + return $MemberPair_Pos; + } + } + return "lost"; +} + +sub getBitfieldSum($$) +{ + my ($Member_Pos, $Pair_Type) = @_; + my $BitfieldSum = 0; + while($Member_Pos>-1) + { + return $BitfieldSum if(not $Pair_Type->{"Memb"}{$Member_Pos}{"bitfield"}); + $BitfieldSum += $Pair_Type->{"Memb"}{$Member_Pos}{"bitfield"}; + $Member_Pos -= 1; + } + return $BitfieldSum; +} + +sub find_MemberPair_Pos_byVal($$) +{ + my ($Member_Value, $Pair_Type) = @_; + foreach my $MemberPair_Pos (sort keys(%{$Pair_Type->{"Memb"}})) + { + if($Pair_Type->{"Memb"}{$MemberPair_Pos}{"value"} eq $Member_Value) + { + return $MemberPair_Pos; + } + } + return "lost"; +} + +my %Priority_Value=( +"High"=>3, +"Medium"=>2, +"Low"=>1 +); + +sub max_priority($$) +{ + my ($Priority1, $Priority2) = @_; + if(cmp_priority($Priority1, $Priority2)) + { + return $Priority1; + } + else + { + return $Priority2; + } +} + +sub cmp_priority($$) +{ + my ($Priority1, $Priority2) = @_; + return ($Priority_Value{$Priority1}>$Priority_Value{$Priority2}); +} + +sub set_Problems_Priority() +{ + foreach my $InterfaceName (sort keys(%CompatProblems)) + { + foreach my $Kind (sort keys(%{$CompatProblems{$InterfaceName}})) + { + foreach my $Location (sort keys(%{$CompatProblems{$InterfaceName}{$Kind}})) + { + my $IsInTypeInternals = $CompatProblems{$InterfaceName}{$Kind}{$Location}{"IsInTypeInternals"}; + my $InitialType_Type = $CompatProblems{$InterfaceName}{$Kind}{$Location}{"InitialType_Type"}; + if($Kind eq "Function_Become_Static") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Function_Become_NonStatic") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Parameter_Type_And_Size") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Parameter_Type") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Withdrawn_Parameter") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Added_Parameter") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Parameter_BaseType_And_Size") + { + if($InitialType_Type eq "Pointer") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + } + elsif($Kind eq "Parameter_BaseType") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Parameter_PointerLevel") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Return_Type_And_Size") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Return_Type") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Return_BaseType_And_Size") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Return_BaseType") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Return_PointerLevel") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + if($Kind eq "Added_Virtual_Function") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Withdrawn_Virtual_Function") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Virtual_Function_Position") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + elsif($Kind eq "Virtual_Function_Redefinition") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Virtual_Function_Redefinition_B") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Size") + { + if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + if($IsInTypeInternals) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + else + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + } + } + elsif($Kind eq "BaseType") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Added_Member_And_Size") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Added_Middle_Member_And_Size") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Withdrawn_Member_And_Size") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Withdrawn_Member") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Withdrawn_Middle_Member_And_Size") + { + if($IsInTypeInternals) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + else + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + } + elsif($Kind eq "Withdrawn_Middle_Member") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Member_Rename") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Enum_Member_Value") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + elsif($Kind eq "Enum_Member_Name") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Member_Type_And_Size") + { + if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + if($IsInTypeInternals) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + } + } + elsif($Kind eq "Member_Type") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Member_BaseType_And_Size") + { + if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + if($IsInTypeInternals) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "High"; + } + } + } + elsif($Kind eq "Member_BaseType") + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + elsif($Kind eq "Member_PointerLevel") + { + if(($InitialType_Type eq "Pointer") or ($InitialType_Type eq "Array")) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + if($IsInTypeInternals) + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Low"; + } + else + { + $CompatProblems{$InterfaceName}{$Kind}{$Location}{"Priority"} = "Medium"; + } + } + } + } + } + } +} + +sub pushType($$$$) +{ + my %TypeDescriptor=( + "Tid1" => $_[0], + "TDid1" => $_[1], + "Tid2" => $_[2], + "TDid2" => $_[3] ); + push(@RecurTypes, \%TypeDescriptor); +} + +sub mergeTypes($$$$) +{ + my ($Type1_Id, $Type1_DId, $Type2_Id, $Type2_DId) = @_; + my (%Sub_SubProblems, %SubProblems) = (); + if((not $Type1_Id and not $Type1_DId) or (not $Type2_Id and not $Type2_DId)) + {#Not Empty Inputs Only + return (); + } + if($Cache{"mergeTypes"}{$Type1_Id}{$Type1_DId}{$Type2_Id}{$Type2_DId}) + {#Already Merged + return %{$Cache{"mergeTypes"}{$Type1_Id}{$Type1_DId}{$Type2_Id}{$Type2_DId}}; + } + my %Type1 = get_Type($Type1_DId, $Type1_Id, 1); + my %Type2 = get_Type($Type2_DId, $Type2_Id, 2); + my %Type1_Pure = get_PureType($Type1_DId, $Type1_Id, 1); + my %Type2_Pure = get_PureType($Type2_DId, $Type2_Id, 2); + return () if(not $Type1_Pure{"Size"} or not $Type2_Pure{"Size"}); + if(isRecurType($Type1_Pure{"Tid"}, $Type1_Pure{"TDid"}, $Type2_Pure{"Tid"}, $Type2_Pure{"TDid"})) + {#Recursive Declarations + return (); + } + return if(not $Type1_Pure{"Name"} or not $Type2_Pure{"Name"}); + return if($OpaqueTypes{1}{$Type1_Pure{"Name"}} or $OpaqueTypes{2}{$Type1_Pure{"Name"}} or $OpaqueTypes{1}{$Type1{"Name"}} or $OpaqueTypes{2}{$Type1{"Name"}}); + + my %Typedef_1 = goToFirst($Type1{"TDid"}, $Type1{"Tid"}, 1, "Typedef"); + my %Typedef_2 = goToFirst($Type2{"TDid"}, $Type2{"Tid"}, 2, "Typedef"); + if($Typedef_1{"Type"} eq "Typedef" and $Typedef_2{"Type"} eq "Typedef" and $Typedef_1{"Name"} eq $Typedef_2{"Name"}) + { + my %Base_1 = get_OneStep_BaseType($Typedef_1{"TDid"}, $Typedef_1{"Tid"}, 1); + my %Base_2 = get_OneStep_BaseType($Typedef_2{"TDid"}, $Typedef_2{"Tid"}, 2); + if($Base_1{"Name"}!~/anon\-/ and $Base_2{"Name"}!~/anon\-/ + and ($Base_1{"Name"} ne $Base_2{"Name"})) + { + %{$SubProblems{"BaseType"}{$Typedef_1{"Name"}}}=( + "Type_Name"=>$Typedef_1{"Name"}, + "Type_Type"=>"Typedef", + "Header"=>$Typedef_2{"Header"}, + "Line"=>$Typedef_2{"Line"}, + "Old_Value"=>$Base_1{"Name"}, + "New_Value"=>$Base_2{"Name"} ); + } + } + + if(($Type1_Pure{"Name"} ne $Type2_Pure{"Name"}) and ($Type1_Pure{"Type"} ne "Pointer") and $Type1_Pure{"Name"}!~/anon\-/) + {#Different types + return (); + } + + pushType($Type1_Pure{"Tid"}, $Type1_Pure{"TDid"}, $Type2_Pure{"Tid"}, $Type2_Pure{"TDid"}); + if(($Type1_Pure{"Name"} eq $Type2_Pure{"Name"}) and ($Type1_Pure{"Type"} =~ /Struct|Class|Union/)) + {#Check Size + if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) + { + %{$SubProblems{"Size"}{$Type1_Pure{"Name"}}}=( + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}, + "Old_Value"=>$Type1_Pure{"Size"}, + "New_Value"=>$Type2_Pure{"Size"} ); + } + } + if($Type1_Pure{"Name"} and $Type2_Pure{"Name"} and ($Type1_Pure{"Name"} ne $Type2_Pure{"Name"}) and ($Type1_Pure{"Name"} !~ /\Avoid[ ]*\*/) and ($Type2_Pure{"Name"} =~ /\Avoid[ ]*\*/)) + {#Check "void *" + pop(@RecurTypes); + return (); + } + if($Type1_Pure{"BaseType"}{"Tid"} and $Type2_Pure{"BaseType"}{"Tid"}) + {#Check Base Types + %Sub_SubProblems = &mergeTypes($Type1_Pure{"BaseType"}{"Tid"}, $Type1_Pure{"BaseType"}{"TDid"}, $Type2_Pure{"BaseType"}{"Tid"}, $Type2_Pure{"BaseType"}{"TDid"}); + foreach my $Sub_SubProblemType (keys(%Sub_SubProblems)) + { + foreach my $Sub_SubLocation (keys(%{$Sub_SubProblems{$Sub_SubProblemType}})) + { + %{$SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}} = %{$Sub_SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}}; + $SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}{"InitialType_Type"} = $Type1_Pure{"Type"}; + } + } + } + foreach my $Member_Pos (sort keys(%{$Type1_Pure{"Memb"}})) + {#Check Members + next if($Type1_Pure{"Memb"}{$Member_Pos}{"access"} eq "private"); + my $Member_Name = $Type1_Pure{"Memb"}{$Member_Pos}{"name"}; + next if(not $Member_Name); + my $Member_Location = $Member_Name; + my $MemberPair_Pos = find_MemberPair_Pos_byName($Member_Name, \%Type2_Pure); + if(($MemberPair_Pos eq "lost") and (($Type2_Pure{"Type"} eq "Struct") or ($Type2_Pure{"Type"} eq "Class"))) + {#Withdrawn_Member + if($Member_Pos > keys(%{$Type2_Pure{"Memb"}}) - 1) + { + if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) + { + %{$SubProblems{"Withdrawn_Member_And_Size"}{$Member_Name}}=( + "Target"=>$Member_Name, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}, + "Old_Size"=>$Type1_Pure{"Size"}, + "New_Size"=>$Type2_Pure{"Size"} ); + } + else + { + %{$SubProblems{"Withdrawn_Member"}{$Member_Name}}=( + "Target"=>$Member_Name, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"} ); + } + next; + } + elsif($Member_Pos < keys(%{$Type1_Pure{"Memb"}}) - 1) + { + my $MemberType_Id = $Type1_Pure{"Memb"}{$Member_Pos}{"type"}; + my %MemberType_Pure = get_PureType($Tid_TDid{1}{$MemberType_Id}, $MemberType_Id, 1); + my $MemberStraightPairType_Id = $Type2_Pure{"Memb"}{$Member_Pos}{"type"}; + my %MemberStraightPairType_Pure = get_PureType($Tid_TDid{2}{$MemberStraightPairType_Id}, $MemberStraightPairType_Id, 2); + + if(($MemberType_Pure{"Size"} eq $MemberStraightPairType_Pure{"Size"}) and find_MemberPair_Pos_byName($Type2_Pure{"Memb"}{$Member_Pos}{"name"}, \%Type1_Pure) eq "lost") + { + %{$SubProblems{"Member_Rename"}{$Member_Name}}=( + "Target"=>$Member_Name, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}, + "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, + "New_Value"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"} ); + $MemberPair_Pos = $Member_Pos; + } + else + { + if($Type1_Pure{"Memb"}{$Member_Pos}{"bitfield"}) + { + my $BitfieldSum = getBitfieldSum($Member_Pos-1, \%Type1_Pure)%($POINTER_SIZE*8); + if($BitfieldSum and $BitfieldSum-$Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}>=0) + { + %{$SubProblems{"Withdrawn_Middle_Member"}{$Member_Name}}=( + "Target"=>$Member_Name, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"} ); + next; + } + } + %{$SubProblems{"Withdrawn_Middle_Member_And_Size"}{$Member_Name}}=( + "Target"=>$Member_Name, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"} ); + next; + } + } + } + if($Type1_Pure{"Type"} eq "Enum") + { + my $Member_Value1 = $Type1_Pure{"Memb"}{$Member_Pos}{"value"}; + next if(not $Member_Value1); + my $Member_Value2 = $Type2_Pure{"Memb"}{$MemberPair_Pos}{"value"}; + if($MemberPair_Pos eq "lost") + { + $MemberPair_Pos = find_MemberPair_Pos_byVal($Member_Value1, \%Type2_Pure); + if($MemberPair_Pos ne "lost") + { + %{$SubProblems{"Enum_Member_Name"}{$Type1_Pure{"Memb"}{$Member_Pos}{"value"}}}=( + "Target"=>$Type1_Pure{"Memb"}{$Member_Pos}{"value"}, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>"Enum", + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}, + "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, + "New_Value"=>$Type2_Pure{"Memb"}{$MemberPair_Pos}{"name"} ); + } + } + else + { + if($Member_Value1 ne "" and $Member_Value2 ne "") + { + if($Member_Value1 ne $Member_Value2) + { + %{$SubProblems{"Enum_Member_Value"}{$Member_Name}}=( + "Target"=>$Member_Name, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>"Enum", + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}, + "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"value"}, + "New_Value"=>$Type2_Pure{"Memb"}{$MemberPair_Pos}{"value"} ); + } + } + } + next; + } + my $MemberType1_Id = $Type1_Pure{"Memb"}{$Member_Pos}{"type"}; + my $MemberType2_Id = $Type2_Pure{"Memb"}{$MemberPair_Pos}{"type"}; + %Sub_SubProblems = detectTypeChange($MemberType1_Id, $MemberType2_Id, "Member"); + foreach my $Sub_SubProblemType (keys(%Sub_SubProblems)) + { + %{$SubProblems{$Sub_SubProblemType}{$Member_Name}}=( + "Target"=>$Member_Name, + "Member_Position"=>$Member_Pos, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}); + @{$SubProblems{$Sub_SubProblemType}{$Member_Name}}{keys(%{$Sub_SubProblems{$Sub_SubProblemType}})} = values %{$Sub_SubProblems{$Sub_SubProblemType}}; + } + if($MemberType1_Id and $MemberType2_Id) + {#checking member type change (replace) + %Sub_SubProblems = &mergeTypes($MemberType1_Id, $Tid_TDid{1}{$MemberType1_Id}, $MemberType2_Id, $Tid_TDid{2}{$MemberType2_Id}); + foreach my $Sub_SubProblemType (keys(%Sub_SubProblems)) + { + foreach my $Sub_SubLocation (keys(%{$Sub_SubProblems{$Sub_SubProblemType}})) + { + my $NewLocation = ($Sub_SubLocation)?$Member_Location."->".$Sub_SubLocation:$Member_Location; + %{$SubProblems{$Sub_SubProblemType}{$NewLocation}}=( + "IsInTypeInternals"=>"Yes"); + @{$SubProblems{$Sub_SubProblemType}{$NewLocation}}{keys(%{$Sub_SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}})} = values %{$Sub_SubProblems{$Sub_SubProblemType}{$Sub_SubLocation}}; + if($Sub_SubLocation !~ /\-\>/) + { + $SubProblems{$Sub_SubProblemType}{$NewLocation}{"Member_Type_Name"} = get_TypeName($MemberType1_Id, 1); + $SubProblems{$Sub_SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($MemberType1_Id, 1); + } + } + } + } + } + if(($Type2_Pure{"Type"} eq "Struct") or ($Type2_Pure{"Type"} eq "Class")) + { + foreach my $Member_Pos (sort keys(%{$Type2_Pure{"Memb"}})) + {#checking added members + next if(not $Type2_Pure{"Memb"}{$Member_Pos}{"name"}); + my $MemberPair_Pos = find_MemberPair_Pos_byName($Type2_Pure{"Memb"}{$Member_Pos}{"name"}, \%Type1_Pure); + if($MemberPair_Pos eq "lost") + {#Added_Member + if($Member_Pos > keys(%{$Type1_Pure{"Memb"}}) - 1) + { + if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) + { + if($Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}) + { + my $BitfieldSum = getBitfieldSum($Member_Pos-1, \%Type2_Pure)%($POINTER_SIZE*8); + next if($BitfieldSum and $BitfieldSum<=$POINTER_SIZE*8-$Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}); + } + %{$SubProblems{"Added_Member_And_Size"}{$Type2_Pure{"Memb"}{$Member_Pos}{"name"}}}=( + "Target"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"}, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"} ); + } + } + else + { + my $MemberType_Id = $Type2_Pure{"Memb"}{$Member_Pos}{"type"}; + my $MemberType_DId = $Tid_TDid{2}{$MemberType_Id}; + my %MemberType_Pure = get_PureType($MemberType_DId, $MemberType_Id, 2); + + my $MemberStraightPairType_Id = $Type1_Pure{"Memb"}{$Member_Pos}{"type"}; + my %MemberStraightPairType_Pure = get_PureType($Tid_TDid{1}{$MemberStraightPairType_Id}, $MemberStraightPairType_Id, 1); + + if(($MemberType_Pure{"Size"} eq $MemberStraightPairType_Pure{"Size"}) and find_MemberPair_Pos_byName($Type1_Pure{"Memb"}{$Member_Pos}{"name"}, \%Type2_Pure) eq "lost") + { + next if($Type1_Pure{"Memb"}{$Member_Pos}{"access"} eq "private"); + %{$SubProblems{"Member_Rename"}{$Type2_Pure{"Memb"}{$Member_Pos}{"name"}}}=( + "Target"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"}, + "Old_Value"=>$Type1_Pure{"Memb"}{$Member_Pos}{"name"}, + "New_Value"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"} ); + } + else + { + if($Type1_Pure{"Size"} ne $Type2_Pure{"Size"}) + { + if($Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}) + { + my $BitfieldSum = getBitfieldSum($Member_Pos-1, \%Type2_Pure)%($POINTER_SIZE*8); + next if($BitfieldSum and $BitfieldSum<=$POINTER_SIZE*8-$Type2_Pure{"Memb"}{$Member_Pos}{"bitfield"}); + } + %{$SubProblems{"Added_Middle_Member_And_Size"}{$Type2_Pure{"Memb"}{$Member_Pos}{"name"}}}=( + "Target"=>$Type2_Pure{"Memb"}{$Member_Pos}{"name"}, + "Type_Name"=>$Type1_Pure{"Name"}, + "Type_Type"=>$Type1_Pure{"Type"}, + "Header"=>$Type2_Pure{"Header"}, + "Line"=>$Type2_Pure{"Line"} ); + } + } + } + } + } + } + %{$Cache{"mergeTypes"}{$Type1_Id}{$Type1_DId}{$Type2_Id}{$Type2_DId}} = %SubProblems; + pop(@RecurTypes); + return %SubProblems; +} + +sub get_TypeName($$) +{ + my ($TypeId, $LibVersion) = @_; + return $TypeDescr{$LibVersion}{$Tid_TDid{$LibVersion}{$TypeId}}{$TypeId}{"Name"}; +} + +sub goToFirst($$$$) +{ + my ($TypeDId, $TypeId, $LibVersion, $Type_Type) = @_; + if(defined $Cache{"goToFirst"}{$TypeDId}{$TypeId}{$LibVersion}{$Type_Type}) + { + return %{$Cache{"goToFirst"}{$TypeDId}{$TypeId}{$LibVersion}{$Type_Type}}; + } + return () if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); + my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; + return () if(not $Type{"Type"}); + if($Type{"Type"} ne $Type_Type) + { + return () if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); + %Type = goToFirst($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion, $Type_Type); + } + $Cache{"goToFirst"}{$TypeDId}{$TypeId}{$LibVersion}{$Type_Type} = \%Type; + return %Type; +} + +my %TypeSpecAttributes = ( + "Ref" => 1, + "Const" => 1, + "Volatile" => 1, + "Restrict" => 1, + "Typedef" => 1 +); + +sub get_PureType($$$) +{ + my ($TypeDId, $TypeId, $LibVersion) = @_; + return "" if(not $TypeId); + if(defined $Cache{"get_PureType"}{$TypeDId}{$TypeId}{$LibVersion}) + { + return %{$Cache{"get_PureType"}{$TypeDId}{$TypeId}{$LibVersion}}; + } + return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); + my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; + if($Type{"Type"} =~ /Struct|Union|Typedef|Class|Enum/) + { + $CheckedTypes{$Type{"Name"}} = 1; + } + return %Type if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); + if($TypeSpecAttributes{$Type{"Type"}}) + { + %Type = get_PureType($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); + } + $Cache{"get_PureType"}{$TypeDId}{$TypeId}{$LibVersion} = \%Type; + return %Type; +} + +sub get_PointerLevel($$$) +{ + my ($TypeDId, $TypeId, $LibVersion) = @_; + return "" if(not $TypeId); + if(defined $Cache{"get_PointerLevel"}{$TypeDId}{$TypeId}{$LibVersion}) + { + return $Cache{"get_PointerLevel"}{$TypeDId}{$TypeId}{$LibVersion}; + } + return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); + my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; + return 0 if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); + my $PointerLevel = 0; + if($Type{"Type"} eq "Pointer") + { + $PointerLevel += 1; + } + $PointerLevel += get_PointerLevel($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); + $Cache{"get_PointerLevel"}{$TypeDId}{$TypeId}{$LibVersion} = $PointerLevel; + return $PointerLevel; +} + +sub get_BaseType($$$) +{ + my ($TypeDId, $TypeId, $LibVersion) = @_; + return "" if(not $TypeId); + if(defined $Cache{"get_BaseType"}{$TypeDId}{$TypeId}{$LibVersion}) + { + return %{$Cache{"get_BaseType"}{$TypeDId}{$TypeId}{$LibVersion}}; + } + return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); + my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; + if($Type{"Type"} =~ /Struct|Union|Typedef|Class|Enum/) + { + $CheckedTypes{$Type{"Name"}} = 1; + } + return %Type if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); + %Type = get_BaseType($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); + $Cache{"get_BaseType"}{$TypeDId}{$TypeId}{$LibVersion} = \%Type; + return %Type; +} + +sub get_OneStep_BaseType($$$) +{ + my ($TypeDId, $TypeId, $LibVersion) = @_; + return "" if(not $TypeId); + return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); + my %Type = %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; + return %Type if(not $Type{"BaseType"}{"TDid"} and not $Type{"BaseType"}{"Tid"}); + return get_Type($Type{"BaseType"}{"TDid"}, $Type{"BaseType"}{"Tid"}, $LibVersion); +} + +sub get_Type($$$) +{ + my ($TypeDId, $TypeId, $LibVersion) = @_; + return "" if(not $TypeId); + return "" if(not $TypeDescr{$LibVersion}{$TypeDId}{$TypeId}); + return %{$TypeDescr{$LibVersion}{$TypeDId}{$TypeId}}; +} + +sub mergeLibs() +{ + foreach my $Interface (sort keys(%AddedInt)) + {#checking added interfaces + next if($InternalInterfaces{1}{$Interface} or $InternalInterfaces{2}{$Interface}); + next if(defined $InterfacesListPath and not $InterfacesList{$Interface}); + next if(defined $AppPath and not $InterfacesList_App{$Interface}); + next if($FuncAttr{2}{$Interface}{"Private"}); + next if(not $FuncAttr{2}{$Interface}{"Header"}); + %{$CompatProblems{$Interface}{"Added_Interface"}{"SharedLibrary"}}=( + "Header"=>$FuncAttr{2}{$Interface}{"Header"}, + "Line"=>$FuncAttr{2}{$Interface}{"Line"}, + "Signature"=>$FuncAttr{2}{$Interface}{"Signature"}, + "New_SoName"=>$Interface_Library{2}{$Interface} ); + } + foreach my $Interface (sort keys(%WithdrawnInt)) + {#checking withdrawn interfaces + next if($InternalInterfaces{1}{$Interface} or $InternalInterfaces{2}{$Interface}); + next if(defined $InterfacesListPath and not $InterfacesList{$Interface}); + next if(defined $AppPath and not $InterfacesList_App{$Interface}); + next if($FuncAttr{1}{$Interface}{"Private"}); + next if(not $FuncAttr{1}{$Interface}{"Header"}); + %{$CompatProblems{$Interface}{"Withdrawn_Interface"}{"SharedLibrary"}}=( + "Header"=>$FuncAttr{1}{$Interface}{"Header"}, + "Line"=>$FuncAttr{1}{$Interface}{"Line"}, + "Signature"=>$FuncAttr{1}{$Interface}{"Signature"}, + "Old_SoName"=>$Interface_Library{1}{$Interface} ); + } +} + +sub mergeSignatures() +{ + my %SubProblems = (); + + prepareInterfaces(1); + prepareInterfaces(2); + %FuncDescr=(); + + initializeClassVirtFunc(1); + initializeClassVirtFunc(2); + + checkVirtFuncRedefinitions(1); + checkVirtFuncRedefinitions(2); + + setVirtFuncPositions(1); + setVirtFuncPositions(2); + + foreach my $Interface (sort keys(%AddedInt)) + {#collecting the attributes of added interfaces + next if($CheckedInterfaces{$Interface}); + if($CompleteSignature{2}{$Interface}) + { + if($CompleteSignature{2}{$Interface}{"Private"}) + { + $FuncAttr{2}{$Interface}{"Private"} = 1; + } + if($CompleteSignature{2}{$Interface}{"Protected"}) + { + $FuncAttr{2}{$Interface}{"Protected"} = 1; + } + if($CompleteSignature{2}{$Interface}{"Header"}) + { + $FuncAttr{2}{$Interface}{"Header"} = $CompleteSignature{2}{$Interface}{"Header"}; + } + if($CompleteSignature{2}{$Interface}{"Line"}) + { + $FuncAttr{2}{$Interface}{"Line"} = $CompleteSignature{2}{$Interface}{"Line"}; + } + $FuncAttr{2}{$Interface}{"Signature"} = get_Signature($Interface, 2); + foreach my $ParamPos (keys(%{$CompleteSignature{2}{$Interface}{"Param"}})) + { + my $ParamType_Id = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"type"}; + my $ParamType_DId = $Tid_TDid{2}{$ParamType_Id}; + my %ParamType = get_Type($ParamType_DId, $ParamType_Id, 2); + } + #checking virtual table + check_VirtualTable($Interface, 2); + $CheckedInterfaces{$Interface} = 1; + } + } + foreach my $Interface (sort keys(%WithdrawnInt)) + {#collecting the attributes of withdrawn interfaces + next if($CheckedInterfaces{$Interface}); + if($CompleteSignature{1}{$Interface}) + { + if($CompleteSignature{1}{$Interface}{"Private"}) + { + $FuncAttr{1}{$Interface}{"Private"} = 1; + } + if($CompleteSignature{1}{$Interface}{"Protected"}) + { + $FuncAttr{1}{$Interface}{"Protected"} = 1; + } + if($CompleteSignature{1}{$Interface}{"Header"}) + { + $FuncAttr{1}{$Interface}{"Header"} = $CompleteSignature{1}{$Interface}{"Header"}; + } + if($CompleteSignature{1}{$Interface}{"Line"}) + { + $FuncAttr{1}{$Interface}{"Line"} = $CompleteSignature{1}{$Interface}{"Line"}; + } + $FuncAttr{1}{$Interface}{"Signature"} = get_Signature($Interface, 1); + foreach my $ParamPos (keys(%{$CompleteSignature{1}{$Interface}{"Param"}})) + { + my $ParamType_Id = $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}{"type"}; + my $ParamType_DId = $Tid_TDid{1}{$ParamType_Id}; + my %ParamType = get_Type($ParamType_DId, $ParamType_Id, 1); + } + #checking virtual table + check_VirtualTable($Interface, 1); + $CheckedInterfaces{$Interface} = 1; + } + } + + foreach my $Interface (sort keys(%{$CompleteSignature{1}})) + {#checking interfaces + if(($Interface !~ /\@/) and ($SymVer{1}{$Interface} =~ /\A(.*)[\@]+/)) + { + next if($1 eq $Interface); + } + my ($MnglName, $SymbolVersion) = ($Interface, ""); + if($Interface =~ /\A([^@]+)[\@]+([^@]+)\Z/) + { + ($MnglName, $SymbolVersion) = ($1, $2); + } + next if($InternalInterfaces{1}{$Interface} or $InternalInterfaces{2}{$Interface}); + next if(defined $InterfacesListPath and not $InterfacesList{$Interface}); + next if(defined $AppPath and not $InterfacesList_App{$Interface}); + next if($CheckedInterfaces{$Interface}); + next if($CompleteSignature{1}{$Interface}{"Private"}); + next if(not $CompleteSignature{1}{$Interface}{"Header"} or not $CompleteSignature{2}{$Interface}{"Header"}); + next if(not $CompleteSignature{1}{$Interface}{"MnglName"} or not $CompleteSignature{2}{$Interface}{"MnglName"}); + next if((not $CompleteSignature{1}{$Interface}{"PureVirt"} and $CompleteSignature{2}{$Interface}{"PureVirt"}) or ($CompleteSignature{1}{$Interface}{"PureVirt"} and not $CompleteSignature{2}{$Interface}{"PureVirt"})); + $CheckedInterfaces{$Interface} = 1; + #checking virtual table + check_VirtualTable($Interface, 1); + #checking attributes + if($CompleteSignature{2}{$Interface}{"Static"} and not $CompleteSignature{1}{$Interface}{"Static"}) + { + %{$CompatProblems{$Interface}{"Function_Become_Static"}{"Attributes"}}=( + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Signature"=>get_Signature($Interface, 1), + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface} ); + } + elsif(not $CompleteSignature{2}{$Interface}{"Static"} and $CompleteSignature{1}{$Interface}{"Static"}) + { + %{$CompatProblems{$Interface}{"Function_Become_NonStatic"}{"Attributes"}}=( + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Signature"=>get_Signature($Interface, 1), + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface} ); + } + if($CompleteSignature{1}{$Interface}{"Virt"} and $CompleteSignature{2}{$Interface}{"Virt"}) + { + if($CompleteSignature{1}{$Interface}{"Position"}!=$CompleteSignature{2}{$Interface}{"Position"}) + { + my $Class_Id = $CompleteSignature{1}{$Interface}{"Class"}; + my $Class_DId = $Tid_TDid{1}{$Class_Id}; + my %Class_Type = get_Type($Class_DId, $Class_Id, 1); + %{$CompatProblems{$Interface}{"Virtual_Function_Position"}{$tr_name{$MnglName}}}=( + "Type_Name"=>$Class_Type{"Name"}, + "Type_Type"=>$Class_Type{"Type"}, + "Header"=>$Class_Type{"Header"}, + "Line"=>$Class_Type{"Line"}, + "Old_Value"=>$CompleteSignature{1}{$Interface}{"Position"}, + "New_Value"=>$CompleteSignature{2}{$Interface}{"Position"}, + "Signature"=>get_Signature($Interface, 1), + "Target"=>$tr_name{$MnglName}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface} ); + } + } + foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$CompleteSignature{2}{$Interface}{"Param"}})) + {#checking added parameters + last if($Interface=~/\A_Z/); + if(not defined $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}) + {#checking withdrawn parameters + my $ParamType2_Id = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"type"}; + my $Parameter_Name = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"name"}; + last if(get_TypeName($ParamType2_Id, 2) eq "..."); + %{$CompatProblems{$Interface}{"Added_Parameter"}{num_to_str($ParamPos+1)." Parameter"}}=( + "Target"=>$Parameter_Name, + "Parameter_Position"=>$ParamPos, + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}); + } + } + foreach my $ParamPos (sort {int($a) <=> int($b)} keys(%{$CompleteSignature{1}{$Interface}{"Param"}})) + {#checking parameters + my $ParamType1_Id = $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}{"type"}; + my $Parameter_Name = $CompleteSignature{1}{$Interface}{"Param"}{$ParamPos}{"name"}; + if(not defined $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos} and get_TypeName($ParamType1_Id, 1) ne "..." and $Interface!~/\A_Z/) + {#checking withdrawn parameters + %{$CompatProblems{$Interface}{"Withdrawn_Parameter"}{num_to_str($ParamPos+1)." Parameter"}}=( + "Target"=>$Parameter_Name, + "Parameter_Position"=>$ParamPos, + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}); + next; + } + my $ParamType2_Id = $CompleteSignature{2}{$Interface}{"Param"}{$ParamPos}{"type"}; + next if(not $ParamType1_Id or not $ParamType2_Id); + my $Parameter_Location = ($Parameter_Name)?$Parameter_Name:num_to_str($ParamPos+1)." Parameter"; + + #checking type change(replace) + %SubProblems = detectTypeChange($ParamType1_Id, $ParamType2_Id, "Parameter"); + foreach my $SubProblemType (keys(%SubProblems)) + { + %{$CompatProblems{$Interface}{$SubProblemType}{$Parameter_Location}}=( + "Target"=>$Parameter_Name, + "Parameter_Position"=>$ParamPos, + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}); + @{$CompatProblems{$Interface}{$SubProblemType}{$Parameter_Location}}{keys(%{$SubProblems{$SubProblemType}})} = values %{$SubProblems{$SubProblemType}}; + } + @RecurTypes = (); + #checking type definition changes + %SubProblems = mergeTypes($ParamType1_Id, $Tid_TDid{1}{$ParamType1_Id}, $ParamType2_Id, $Tid_TDid{2}{$ParamType2_Id}); + foreach my $SubProblemType (keys(%SubProblems)) + { + foreach my $SubLocation (keys(%{$SubProblems{$SubProblemType}})) + { + my $NewLocation = ($SubLocation)?$Parameter_Location."->".$SubLocation:$Parameter_Location; + %{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}=( + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}, + "Parameter_Type_Name"=>get_TypeName($ParamType1_Id, 1), + "Parameter_Position"=>$ParamPos, + "Parameter_Name"=>$Parameter_Name); + @{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}{keys(%{$SubProblems{$SubProblemType}{$SubLocation}})} = values %{$SubProblems{$SubProblemType}{$SubLocation}}; + if($SubLocation !~ /\-\>/) + { + $CompatProblems{$Interface}{$SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($ParamType1_Id, 1); + } + } + } + } + #checking return type + my $ReturnType1_Id = $CompleteSignature{1}{$Interface}{"Return"}; + my $ReturnType2_Id = $CompleteSignature{2}{$Interface}{"Return"}; + %SubProblems = detectTypeChange($ReturnType1_Id, $ReturnType2_Id, "Return"); + foreach my $SubProblemType (keys(%SubProblems)) + { + %{$CompatProblems{$Interface}{$SubProblemType}{"RetVal"}}=( + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}); + @{$CompatProblems{$Interface}{$SubProblemType}{"RetVal"}}{keys(%{$SubProblems{$SubProblemType}})} = values %{$SubProblems{$SubProblemType}}; + } + if($ReturnType1_Id and $ReturnType2_Id) + { + @RecurTypes = (); + %SubProblems = mergeTypes($ReturnType1_Id, $Tid_TDid{1}{$ReturnType1_Id}, $ReturnType2_Id, $Tid_TDid{2}{$ReturnType2_Id}); + foreach my $SubProblemType (keys(%SubProblems)) + { + foreach my $SubLocation (keys(%{$SubProblems{$SubProblemType}})) + { + my $NewLocation = ($SubLocation)?"RetVal->".$SubLocation:"RetVal"; + %{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}=( + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}, + "Return_Type_Name"=>get_TypeName($ReturnType1_Id, 1) ); + @{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}{keys(%{$SubProblems{$SubProblemType}{$SubLocation}})} = values %{$SubProblems{$SubProblemType}{$SubLocation}}; + if($SubLocation !~ /\-\>/) + { + $CompatProblems{$Interface}{$SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($ReturnType1_Id, 1); + } + } + } + } + + #checking object type + my $ObjectType1_Id = $CompleteSignature{1}{$Interface}{"Class"}; + my $ObjectType2_Id = $CompleteSignature{2}{$Interface}{"Class"}; + if($ObjectType1_Id and $ObjectType2_Id) + { + my $ThisType1_Id = getTypeIdByName(get_TypeName($ObjectType1_Id, 1)."*const", 1); + my $ThisType2_Id = getTypeIdByName(get_TypeName($ObjectType2_Id, 2)."*const", 2); + if($ThisType1_Id and $ThisType2_Id) + { + @RecurTypes = (); + %SubProblems = mergeTypes($ThisType1_Id, $Tid_TDid{1}{$ThisType1_Id}, $ThisType2_Id, $Tid_TDid{2}{$ThisType2_Id}); + foreach my $SubProblemType (keys(%SubProblems)) + { + foreach my $SubLocation (keys(%{$SubProblems{$SubProblemType}})) + { + my $NewLocation = ($SubLocation)?"Obj->".$SubLocation:"Obj"; + %{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}=( + "Signature"=>get_Signature($Interface, 1), + "Header"=>$CompleteSignature{1}{$Interface}{"Header"}, + "Line"=>$CompleteSignature{1}{$Interface}{"Line"}, + "Old_SoName"=>$Interface_Library{1}{$Interface}, + "New_SoName"=>$Interface_Library{2}{$Interface}, + "Object_Type_Name"=>get_TypeName($ObjectType1_Id, 1) ); + @{$CompatProblems{$Interface}{$SubProblemType}{$NewLocation}}{keys(%{$SubProblems{$SubProblemType}{$SubLocation}})} = values %{$SubProblems{$SubProblemType}{$SubLocation}}; + if($SubLocation !~ /\-\>/) + { + $CompatProblems{$Interface}{$SubProblemType}{$NewLocation}{"Start_Type_Name"} = get_TypeName($ObjectType1_Id, 1); + } + } + } + } + } + } + set_Problems_Priority(); +} + +sub getTypeIdByName($$) +{ + my ($TypeName, $Version) = @_; + return $TName_Tid{$Version}{correctName($TypeName)}; +} + +sub detectTypeChange($$$) +{ + my ($Type1_Id, $Type2_Id, $Prefix) = @_; + my %LocalProblems = (); + my $Type1_DId = $Tid_TDid{1}{$Type1_Id}; + my $Type2_DId = $Tid_TDid{2}{$Type2_Id}; + my %Type1 = get_Type($Type1_DId, $Type1_Id, 1); + my %Type2 = get_Type($Type2_DId, $Type2_Id, 2); + my %Type1_Base = get_BaseType($Type1_DId, $Type1_Id, 1); + my %Type2_Base = get_BaseType($Type2_DId, $Type2_Id, 2); + my %Type1_Pure = get_PureType($Type1_DId, $Type1_Id, 1); + my %Type2_Pure = get_PureType($Type2_DId, $Type2_Id, 2); + my $Type1_PointerLevel = get_PointerLevel($Type1_DId, $Type1_Id, 1); + my $Type2_PointerLevel = get_PointerLevel($Type2_DId, $Type2_Id, 2); + return () if(not $Type1{"Name"} or not $Type2{"Name"} or not $Type1{"Size"} or not $Type2{"Size"} or not $Type1_Pure{"Size"} or not $Type2_Pure{"Size"} or not $Type1_Base{"Name"} or not $Type2_Base{"Name"} or not $Type1_Base{"Size"} or not $Type2_Base{"Size"} or $Type1_PointerLevel eq "" or $Type2_PointerLevel eq ""); + if($Type1_Base{"Name"} ne $Type2_Base{"Name"}) + {#base type change + if($Type1_Base{"Name"}!~/anon\-/ and $Type2_Base{"Name"}!~/anon\-/) + { + if($Type1_Base{"Size"}!=$Type2_Base{"Size"}) + { + %{$LocalProblems{$Prefix."_BaseType_And_Size"}}=( + "Old_Value"=>$Type1_Base{"Name"}, + "New_Value"=>$Type2_Base{"Name"}, + "Old_Size"=>$Type1_Base{"Size"}, + "New_Size"=>$Type2_Base{"Size"}, + "InitialType_Type"=>$Type1_Pure{"Type"}); + } + else + { + %{$LocalProblems{$Prefix."_BaseType"}}=( + "Old_Value"=>$Type1_Base{"Name"}, + "New_Value"=>$Type2_Base{"Name"}, + "InitialType_Type"=>$Type1_Pure{"Type"}); + } + } + } + elsif($Type1{"Name"} ne $Type2{"Name"}) + {#type change + if($Type1{"Name"}!~/anon\-/ and $Type2{"Name"}!~/anon\-/) + { + if($Type1{"Size"}!=$Type2{"Size"}) + { + %{$LocalProblems{$Prefix."_Type_And_Size"}}=( + "Old_Value"=>$Type1{"Name"}, + "New_Value"=>$Type2{"Name"}, + "Old_Size"=>($Type1{"Type"} eq "Array")?$Type1{"Size"}*$Type1_Base{"Size"}:$Type1{"Size"}, + "New_Size"=>($Type2{"Type"} eq "Array")?$Type2{"Size"}*$Type2_Base{"Size"}:$Type2{"Size"}, + "InitialType_Type"=>$Type1_Pure{"Type"}); + } + else + { + %{$LocalProblems{$Prefix."_Type"}}=( + "Old_Value"=>$Type1{"Name"}, + "New_Value"=>$Type2{"Name"}, + "InitialType_Type"=>$Type1_Pure{"Type"}); + } + } + } + + if($Type1_PointerLevel!=$Type2_PointerLevel) + { + %{$LocalProblems{$Prefix."_PointerLevel"}}=( + "Old_Value"=>$Type1_PointerLevel, + "New_Value"=>$Type2_PointerLevel); + } + return %LocalProblems; +} + +sub htmlSpecChars($) +{ + my $Str = $_[0]; + $Str =~ s/\&([^#])/&$1/g; + $Str =~ s/</</g; + $Str =~ s/>/>/g; + $Str =~ s/([^ ])( )([^ ])/$1\@ALONE_SP\@$3/g; + $Str =~ s/ / /g; + $Str =~ s/\@ALONE_SP\@/ /g; + $Str =~ s/\n/<br\/>/g; + return $Str; +} + +sub highLight_Signature($) +{ + my $Signature = $_[0]; + return highLight_Signature_PPos_Italic($Signature, "", 0, 0); +} + +sub highLight_Signature_Italic($) +{ + my $Signature = $_[0]; + return highLight_Signature_PPos_Italic($Signature, "", 1, 0); +} + +sub highLight_Signature_Italic_Color($) +{ + my $Signature = $_[0]; + return highLight_Signature_PPos_Italic($Signature, "", 1, 1); +} + +sub highLight_Signature_PPos_Italic($$$$) +{ + my ($FullSignature, $Parameter_Position, $ItalicParams, $ColorParams) = @_; + my ($Signature, $SymbolVersion) = ($FullSignature, ""); + if($FullSignature =~ /\A(.+)[\@]+(.+)\Z/) + { + ($Signature, $SymbolVersion) = ($1, $2); + } + if($Signature=~/\Atypeinfo\W/) + { + return $Signature.(($SymbolVersion)?"<span class='symver'> \@ $SymbolVersion</span>":""); + } + if($Signature!~/\)(| const)\Z/) + { + return $Signature.(($SymbolVersion)?"<span class='symver'> \@ $SymbolVersion</span>":""); + } + $Signature =~ /(.+?)\(.*\)(| const)\Z/; + my ($Begin, $End) = ($1, $2); + my @Parts = (); + my $Part_Num = 0; + foreach my $Part (get_Signature_Parts($Signature, 1)) + { + $Part =~ s/\A\s+|\s+\Z//g; + my ($Part_Styled, $ParamName) = ($Part, ""); + if($Part=~/\([\*]+(\w+)\)/i) + {#func-ptr + $ParamName = $1; + } + elsif($Part=~/(\w+)[\,\)]*\Z/i) + { + $ParamName = $1; + } + if(not $ParamName) + { + push(@Parts, $Part); + next; + } + if($ItalicParams and not $TName_Tid{1}{$Part} and not $TName_Tid{2}{$Part}) + { + if(($Parameter_Position ne "") and ($Part_Num == $Parameter_Position)) + { + $Part_Styled =~ s!(\W)$ParamName([\,\)]|\Z)!$1<span class='focus_param'>$ParamName</span>$2!ig; + } + elsif($ColorParams) + { + $Part_Styled =~ s!(\W)$ParamName([\,\)]|\Z)!$1<span class='color_param'>$ParamName</span>$2!ig; + } + else + { + $Part_Styled =~ s!(\W)$ParamName([\,\)]|\Z)!$1<span style='font-style:italic;'>$ParamName</span>$2!ig; + } + } + $Part_Styled = "<span style='white-space:nowrap;'>".$Part_Styled."</span>"; + push(@Parts, $Part_Styled); + $Part_Num += 1; + } + $Signature = $Begin."<span class='int_p'>"."(".join(" ", @Parts).")"."</span>".$End; + $Signature =~ s!\[\]![<span style='padding-left:2px;'>]</span>!g; + $Signature =~ s!operator=!operator<span style='padding-left:2px'>=</span>!g; + $Signature =~ s!(\[in-charge\]|\[not-in-charge\]|\[in-charge-deleting\])!<span style='color:Black;font-weight:normal;'>$1</span>!g; + return $Signature.(($SymbolVersion)?"<span class='symver'> \@ $SymbolVersion</span>":""); +} + +sub get_Signature_Parts($$) +{ + my ($Signature, $Comma) = @_; + my @Parts = (); + my $Bracket_Num = 0; + my $Bracket2_Num = 0; + my $Parameters = $Signature; + if($Signature=~/>|</) + { + $Parameters=~s/>/>/g; + $Parameters=~s/</</g; + } + my $Part_Num = 0; + if($Parameters =~ s/.+?\((.*)\)(| const)\Z/$1/) + { + foreach my $Pos (0 .. length($Parameters) - 1) + { + my $Symbol = substr($Parameters, $Pos, 1); + $Bracket_Num += 1 if($Symbol eq "("); + $Bracket_Num -= 1 if($Symbol eq ")"); + $Bracket2_Num += 1 if($Symbol eq "<"); + $Bracket2_Num -= 1 if($Symbol eq ">"); + if($Symbol eq "," and $Bracket_Num==0 and $Bracket2_Num==0) + { + $Parts[$Part_Num] .= $Symbol if($Comma); + $Part_Num += 1; + } + else + { + $Parts[$Part_Num] .= $Symbol; + } + } + if($Signature=~/>|</) + { + foreach my $Part (@Parts) + { + $Part=~s/\>/>/g; + $Part=~s/\</</g; + } + } + return @Parts; + } + else + { + return (); + } +} + +my %TypeProblems_Kind=( + "Added_Virtual_Function"=>1, + "Withdrawn_Virtual_Function"=>1, + "Virtual_Function_Position"=>1, + "Virtual_Function_Redefinition"=>1, + "Virtual_Function_Redefinition_B"=>1, + "Size"=>1, + "Added_Member_And_Size"=>1, + "Added_Middle_Member_And_Size"=>1, + "Withdrawn_Member_And_Size"=>1, + "Withdrawn_Member"=>1, + "Withdrawn_Middle_Member_And_Size"=>1, + "Member_Rename"=>1, + "Enum_Member_Value"=>1, + "Enum_Member_Name"=>1, + "Member_Type_And_Size"=>1, + "Member_Type"=>1, + "Member_BaseType_And_Size"=>1, + "Member_BaseType"=>1, + "Member_PointerLevel"=>1, + "BaseType"=>1 +); + +my %InterfaceProblems_Kind=( + "Added_Interface"=>1, + "Withdrawn_Interface"=>1, + "Function_Become_Static"=>1, + "Function_Become_NonStatic"=>1, + "Parameter_Type_And_Size"=>1, + "Parameter_Type"=>1, + "Parameter_BaseType_And_Size"=>1, + "Parameter_BaseType"=>1, + "Parameter_PointerLevel"=>1, + "Return_Type_And_Size"=>1, + "Return_Type"=>1, + "Return_BaseType_And_Size"=>1, + "Return_BaseType"=>1, + "Return_PointerLevel"=>1, + "Withdrawn_Parameter"=>1, + "Added_Parameter"=>1 +); + +sub testSystem_cpp() +{ + print "testing for C++ library changes\n"; + my (@DataDefs_v1, @Sources_v1, @DataDefs_v2, @Sources_v2) = (); + + #Withdrawn_Parameter + @DataDefs_v1 = (@DataDefs_v1, "int func_withdrawn_parameter(int param, int withdrawn_param);"); + @Sources_v1 = (@Sources_v1, "int func_withdrawn_parameter(int param, int withdrawn_param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_withdrawn_parameter(int param);"); + @Sources_v2 = (@Sources_v2, "int func_withdrawn_parameter(int param)\n{\n return 0;\n}"); + + #Added_Parameter + @DataDefs_v1 = (@DataDefs_v1, "int func_added_parameter(int param);"); + @Sources_v1 = (@Sources_v1, "int func_added_parameter(int param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_added_parameter(int param, int added_param);"); + @Sources_v2 = (@Sources_v2, "int func_added_parameter(int param, int added_param)\n{\n return 0;\n}"); + + #Added_Virtual_Function + @DataDefs_v1 = (@DataDefs_v1, "class type_test_added_virtual_function\n{\npublic:\n int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_added_virtual_function::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_added_virtual_function::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_added_virtual_function\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_added_virtual_function::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_added_virtual_function::func2(int param)\n{\n return param;\n}"); + + #added simple function + @DataDefs_v2 = (@DataDefs_v2, "typedef int (*FUNCPTR_TYPE)(int a, int b);\nint added_function_param_funcptr(FUNCPTR_TYPE*const** f);"); + @Sources_v2 = (@Sources_v2, "int added_function_param_funcptr(FUNCPTR_TYPE*const** f)\n{\n return 0;\n}"); + + #Withdrawn_Virtual_Function + @DataDefs_v1 = (@DataDefs_v1, "class type_test_withdrawn_virtual_function\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_withdrawn_virtual_function::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_withdrawn_virtual_function::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_withdrawn_virtual_function\n{\npublic:\n int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_withdrawn_virtual_function::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_withdrawn_virtual_function::func2(int param)\n{\n return param;\n}"); + + #Virtual_Function_Position + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_position\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_position\n{\npublic:\n virtual int func2(int param);\n virtual int func1(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position::func2(int param)\n{\n return param;\n}"); + + #virtual functions safe replace + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace_base::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace_base::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace_base::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace_base::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_position_safe_replace:public type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_position_safe_replace::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_position_safe_replace:public type_test_virtual_function_position_safe_replace_base\n{\npublic:\n virtual int func2(int param);\n virtual int func1(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_position_safe_replace::func2(int param)\n{\n return param;\n}"); + + #virtual table changes + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_table_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_table:public type_test_virtual_table_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_table_base::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_table_base::func2(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_table::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_table::func2(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_table_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_table:public type_test_virtual_table_base\n{\npublic:\n virtual int func2(int param);\n virtual int func1(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_table_base::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_table_base::func2(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_table::func1(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_table::func2(int param)\n{\n return param;\n}"); + + #Virtual_Function_Redefinition + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @DataDefs_v1 = (@DataDefs_v1, "class type_test_virtual_function_redefinition:public type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func3(int param);\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_redefinition_base::func1(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_redefinition_base::func2(int param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int type_test_virtual_function_redefinition::func3(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func1(int param);\n virtual int func2(int param);\n};"); + @DataDefs_v2 = (@DataDefs_v2, "class type_test_virtual_function_redefinition:public type_test_virtual_function_redefinition_base\n{\npublic:\n virtual int func2(int param);\n virtual int func3(int param);\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition_base::func1(int param){\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition_base::func2(int param){\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition::func2(int param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_virtual_function_redefinition::func3(int param)\n{\n return param;\n}"); + + #size change + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_size\n{\npublic:\n virtual type_test_size func1(type_test_size param);\n int i;\n long j;\n double k;\n type_test_size* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_size type_test_size::func1(type_test_size param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_size\n{\npublic:\n virtual type_test_size func1(type_test_size param);\n int i;\n long j;\n double k;\n type_test_size* p;\n int added_member;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_size type_test_size::func1(type_test_size param)\n{\n return param;\n}"); + + #Added_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_member\n{\npublic:\n virtual type_test_added_member func1(type_test_added_member param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_added_member type_test_added_member::func1(type_test_added_member param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_member\n{\npublic:\n virtual type_test_added_member func1(type_test_added_member param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n int added_member;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_added_member type_test_added_member::func1(type_test_added_member param)\n{\n return param;\n}"); + + #Method object changes + @DataDefs_v1 = (@DataDefs_v1, "class type_test_object_added_member\n{\npublic:\n virtual int func1(int param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_object_added_member::func1(int param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "class type_test_object_added_member\n{\npublic:\n virtual int func1(int param);\n int i;\n long j;\n double k;\n type_test_added_member* p;\n int added_member;\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_object_added_member::func1(int param)\n{\n return param;\n}"); + + #added bitfield + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_bitfield\n{\npublic:\n virtual type_test_added_bitfield func1(type_test_added_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n type_test_added_bitfield* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_added_bitfield type_test_added_bitfield::func1(type_test_added_bitfield param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_bitfield\n{\npublic:\n virtual type_test_added_bitfield func1(type_test_added_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n int added_bitfield : 1;\n type_test_added_bitfield* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_added_bitfield type_test_added_bitfield::func1(type_test_added_bitfield param)\n{\n return param;\n}"); + + #withdrawn bitfield + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_bitfield\n{\npublic:\n virtual type_test_withdrawn_bitfield func1(type_test_withdrawn_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n int withdrawn_bitfield : 1;\n type_test_withdrawn_bitfield* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_withdrawn_bitfield type_test_withdrawn_bitfield::func1(type_test_withdrawn_bitfield param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_bitfield\n{\npublic:\n virtual type_test_withdrawn_bitfield func1(type_test_withdrawn_bitfield param);\n int i;\n long j;\n double k;\n int b1 : 32;\n int b2 : 31;\n type_test_withdrawn_bitfield* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_withdrawn_bitfield type_test_withdrawn_bitfield::func1(type_test_withdrawn_bitfield param)\n{\n return param;\n}"); + + #Added_Middle_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_middle_member\n{\npublic:\n virtual type_test_added_middle_member func1(type_test_added_middle_member param);\n int i;\n long j;\n double k;\n type_test_added_middle_member* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_added_middle_member type_test_added_middle_member::func1(type_test_added_middle_member param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_middle_member\n{\npublic:\n virtual type_test_added_middle_member func1(type_test_added_middle_member param);\n int i;\n int added_middle_member;\n long j;\n double k;\n type_test_added_middle_member* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_added_middle_member type_test_added_middle_member::func1(type_test_added_middle_member param)\n{\n return param;\n}"); + + #Member_Rename + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_rename\n{\npublic:\n virtual type_test_member_rename func1(type_test_member_rename param);\n long i;\n long j;\n double k;\n type_test_member_rename* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_member_rename type_test_member_rename::func1(type_test_member_rename param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_rename\n{\npublic:\n virtual type_test_member_rename func1(type_test_member_rename param);\n long renamed_member;\n long j;\n double k;\n type_test_member_rename* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_member_rename type_test_member_rename::func1(type_test_member_rename param)\n{\n return param;\n}"); + + #Withdrawn_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_member\n{\npublic:\n virtual type_test_withdrawn_member func1(type_test_withdrawn_member param);\n int i;\n long j;\n double k;\n type_test_withdrawn_member* p;\n int withdrawn_member;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_withdrawn_member type_test_withdrawn_member::func1(type_test_withdrawn_member param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_member\n{\npublic:\n virtual type_test_withdrawn_member func1(type_test_withdrawn_member param);\n int i;\n long j;\n double k;\n type_test_withdrawn_member* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_withdrawn_member type_test_withdrawn_member::func1(type_test_withdrawn_member param)\n{\n return param;\n}"); + + #Withdrawn_Middle_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_middle_member\n{\npublic:\n virtual type_test_withdrawn_middle_member func1(type_test_withdrawn_middle_member param);\n int i;\n int withdrawn_middle_member;\n long j;\n double k;\n type_test_withdrawn_middle_member* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_withdrawn_middle_member type_test_withdrawn_middle_member::func1(type_test_withdrawn_middle_member param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_middle_member\n{\npublic:\n virtual type_test_withdrawn_middle_member func1(type_test_withdrawn_middle_member param);\n int i;\n long j;\n double k;\n type_test_withdrawn_middle_member* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_withdrawn_middle_member type_test_withdrawn_middle_member::func1(type_test_withdrawn_middle_member param)\n{\n return param;\n}"); + + #Enum_Member_Value + @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_value_change\n{\n MEMBER_1=1,\n MEMBER_2=2\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); + @Sources_v1 = (@Sources_v1, +"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_value_change\n{\n MEMBER_1=2,\n MEMBER_2=1\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); + @Sources_v2 = (@Sources_v2, +"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + #Enum_Member_Name + @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_rename\n{\n BRANCH_1=1,\n BRANCH_2=2\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); + @Sources_v1 = (@Sources_v1, +"int func_test_enum_member_rename(enum type_test_enum_member_rename param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_rename\n{\n BRANCH_FIRST=1,\n BRANCH_SECOND=1\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); + @Sources_v2 = (@Sources_v2, +"int func_test_enum_member_rename(enum type_test_enum_member_rename param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + #Member_Type_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type_and_size\n{\npublic:\n type_test_member_type_and_size func1(type_test_member_type_and_size param);\n int i;\n long j;\n double k;\n type_test_member_type_and_size* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_member_type_and_size type_test_member_type_and_size::func1(type_test_member_type_and_size param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type_and_size\n{\npublic:\n type_test_member_type_and_size func1(type_test_member_type_and_size param);\n long long i;\n long j;\n double k;\n type_test_member_type_and_size* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_member_type_and_size type_test_member_type_and_size::func1(type_test_member_type_and_size param)\n{\n return param;\n}"); + + #Member_Type + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type\n{\npublic:\n type_test_member_type func1(type_test_member_type param);\n int i;\n long j;\n double k;\n type_test_member_type* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_member_type type_test_member_type::func1(type_test_member_type param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type\n{\npublic:\n type_test_member_type func1(type_test_member_type param);\n float i;\n long j;\n double k;\n type_test_member_type* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_member_type type_test_member_type::func1(type_test_member_type param)\n{\n return param;\n}"); + + #Member_BaseType + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_basetype\n{\npublic:\n type_test_member_basetype func1(type_test_member_basetype param);\n int *i;\n long j;\n double k;\n type_test_member_basetype* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_member_basetype type_test_member_basetype::func1(type_test_member_basetype param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_basetype\n{\npublic:\n type_test_member_basetype func1(type_test_member_basetype param);\n long long *i;\n long j;\n double k;\n type_test_member_basetype* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_member_basetype type_test_member_basetype::func1(type_test_member_basetype param)\n{\n return param;\n}"); + + #Member_PointerLevel_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel_and_size\n{\npublic:\n type_test_member_pointerlevel_and_size func1(type_test_member_pointerlevel_and_size param);\n long long i;\n long j;\n double k;\n type_test_member_pointerlevel_and_size* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_member_pointerlevel_and_size type_test_member_pointerlevel_and_size::func1(type_test_member_pointerlevel_and_size param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel_and_size\n{\npublic:\n type_test_member_pointerlevel_and_size func1(type_test_member_pointerlevel_and_size param);\n long long *i;\n long j;\n double k;\n type_test_member_pointerlevel_and_size* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_member_pointerlevel_and_size type_test_member_pointerlevel_and_size::func1(type_test_member_pointerlevel_and_size param)\n{\n return param;\n}"); + + #Member_PointerLevel + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel\n{\npublic:\n type_test_member_pointerlevel func1(type_test_member_pointerlevel param);\n int **i;\n long j;\n double k;\n type_test_member_pointerlevel* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_member_pointerlevel type_test_member_pointerlevel::func1(type_test_member_pointerlevel param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel\n{\npublic:\n type_test_member_pointerlevel func1(type_test_member_pointerlevel param);\n int *i;\n long j;\n double k;\n type_test_member_pointerlevel* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_member_pointerlevel type_test_member_pointerlevel::func1(type_test_member_pointerlevel param)\n{\n return param;\n}"); + + #Added_Interface (function) + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_interface\n{\npublic:\n type_test_added_interface func1(type_test_added_interface param);\n int i;\n long j;\n double k;\n type_test_added_interface* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_added_interface type_test_added_interface::func1(type_test_added_interface param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_interface\n{\npublic:\n type_test_added_interface func1(type_test_added_interface param);\n type_test_added_interface added_func(type_test_added_interface param);\n int i;\n long j;\n double k;\n type_test_added_interface* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int added_func_2(void *** param);"); + @Sources_v2 = (@Sources_v2, "type_test_added_interface type_test_added_interface::func1(type_test_added_interface param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "type_test_added_interface type_test_added_interface::added_func(type_test_added_interface param)\n{\n return param;\n}"); + @Sources_v2 = (@Sources_v2, "int added_func_2(void *** param)\n{\n return 0;\n}"); + + #Added_Interface (global variable) + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_variable\n{\npublic:\n int func1(type_test_added_variable param);\n int i;\n long j;\n double k;\n type_test_added_variable* p;\n};"); + @Sources_v1 = (@Sources_v1, "int type_test_added_variable::func1(type_test_added_variable param)\n{\n return i;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_variable\n{\npublic:\n int func1(type_test_added_variable param);\n static int i;\n long j;\n double k;\n type_test_added_variable* p;\n};"); + @Sources_v2 = (@Sources_v2, "int type_test_added_variable::func1(type_test_added_variable param)\n{\n return type_test_added_variable::i;\n}"); + @Sources_v2 = (@Sources_v2, "int type_test_added_variable::i=0;"); + + #Withdrawn_Interface + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_interface\n{\npublic:\n type_test_withdrawn_interface func1(type_test_withdrawn_interface param);\n type_test_withdrawn_interface withdrawn_func(type_test_withdrawn_interface param);\n int i;\n long j;\n double k;\n type_test_withdrawn_interface* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int withdrawn_func_2(void *** param);"); + @Sources_v1 = (@Sources_v1, "type_test_withdrawn_interface type_test_withdrawn_interface::func1(type_test_withdrawn_interface param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "type_test_withdrawn_interface type_test_withdrawn_interface::withdrawn_func(type_test_withdrawn_interface param)\n{\n return param;\n}"); + @Sources_v1 = (@Sources_v1, "int withdrawn_func_2(void *** param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_interface\n{\npublic:\n type_test_withdrawn_interface func1(type_test_withdrawn_interface param);\n int i;\n long j;\n double k;\n type_test_withdrawn_interface* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_withdrawn_interface type_test_withdrawn_interface::func1(type_test_withdrawn_interface param)\n{\n return param;\n}"); + + #Function_Become_Static + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_become_static\n{\npublic:\n type_test_become_static func_become_static(type_test_become_static param);\n int **i;\n long j;\n double k;\n type_test_become_static* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_become_static type_test_become_static::func_become_static(type_test_become_static param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_become_static\n{\npublic:\n static type_test_become_static func_become_static(type_test_become_static param);\n int **i;\n long j;\n double k;\n type_test_become_static* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_become_static type_test_become_static::func_become_static(type_test_become_static param)\n{\n return param;\n}"); + + #Function_Become_NonStatic + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_become_nonstatic\n{\npublic:\n static type_test_become_nonstatic func_become_nonstatic(type_test_become_nonstatic param);\n int **i;\n long j;\n double k;\n type_test_become_nonstatic* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_become_nonstatic type_test_become_nonstatic::func_become_nonstatic(type_test_become_nonstatic param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_become_nonstatic\n{\npublic:\n type_test_become_nonstatic func_become_nonstatic(type_test_become_nonstatic param);\n int **i;\n long j;\n double k;\n type_test_become_nonstatic* p;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_become_nonstatic type_test_become_nonstatic::func_become_nonstatic(type_test_become_nonstatic param)\n{\n return param;\n}"); + + #Parameter_Type_And_Size + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type_and_size(int param, int other_param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_type_and_size(int param, int other_param)\n{\n return other_param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type_and_size(long long param, int other_param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_type_and_size(long long param, int other_param)\n{\n return other_param;\n}"); + + #Parameter_Type + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type(int param, int other_param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_type(int param, int other_param)\n{\n return other_param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type(float param, int other_param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_type(float param, int other_param)\n{\n return other_param;\n}"); + + #Parameter_BaseType + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_basetypechange(int *param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_basetypechange(int *param)\n{\n return sizeof(*param);\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_basetypechange(long long *param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_basetypechange(long long *param)\n{\n return sizeof(*param);\n}"); + + #Parameter_PointerLevel_And_Size + @DataDefs_v1 = (@DataDefs_v1, "long long func_parameter_pointerlevel_and_size(long long param);"); + @Sources_v1 = (@Sources_v1, "long long func_parameter_pointerlevel_and_size(long long param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long func_parameter_pointerlevel_and_size(long long *param);"); + @Sources_v2 = (@Sources_v2, "long long func_parameter_pointerlevel_and_size(long long *param)\n{\n return param[5];\n}"); + + #Parameter_PointerLevel + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_pointerlevel(int *param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_pointerlevel(int *param)\n{\n return param[5];\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_pointerlevel(int **param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_pointerlevel(int **param)\n{\n return param[5][5];\n}"); + + #Return_Type_And_Size + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_size(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_size(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long func_return_type_and_size(int param);"); + @Sources_v2 = (@Sources_v2, "long long func_return_type_and_size(int param)\n{\n return 2^(sizeof(long long)*8-1)-1;\n}"); + + #Return_Type + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type(int param)\n{\n return 0.7;\n}"); + + #Return_BaseType + @DataDefs_v1 = (@DataDefs_v1, "int *func_return_basetype(int param);"); + @Sources_v1 = (@Sources_v1, "int *func_return_basetype(int param)\n{\n int *x = new int[10];\n return x;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_basetype(int param);"); + @Sources_v2 = (@Sources_v2, "long long *func_return_basetype(int param)\n{\n long long *x = new long long[10];\n return x;\n}"); + + #Return_PointerLevel_And_Size + @DataDefs_v1 = (@DataDefs_v1, "long long func_return_pointerlevel_and_size(int param);"); + @Sources_v1 = (@Sources_v1, "long long func_return_pointerlevel_and_size(int param)\n{\n return 100;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_pointerlevel_and_size(int param);"); + @Sources_v2 = (@Sources_v2, "long long *func_return_pointerlevel_and_size(int param)\n{\n long long* x = new long long[10];\n return x;\n}"); + + #Return_PointerLevel + @DataDefs_v1 = (@DataDefs_v1, "int* func_return_pointerlevel(int param);"); + @Sources_v1 = (@Sources_v1, "int* func_return_pointerlevel(int param)\n{\n int* x = new int[10];\n return x;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int **func_return_pointerlevel(int param);"); + @Sources_v2 = (@Sources_v2, "int **func_return_pointerlevel(int param)\n{\n int** x = new int*[10];\n return x;\n}"); + + #typedef to anon struct + @DataDefs_v1 = (@DataDefs_v1, " +typedef struct +{ +public: + int i; + long j; + double k; +} type_test_anon_typedef; +int func_test_anon_typedef(type_test_anon_typedef param);"); + @Sources_v1 = (@Sources_v1, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, " +typedef struct +{ +public: + int i; + long j; + double k; + union { + int dummy[256]; + struct { + char q_skiptable[256]; + const char *p; + int l; + } p; + }; +} type_test_anon_typedef; +int func_test_anon_typedef(type_test_anon_typedef param);"); + @Sources_v2 = (@Sources_v2, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); + + #opaque type + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_opaque\n{\npublic:\n virtual type_test_opaque func1(type_test_opaque param);\n int i;\n long j;\n double k;\n type_test_opaque* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_opaque type_test_opaque::func1(type_test_opaque param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_opaque\n{\npublic:\n virtual type_test_opaque func1(type_test_opaque param);\n int i;\n long j;\n double k;\n type_test_opaque* p;\n int added_member;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_opaque type_test_opaque::func1(type_test_opaque param)\n{\n return param;\n}"); + + #internal function + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_internal\n{\npublic:\n virtual type_test_internal func1(type_test_internal param);\n int i;\n long j;\n double k;\n type_test_internal* p;\n};"); + @Sources_v1 = (@Sources_v1, "type_test_internal type_test_internal::func1(type_test_internal param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_internal\n{\npublic:\n virtual type_test_internal func1(type_test_internal param);\n int i;\n long j;\n double k;\n type_test_internal* p;\n int added_member;\n};"); + @Sources_v2 = (@Sources_v2, "type_test_internal type_test_internal::func1(type_test_internal param)\n{\n return param;\n}"); + + #starting versioning + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_start_versioning(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_start_versioning(int param);"); + @Sources_v2 = (@Sources_v2, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z37func_return_type_and_start_versioningi,_Z37func_return_type_and_start_versioningi\@TEST_2.0\");"); + + #Return_Type And Good Versioning + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_good_versioning(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_good_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z36func_return_type_and_good_versioningi,_Z36func_return_type_and_good_versioningi\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_good_versioning_old(int param);"); + @Sources_v2 = (@Sources_v2, "int func_return_type_and_good_versioning_old(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z40func_return_type_and_good_versioning_oldi,_Z36func_return_type_and_good_versioningi\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_good_versioning(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type_and_good_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver _Z36func_return_type_and_good_versioningi,_Z36func_return_type_and_good_versioningi\@TEST_2.0\");"); + + #Return_Type and bad versioning + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_bad_versioning(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_bad_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver _Z35func_return_type_and_bad_versioningi,_Z35func_return_type_and_bad_versioningi\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning_old(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning_old(int param)\n{\n return 0.7;\n}\n__asm__(\".symver _Z39func_return_type_and_bad_versioning_oldi,_Z35func_return_type_and_bad_versioningi\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver _Z35func_return_type_and_bad_versioningi,_Z35func_return_type_and_bad_versioningi\@TEST_2.0\");"); + + #unnamed struct fields within structs + @DataDefs_v1 = (@DataDefs_v1, " +typedef struct { + int a; + struct { + int b; + float c; + }; + int d; +} type_test_unnamed; +int func_test_unnamed(type_test_unnamed param);"); + @Sources_v1 = (@Sources_v1, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, " +typedef struct { + int a; + struct { + long double b; + float c; + }; + int d; +} type_test_unnamed; +int func_test_unnamed(type_test_unnamed param);"); + @Sources_v2 = (@Sources_v2, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); + + #constants + @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PUBLIC_CONSTANT \"old_value\""); + @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PUBLIC_CONSTANT \"new_value\""); + + @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PRIVATE_CONSTANT \"old_value\"\n#undef TEST_PRIVATE_CONSTANT"); + @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PRIVATE_CONSTANT \"new_value\"\n#undef TEST_PRIVATE_CONSTANT"); + + #unions + @DataDefs_v1 = (@DataDefs_v1, " +union type_test_union { + int a; + struct { + int b; + float c; + }; + int d; +}; +int func_test_union(type_test_union param);"); + @Sources_v1 = (@Sources_v1, "int func_test_union(type_test_union param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, " +union type_test_union { + int a; + long double new_member; + struct { + int b; + float c; + }; + int d; +}; +int func_test_union(type_test_union param);"); + @Sources_v2 = (@Sources_v2, "int func_test_union(type_test_union param)\n{\n return 0;\n}"); + + #typedefs + @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1;\n}"); + + #typedefs in member type + @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\n public:\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(type_test_member_typedef_change param);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_typedef_change(type_test_member_typedef_change param)\n{\n return 1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\n public:\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(type_test_member_typedef_change param);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_typedef_change(type_test_member_typedef_change param)\n{\n return 1;\n}"); + + create_TestSuite("abi_changes_test_cpp", "C++", join("\n\n", @DataDefs_v1), join("\n\n", @Sources_v1), join("\n\n", @DataDefs_v2), join("\n\n", @Sources_v2), "type_test_opaque", "_ZN18type_test_internal5func1ES_"); +} + +sub testSystem_c() +{ + print "\ntesting for C library changes\n"; + my (@DataDefs_v1, @Sources_v1, @DataDefs_v2, @Sources_v2) = (); + + #Withdrawn_Parameter + @DataDefs_v1 = (@DataDefs_v1, "int func_withdrawn_parameter(int param, int withdrawn_param);"); + @Sources_v1 = (@Sources_v1, "int func_withdrawn_parameter(int param, int withdrawn_param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_withdrawn_parameter(int param);"); + @Sources_v2 = (@Sources_v2, "int func_withdrawn_parameter(int param)\n{\n return 0;\n}"); + + #Added_Parameter + @DataDefs_v1 = (@DataDefs_v1, "int func_added_parameter(int param);"); + @Sources_v1 = (@Sources_v1, "int func_added_parameter(int param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_added_parameter(int param, int added_param);"); + @Sources_v2 = (@Sources_v2, "int func_added_parameter(int param, int added_param)\n{\n return 0;\n}"); + + #added function with typedef funcptr parameter + @DataDefs_v2 = (@DataDefs_v2, "typedef int (*FUNCPTR_TYPE)(int a, int b);\nint added_function_param_typedef_funcptr(FUNCPTR_TYPE*const** f);"); + @Sources_v2 = (@Sources_v2, "int added_function_param_typedef_funcptr(FUNCPTR_TYPE*const** f)\n{\n return 0;\n}"); + + #added function with funcptr parameter + @DataDefs_v2 = (@DataDefs_v2, "int added_function_param_funcptr(int(*func)(int, int));"); + @Sources_v2 = (@Sources_v2, "int added_function_param_funcptr(int(*func)(int, int))\n{\n return 0;\n}"); + + #added function with no limited parameters + @DataDefs_v2 = (@DataDefs_v2, "int added_function_nolimit_param(float p1, ...);"); + @Sources_v2 = (@Sources_v2, "int added_function_nolimit_param(float p1, ...)\n{\n return 0;\n}"); + + #size change + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_size\n{\n long long i[5];\n long j;\n double k;\n struct type_test_size* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_type_size(struct type_test_size param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_type_size(struct type_test_size param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_size\n{\n long long i[5];\n long long j;\n double k;\n struct type_test_size* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_type_size(struct type_test_size param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_type_size(struct type_test_size param, int param_2)\n{\n return param_2;\n}"); + + #Added_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_member\n{\n int i;\n long j;\n double k;\n struct type_test_added_member* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_added_member(struct type_test_added_member param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_added_member(struct type_test_added_member param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_member\n{\n int i;\n long j;\n double k;\n struct type_test_added_member* p;\n int added_member;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_added_member(struct type_test_added_member param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_added_member(struct type_test_added_member param, int param_2)\n{\n return param_2;\n}"); + + #Added_Middle_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_added_middle_member\n{\n int i;\n long j;\n double k;\n struct type_test_added_member* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_added_middle_member\n{\n int i;\n int added_middle_member;\n long j;\n double k;\n struct type_test_added_member* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_added_middle_member(struct type_test_added_middle_member param, int param_2)\n{\n return param_2;\n}"); + + #Member_Rename + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_rename\n{\n long i;\n long j;\n double k;\n struct type_test_member_rename* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_rename(struct type_test_member_rename param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_rename(struct type_test_member_rename param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_rename\n{\n long renamed_member;\n long j;\n double k;\n struct type_test_member_rename* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_rename(struct type_test_member_rename param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_rename(struct type_test_member_rename param, int param_2)\n{\n return param_2;\n}"); + + #Withdrawn_Member_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_member\n{\n int i;\n long j;\n double k;\n struct type_test_withdrawn_member* p;\n int withdrawn_member;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_member\n{\n int i;\n long j;\n double k;\n struct type_test_withdrawn_member* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_withdrawn_member(struct type_test_withdrawn_member param, int param_2)\n{\n return param_2;\n}"); + + #Withdrawn_Middle_Member + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_withdrawn_middle_member\n{\n int i;\n int withdrawn_middle_member;\n long j;\n double k;\n struct type_test_withdrawn_middle_member* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_withdrawn_middle_member\n{\n int i;\n long j;\n double k;\n struct type_test_withdrawn_middle_member* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_withdrawn_middle_member(struct type_test_withdrawn_middle_member param, int param_2)\n{\n return param_2;\n}"); + + #Enum_Member_Value + @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_value_change\n{\n MEMBER_1=1,\n MEMBER_2=2\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); + @Sources_v1 = (@Sources_v1, +"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_value_change\n{\n MEMBER_1=2,\n MEMBER_2=1\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_value_change(enum type_test_enum_member_value_change param);"); + @Sources_v2 = (@Sources_v2, +"int func_test_enum_member_value_change(enum type_test_enum_member_value_change param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + #Enum_Member_Name + @DataDefs_v1 = (@DataDefs_v1, "enum type_test_enum_member_rename\n{\n BRANCH_1=1,\n BRANCH_2=2\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); + @Sources_v1 = (@Sources_v1, +"int func_test_enum_member_rename(enum type_test_enum_member_rename param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + @DataDefs_v2 = (@DataDefs_v2, "enum type_test_enum_member_rename\n{\n BRANCH_FIRST=1,\n BRANCH_SECOND=1\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_enum_member_rename(enum type_test_enum_member_rename param);"); + @Sources_v2 = (@Sources_v2, +"int func_test_enum_member_rename(enum type_test_enum_member_rename param) +{ + switch(param) + { + case 1: + return 1; + case 2: + return 2; + } + return 0; +}"); + + #Member_Type_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type_and_size\n{\n int i;\n long j;\n double k;\n struct type_test_member_type_and_size* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type_and_size\n{\n int i;\n long j;\n long double k;\n struct type_test_member_type_and_size* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_type_and_size(struct type_test_member_type_and_size param, int param_2)\n{\n return param_2;\n}"); + + #Member_Type + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_type\n{\n int i;\n long j;\n double k;\n struct type_test_member_type* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_type(struct type_test_member_type param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_type(struct type_test_member_type param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_type\n{\n float i;\n long j;\n double k;\n struct type_test_member_type* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_type(struct type_test_member_type param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_type(struct type_test_member_type param, int param_2)\n{\n return param_2;\n}"); + + #Member_BaseType + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_basetype\n{\n int i;\n long *j;\n double k;\n struct type_test_member_basetype* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_basetype\n{\n int i;\n long long *j;\n double k;\n struct type_test_member_basetype* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_basetype(struct type_test_member_basetype param, int param_2)\n{\n return param_2;\n}"); + + #Member_PointerLevel_And_Size + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel_and_size\n{\n int i;\n long long j;\n double k;\n struct type_test_member_pointerlevel_and_size* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel_and_size\n{\n int i;\n long long *j;\n double k;\n struct type_test_member_pointerlevel_and_size* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_pointerlevel_and_size(struct type_test_member_pointerlevel_and_size param, int param_2)\n{\n return param_2;\n}"); + + #Member_PointerLevel + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_member_pointerlevel\n{\n int i;\n long *j;\n double k;\n struct type_test_member_pointerlevel* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_member_pointerlevel\n{\n int i;\n long **j;\n double k;\n struct type_test_member_pointerlevel* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_pointerlevel(struct type_test_member_pointerlevel param, int param_2)\n{\n return param_2;\n}"); + + #Added_Interface + @DataDefs_v2 = (@DataDefs_v2, "int added_func(int param);"); + @Sources_v2 = (@Sources_v2, "int added_func(int param)\n{\n return param;\n}"); + + #Withdrawn_Interface + @DataDefs_v1 = (@DataDefs_v1, "int withdrawn_func(int param);"); + @Sources_v1 = (@Sources_v1, "int withdrawn_func(int param)\n{\n return param;\n}"); + + #Parameter_Type_And_Size + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type_and_size(int param, int other_param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_type_and_size(int param, int other_param)\n{\n return other_param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type_and_size(long long param, int other_param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_type_and_size(long long param, int other_param)\n{\n return other_param;\n}"); + + #Parameter_Type + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_type(int param, int other_param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_type(int param, int other_param)\n{\n return other_param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_type(float param, int other_param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_type(float param, int other_param)\n{\n return other_param;\n}"); + + #Parameter_BaseType (Typedef) + @DataDefs_v1 = (@DataDefs_v1, "typedef int* PARAM_TYPEDEF;\nint func_parameter_basetypechange_typedef(PARAM_TYPEDEF param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_basetypechange_typedef(PARAM_TYPEDEF param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "typedef const int* PARAM_TYPEDEF;\nint func_parameter_basetypechange_typedef(PARAM_TYPEDEF param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_basetypechange_typedef(PARAM_TYPEDEF param)\n{\n return 0;\n}"); + + #Parameter_BaseType + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_basetypechange(int *param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_basetypechange(int *param)\n{\n return sizeof(*param);\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_basetypechange(long long *param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_basetypechange(long long *param)\n{\n return sizeof(*param);\n}"); + + #Parameter_PointerLevel_And_Size + @DataDefs_v1 = (@DataDefs_v1, "long long func_parameter_pointerlevel_and_size(long long param);"); + @Sources_v1 = (@Sources_v1, "long long func_parameter_pointerlevel_and_size(long long param)\n{\n return param;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long func_parameter_pointerlevel_and_size(long long *param);"); + @Sources_v2 = (@Sources_v2, "long long func_parameter_pointerlevel_and_size(long long *param)\n{\n return param[5];\n}"); + + #Parameter_PointerLevel + @DataDefs_v1 = (@DataDefs_v1, "int func_parameter_pointerlevel(int *param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_pointerlevel(int *param)\n{\n return param[5];\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_parameter_pointerlevel(int **param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_pointerlevel(int **param)\n{\n return param[5][5];\n}"); + + #Return_Type_And_Size + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_size(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_size(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long func_return_type_and_size(int param);"); + @Sources_v2 = (@Sources_v2, "long long func_return_type_and_size(int param)\n{\n return 2^(sizeof(long long)*8-1)-1;\n}"); + + #Return_Type + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type(int param)\n{\n return 0.7;\n}"); + + #Return_BaseType + @DataDefs_v1 = (@DataDefs_v1, "int *func_return_basetypechange(int param);"); + @Sources_v1 = (@Sources_v1, "int *func_return_basetypechange(int param)\n{\n int *x = (int*)malloc(10*sizeof(int));\n *x = 2^(sizeof(int)*8-1)-1;\n return x;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_basetypechange(int param);"); + @Sources_v2 = (@Sources_v2, "long long *func_return_basetypechange(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n return x;\n}"); + + #Return_PointerLevel_And_Size + @DataDefs_v1 = (@DataDefs_v1, "long long func_return_pointerlevel_and_size(int param);"); + @Sources_v1 = (@Sources_v1, "long long func_return_pointerlevel_and_size(int param)\n{\n return 100;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long *func_return_pointerlevel_and_size(int param);"); + @Sources_v2 = (@Sources_v2, "long long *func_return_pointerlevel_and_size(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n return x;\n}"); + + #Return_PointerLevel + @DataDefs_v1 = (@DataDefs_v1, "long long *func_return_pointerlevel(int param);"); + @Sources_v1 = (@Sources_v1, "long long *func_return_pointerlevel(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n return x;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "long long **func_return_pointerlevel(int param);"); + @Sources_v2 = (@Sources_v2, "long long **func_return_pointerlevel(int param)\n{\n long long *x = (long long*)malloc(10*sizeof(long long));\n *x = 2^(sizeof(long long)*8-1)-1;\n long *y = (long*)malloc(sizeof(long long));\n *y=(long)&x;\n return (long long **)y;\n}"); + + #typedef to anon struct + @DataDefs_v1 = (@DataDefs_v1, " +typedef struct +{ + int i; + long j; + double k; +} type_test_anon_typedef; +int func_test_anon_typedef(type_test_anon_typedef param);"); + @Sources_v1 = (@Sources_v1, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, " +typedef struct +{ + int i; + long j; + double k; + union { + int dummy[256]; + struct { + char q_skiptable[256]; + const char *p; + int l; + } p; + }; +} type_test_anon_typedef; +int func_test_anon_typedef(type_test_anon_typedef param);"); + @Sources_v2 = (@Sources_v2, "int func_test_anon_typedef(type_test_anon_typedef param)\n{\n return 0;\n}"); + + #opaque type + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_opaque\n{\n long long i[5];\n long j;\n double k;\n struct type_test_opaque* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_opaque(struct type_test_opaque param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_opaque(struct type_test_opaque param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_opaque\n{\n long long i[5];\n long long j;\n double k;\n struct type_test_opaque* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_opaque(struct type_test_opaque param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_opaque(struct type_test_opaque param, int param_2)\n{\n return param_2;\n}"); + + #internal function + @DataDefs_v1 = (@DataDefs_v1, "struct type_test_internal\n{\n long long i[5];\n long j;\n double k;\n struct type_test_internal* p;\n};"); + @DataDefs_v1 = (@DataDefs_v1, "int func_test_internal(struct type_test_internal param, int param_2);"); + @Sources_v1 = (@Sources_v1, "int func_test_internal(struct type_test_internal param, int param_2)\n{\n return param_2;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "struct type_test_internal\n{\n long long i[5];\n long long j;\n double k;\n struct type_test_internal* p;\n};"); + @DataDefs_v2 = (@DataDefs_v2, "int func_test_internal(struct type_test_internal param, int param_2);"); + @Sources_v2 = (@Sources_v2, "int func_test_internal(struct type_test_internal param, int param_2)\n{\n return param_2;\n}"); + + #starting versioning + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_start_versioning(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_start_versioning(int param);"); + @Sources_v2 = (@Sources_v2, "int func_return_type_and_start_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_start_versioning,func_return_type_and_start_versioning\@TEST_2.0\");"); + + #Return_Type and good versioning + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_good_versioning(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_good_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_good_versioning,func_return_type_and_good_versioning\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "int func_return_type_and_good_versioning_old(int param);"); + @Sources_v2 = (@Sources_v2, "int func_return_type_and_good_versioning_old(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_good_versioning_old,func_return_type_and_good_versioning\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_good_versioning(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type_and_good_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver func_return_type_and_good_versioning,func_return_type_and_good_versioning\@TEST_2.0\");"); + + #Return_Type and bad versioning + @DataDefs_v1 = (@DataDefs_v1, "int func_return_type_and_bad_versioning(int param);"); + @Sources_v1 = (@Sources_v1, "int func_return_type_and_bad_versioning(int param)\n{\n return 2^(sizeof(int)*8-1)-1;\n}\n__asm__(\".symver func_return_type_and_bad_versioning,func_return_type_and_bad_versioning\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning_old(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning_old(int param)\n{\n return 0.7;\n}\n__asm__(\".symver func_return_type_and_bad_versioning_old,func_return_type_and_bad_versioning\@TEST_1.0\");"); + + @DataDefs_v2 = (@DataDefs_v2, "float func_return_type_and_bad_versioning(int param);"); + @Sources_v2 = (@Sources_v2, "float func_return_type_and_bad_versioning(int param)\n{\n return 0.7;\n}\n__asm__(\".symver func_return_type_and_bad_versioning,func_return_type_and_bad_versioning\@TEST_2.0\");"); + + #unnamed struct/union fields within structs/unions + @DataDefs_v1 = (@DataDefs_v1, " +typedef struct { + int a; + union { + int b; + float c; + }; + int d; +} type_test_unnamed; +int func_test_unnamed(type_test_unnamed param);"); + @Sources_v1 = (@Sources_v1, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, " +typedef struct { + int a; + union { + long double b; + float c; + }; + int d; +} type_test_unnamed; +int func_test_unnamed(type_test_unnamed param);"); + @Sources_v2 = (@Sources_v2, "int func_test_unnamed(type_test_unnamed param)\n{\n return 0;\n}"); + + #constants + @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PUBLIC_CONSTANT \"old_value\""); + @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PUBLIC_CONSTANT \"new_value\""); + + @DataDefs_v1 = (@DataDefs_v1, "#define TEST_PRIVATE_CONSTANT \"old_value\"\n#undef TEST_PRIVATE_CONSTANT"); + @DataDefs_v2 = (@DataDefs_v2, "#define TEST_PRIVATE_CONSTANT \"new_value\"\n#undef TEST_PRIVATE_CONSTANT"); + + #anon ptr typedef + @DataDefs_v1 = (@DataDefs_v1, " +#ifdef __cplusplus +extern \"C\" { +#endif +typedef struct { + int a; +} *type_test_anonptr_typedef; +extern __attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param); +#ifdef __cplusplus +} +#endif"); + @Sources_v1 = (@Sources_v1, "__attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param)\n{\n return 0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, " +#ifdef __cplusplus +extern \"C\" { +#endif +typedef struct { + float a; +} *type_test_anonptr_typedef; +extern __attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param); +#ifdef __cplusplus +} +#endif"); + @Sources_v2 = (@Sources_v2, "__attribute__ ((visibility(\"default\"))) int func_test_anonptr_typedef(type_test_anonptr_typedef param)\n{\n return 0;\n}"); + + #typedefs + @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); + @Sources_v1 = (@Sources_v1, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1.0;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE;\nint func_parameter_typedef_change(TYPEDEF_TYPE param);"); + @Sources_v2 = (@Sources_v2, "int func_parameter_typedef_change(TYPEDEF_TYPE param)\n{\n return 1;\n}"); + + #typedefs in member type + @DataDefs_v1 = (@DataDefs_v1, "typedef float TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(struct type_test_member_typedef_change param);"); + @Sources_v1 = (@Sources_v1, "int func_test_member_typedef_change(struct type_test_member_typedef_change param)\n{\n return 1;\n}"); + + @DataDefs_v2 = (@DataDefs_v2, "typedef int TYPEDEF_TYPE_2;\nstruct type_test_member_typedef_change{\nTYPEDEF_TYPE_2 m;};\nint func_test_member_typedef_change(struct type_test_member_typedef_change param);"); + @Sources_v2 = (@Sources_v2, "int func_test_member_typedef_change(struct type_test_member_typedef_change param)\n{\n return 1;\n}"); + + create_TestSuite("abi_changes_test_c", "C", join("\n\n", @DataDefs_v1), join("\n\n", @Sources_v1), join("\n\n", @DataDefs_v2), join("\n\n", @Sources_v2), "type_test_opaque", "func_test_internal"); +} + +sub create_TestSuite($$$$$$$$) +{ + my ($Dir, $Lang, $DataDefs_v1, $Sources_v1, $DataDefs_v2, $Sources_v2, $Opaque, $Private) = @_; + my $Ext = ($Lang eq "C++")?"cpp":"c"; + my $Gcc = ($Lang eq "C++")?"g++":"gcc"; + #creating test suite + my $Path_v1 = "$Dir/lib_abi_changes_test.v1"; + my $Path_v2 = "$Dir/lib_abi_changes_test.v2"; + + system("rm", "-fr", $Path_v1, $Path_v2); + system("mkdir", "-p", $Path_v1, $Path_v2); + + writeFile("$Path_v1/version", "TEST_1.0 {\n};\nTEST_2.0 {\n};\n"); + writeFile("$Path_v1/lib_abi_changes_test.h", "#include <stdlib.h>\n".$DataDefs_v1."\n"); + writeFile("$Path_v1/lib_abi_changes_test.$Ext", "#include \"lib_abi_changes_test.h\"\n".$Sources_v1."\n"); + writeFile("$Dir/descriptor.v1", "<version>\n 1.0.0\n</version>\n\n<headers>\n ".$ENV{"PWD"}."/$Path_v1/\n</headers>\n\n<libs>\n ".$ENV{"PWD"}."/$Path_v1/\n</libs>\n\n<opaque_types>\n $Opaque\n</opaque_types>\n\n<skip_interfaces>\n $Private\n</skip_interfaces>\n\n<include_paths>\n ".$ENV{"PWD"}."/$Path_v1\n</include_paths>\n"); + + writeFile("$Path_v2/version", "TEST_1.0 {\n};\nTEST_2.0 {\n};\n"); + writeFile("$Path_v2/lib_abi_changes_test.h", "#include <stdlib.h>\n".$DataDefs_v2."\n"); + writeFile("$Path_v2/lib_abi_changes_test.$Ext", "#include \"lib_abi_changes_test.h\"\n".$Sources_v2."\n"); + writeFile("$Dir/descriptor.v2", "<version>\n 2.0.0\n</version>\n\n<headers>\n ".$ENV{"PWD"}."/$Path_v2/\n</headers>\n\n<libs>\n ".$ENV{"PWD"}."/$Path_v2/\n</libs>\n\n<opaque_types>\n $Opaque\n</opaque_types>\n\n<skip_interfaces>\n $Private\n</skip_interfaces>\n\n<include_paths>\n ".$ENV{"PWD"}."/$Path_v2\n</include_paths>\n"); + + system("$Gcc $Path_v1/lib_abi_changes_test.h"); + if($?) + { + print "ERROR: can't compile \'$Path_v1/lib_abi_changes_test.h\'\n"; + return; + } + system("$Gcc -Wl,--version-script $Path_v1/version -shared $Path_v1/lib_abi_changes_test.$Ext -o $Path_v1/lib_abi_changes_test.so"); + if($?) + { + print "ERROR: can't compile \'$Path_v1/lib_abi_changes_test.$Ext\'\n"; + return; + } + system("$Gcc $Path_v2/lib_abi_changes_test.h"); + if($?) + { + print "ERROR: can't compile \'$Path_v2/lib_abi_changes_test.h\'\n"; + return; + } + system("$Gcc -Wl,--version-script $Path_v2/version -shared $Path_v2/lib_abi_changes_test.$Ext -o $Path_v2/lib_abi_changes_test.so"); + if($?) + { + print "ERROR: can't compile \'$Path_v2/lib_abi_changes_test.$Ext\'\n"; + return; + } + + #running abi-compliance-checker + system("$0 -l lib_$Dir -d1 $Dir/descriptor.v1 -d2 $Dir/descriptor.v2"); +} + +sub writeFile($$) +{ + my ($Path, $Content) = @_; + return if(not $Path); + open (FILE, ">".$Path) || die ("Can't open file $Path\n"); + print FILE $Content; + close(FILE); +} + +sub readFile($) +{ + my $Path = $_[0]; + return "" if(not $Path or not -f $Path); + open (FILE, $Path); + my $Content = join("\n", <FILE>); + close(FILE); + return toUnix($Content); +} + +sub toUnix($) +{ + my $Text = $_[0]; + $Text=~s/\r//g; + return $Text; +} + +sub getArch() +{ + my $Arch = $ENV{"CPU"}; + if(not $Arch) + { + $Arch = `uname -m`; + chomp($Arch); + } + if(not $Arch) + { + $Arch = `uname -p`; + chomp($Arch); + } + $Arch = "x86" if($Arch =~ /i[3-7]86/); + return $Arch; +} + +sub get_Report_Header() +{ + my $Report_Header = "<h1>ABI compliance report for the library <span style='color:Blue;white-space:nowrap;'>$TargetLibraryName </span> from version <span style='color:Red;white-space:nowrap;'>".$Descriptor{1}{"Version"}."</span> to <span style='color:Red;white-space:nowrap;'>".$Descriptor{2}{"Version"}."</span> on <span style='color:Blue;'>".getArch()."</span> ".(($AppPath)?"relating to the portability of application <span style='color:Blue;'>".get_FileName($AppPath)."</span>":"")."</h1>\n"; + return "<!--Header-->\n".$Report_Header."<!--Header_End-->\n"; +} + +sub get_SourceInfo() +{ + my $CheckedHeaders = "<!--Checked_Headers-->\n<a name='Checked_Headers'></a><h2 style='margin-bottom:0px;padding-bottom:0px;'>Checked header files (".keys(%{$Headers{1}}).")</h2><hr/>\n"; + foreach my $Header_Dest (sort {lc($Headers{1}{$a}{"Name"}) cmp lc($Headers{1}{$b}{"Name"})} keys(%{$Headers{1}})) + { + my $Header_Name = $Headers{1}{$Header_Dest}{"Name"}; + my $Dest_Count = keys(%{$HeaderName_Destinations{1}{$Header_Name}}); + my $Identity = $Headers{1}{$Header_Dest}{"Identity"}; + my $Dest_Comment = ($Dest_Count>1 and $Identity=~/\//)?" ($Identity)":""; + $CheckedHeaders .= "<span class='header_list_elem'>$Header_Name"."$Dest_Comment</span><br/>\n"; + } + $CheckedHeaders .= "<!--Checked_Headers_End--><br/><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + my $CheckedLibs = "<!--Checked_Libs-->\n<a name='Checked_Libs'></a><h2 style='margin-bottom:0px;padding-bottom:0px;'>Checked shared objects (".keys(%{$SoNames_All{1}}).")</h2><hr/>\n"; + foreach my $Library (sort {lc($a) cmp lc($b)} keys(%{$SoNames_All{1}})) + { + $CheckedLibs .= "<span class='solib_list_elem'>$Library</span><br/>\n"; + } + $CheckedLibs .= "<!--Checked_Libs_End--><br/><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + return $CheckedHeaders.$CheckedLibs; +} + +sub get_TypeProblems_Count($$) +{ + my ($TypeChanges, $TargetPriority) = @_; + my $Type_Problems_Count = 0; + foreach my $TypeName (sort keys(%{$TypeChanges})) + { + my %Kinds_Target = (); + foreach my $Kind (keys(%{$TypeChanges->{$TypeName}})) + { + foreach my $Location (keys(%{$TypeChanges->{$TypeName}{$Kind}})) + { + my $Priority = $TypeChanges->{$TypeName}{$Kind}{$Location}{"Priority"}; + next if($Priority ne $TargetPriority); + my $Target = $TypeChanges->{$TypeName}{$Kind}{$Location}{"Target"}; + next if($Kinds_Target{$Kind}{$Target}); + $Kinds_Target{$Kind}{$Target} = 1; + $Type_Problems_Count += 1; + } + } + } + return $Type_Problems_Count; +} + +sub get_Summary() +{ + my ($Added, $Withdrawn, $I_Problems_High, $I_Problems_Medium, $I_Problems_Low, $T_Problems_High, $T_Problems_Medium, $T_Problems_Low) = (0,0,0,0,0,0,0,0); + foreach my $Interface (sort keys(%CompatProblems)) + { + foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) + { + if($InterfaceProblems_Kind{$Kind}) + { + foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) + { + if($Kind eq "Added_Interface") + { + $Added += 1; + } + elsif($Kind eq "Withdrawn_Interface") + { + $Withdrawn += 1; + } + else + { + if($CompatProblems{$Interface}{$Kind}{$Location}{"Priority"} eq "High") + { + $I_Problems_High += 1; + } + elsif($CompatProblems{$Interface}{$Kind}{$Location}{"Priority"} eq "Medium") + { + $I_Problems_Medium += 1; + } + elsif($CompatProblems{$Interface}{$Kind}{$Location}{"Priority"} eq "Low") + { + $I_Problems_Low += 1; + } + } + } + } + } + } + + my (%TypeChanges, %Type_MaxPriority); + foreach my $Interface (sort keys(%CompatProblems)) + { + foreach my $Kind (keys(%{$CompatProblems{$Interface}})) + { + if($TypeProblems_Kind{$Kind}) + { + foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) + { + my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; + my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; + %{$TypeChanges{$Type_Name}{$Kind}{$Location}} = %{$CompatProblems{$Interface}{$Kind}{$Location}}; + $Type_MaxPriority{$Type_Name}{$Kind} = max_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority); + } + } + } + } + + foreach my $Type_Name (keys(%TypeChanges)) + { + foreach my $Kind (keys(%{$TypeChanges{$Type_Name}})) + { + foreach my $Location (keys(%{$TypeChanges{$Type_Name}{$Kind}})) + { + my $Priority = $TypeChanges{$Type_Name}{$Kind}{$Location}{"Priority"}; + if(cmp_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority)) + { + delete($TypeChanges{$Type_Name}{$Kind}{$Location}); + } + } + } + } + + $T_Problems_High = get_TypeProblems_Count(\%TypeChanges, "High"); + $T_Problems_Medium = get_TypeProblems_Count(\%TypeChanges, "Medium"); + $T_Problems_Low = get_TypeProblems_Count(\%TypeChanges, "Low"); + + #summary + my $Summary = "<h2 style='margin-bottom:0px;padding-bottom:0px;'>Summary</h2><hr/>"; + $Summary .= "<table cellpadding='3' border='1' style='border-collapse:collapse;'>"; + + + my $Checked_Headers_Link = "0"; + $Checked_Headers_Link = "<a href='#Checked_Headers' style='color:Blue;'>".keys(%{$Headers{1}})."</a>" if(keys(%{$Headers{1}})>0); + $Summary .= "<tr><td class='table_header summary_item'>Total header files checked</td><td class='summary_item_value'>$Checked_Headers_Link</td></tr>"; + + my $Checked_Libs_Link = "0"; + $Checked_Libs_Link = "<a href='#Checked_Libs' style='color:Blue;'>".keys(%{$SoNames_All{1}})."</a>" if(keys(%{$SoNames_All{1}})>0); + $Summary .= "<tr><td class='table_header summary_item'>Total shared objects checked</td><td class='summary_item_value'>$Checked_Libs_Link</td></tr>"; + $Summary .= "<tr><td class='table_header summary_item'>Total interfaces / types checked</td><td class='summary_item_value'>".keys(%CheckedInterfaces)." / ".keys(%CheckedTypes)."</td></tr>"; + + my $Verdict = "<span style='color:Green;'><b>Compatible</b></span>"; + $Verdict = "<span style='color:Red;'><b>Incompatible</b></span>" if(($Withdrawn>0) or ($I_Problems_High>0) or ($T_Problems_High>0)); + $Summary .= "<tr><td class='table_header summary_item'>Verdict</td><td class='summary_item_value'>$Verdict</td></tr>"; + + $Summary .= "</table>\n"; + + #problem summary + my $Problem_Summary = "<h2 style='margin-bottom:0px;padding-bottom:0px;'>Problem Summary</h2><hr/>"; + $Problem_Summary .= "<table cellpadding='3' border='1' style='border-collapse:collapse;'>"; + + my $Added_Link = "0"; + $Added_Link = "<a href='#Added' style='color:Blue;'>$Added</a>" if($Added>0); + $Problem_Summary .= "<tr><td class='table_header summary_item' colspan='2'>Added interfaces</td><td class='summary_item_value'>$Added_Link</td></tr>"; + + my $WIthdrawn_Link = "0"; + $WIthdrawn_Link = "<a href='#Withdrawn' style='color:Blue;'>$Withdrawn</a>" if($Withdrawn>0); + $Problem_Summary .= "<tr><td class='table_header summary_item' colspan='2'>Withdrawn interfaces</td><td class='summary_item_value'>$WIthdrawn_Link</td></tr>"; + + my $TH_Link = "0"; + $TH_Link = "<a href='#Type_Problems_High' style='color:Blue;'>$T_Problems_High</a>" if($T_Problems_High>0); + $Problem_Summary .= "<tr><td class='table_header summary_item' rowspan='3'>Problems in<br/>Data Types</td><td class='table_header summary_item' style='color:Red;'>High risk</td><td align='right' class='summary_item_value'>$TH_Link</td></tr>"; + + my $TM_Link = "0"; + $TM_Link = "<a href='#Type_Problems_Medium' style='color:Blue;'>$T_Problems_Medium</a>" if($T_Problems_Medium>0); + $Problem_Summary .= "<tr><td class='table_header summary_item'>Medium risk</td><td class='summary_item_value'>$TM_Link</td></tr>"; + + my $TL_Link = "0"; + $TL_Link = "<a href='#Type_Problems_Low' style='color:Blue;'>$T_Problems_Low</a>" if($T_Problems_Low>0); + $Problem_Summary .= "<tr><td class='table_header summary_item'>Low risk</td><td class='summary_item_value'>$TL_Link</td></tr>"; + + my $IH_Link = "0"; + $IH_Link = "<a href='#Interface_Problems_High' style='color:Blue;'>$I_Problems_High</a>" if($I_Problems_High>0); + $Problem_Summary .= "<tr><td class='table_header summary_item' rowspan='3'>Interface<br/>problems</td><td class='table_header summary_item' style='color:Red;'>High risk</td><td class='summary_item_value'>$IH_Link</td></tr>"; + + my $IM_Link = "0"; + $IM_Link = "<a href='#Interface_Problems_Medium' style='color:Blue;'>$I_Problems_Medium</a>" if($I_Problems_Medium>0); + $Problem_Summary .= "<tr><td class='table_header summary_item'>Medium risk</td><td class='summary_item_value'>$IM_Link</td></tr>"; + + my $IL_Link = "0"; + $IL_Link = "<a href='#Interface_Problems_Low' style='color:Blue;'>$I_Problems_Low</a>" if($I_Problems_Low>0); + $Problem_Summary .= "<tr><td class='table_header summary_item'>Low risk</td><td class='summary_item_value'>$IL_Link</td></tr>"; + + my $ChangedConstants_Link = "0"; + $ChangedConstants_Link = "<a href='#Constants' style='color:Blue;'>".keys(%ConstantProblems)."</a>" if(keys(%ConstantProblems)>0); + $Problem_Summary .= "<tr><td class='table_header summary_item' colspan='2'>Constants Problems</td><td class='summary_item_value'>$ChangedConstants_Link</td></tr>"; + + $Problem_Summary .= "</table>\n"; + return "<!--Summary-->\n".$Summary.$Problem_Summary."<!--Summary_End-->\n"; +} + +sub get_Report_ChangedConstants() +{ + my ($CHANGED_CONSTANTS, %HeaderConstant); + foreach my $Name (keys(%ConstantProblems)) + { + $HeaderConstant{$ConstantProblems{$Name}{"Header"}}{$Name} = 1; + } + my $Constants_Number = 0; + foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%HeaderConstant)) + { + $CHANGED_CONSTANTS .= "<span class='header_name'>$HeaderName</span><br/>\n"; + foreach my $Name (sort {lc($a) cmp lc($b)} keys(%{$HeaderConstant{$HeaderName}})) + { + $Constants_Number += 1; + my $Old_Value = htmlSpecChars($ConstantProblems{$Name}{"Old_Value"}); + my $New_Value = htmlSpecChars($ConstantProblems{$Name}{"New_Value"}); + my $Incompatibility = "The value of constant <b>$Name</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>."; + my $Effect = "If application uses this constant as a parameter of some interface than its execution may change."; + my $ConstantProblemsReport = "<tr><td align='center' valign='top' class='table_header'><span class='problem_num'>1</span></td><td align='left' valign='top'><span class='problem_body'>".$Incompatibility."</span></td><td align='left' valign='top'><span class='problem_body'>$Effect</span></td></tr>\n"; + $CHANGED_CONSTANTS .= $ContentSpanStart."<span class='extension'>[+]</span> ".$Name.$ContentSpanEnd."<br/>\n$ContentDivStart<table width='900px' cellpadding='3' cellspacing='0' class='problems_table'><tr><td align='center' width='2%' class='table_header'><span class='problem_title' style='white-space:nowrap;'></span></td><td width='47%' align='center' class='table_header'><span class='problem_sub_title'>Incompatibility</span></td><td align='center' class='table_header'><span class='problem_sub_title'>Effect</span></td></tr>$ConstantProblemsReport</table><br/>$ContentDivEnd\n"; + $CHANGED_CONSTANTS = insertIDs($CHANGED_CONSTANTS); + } + $CHANGED_CONSTANTS .= "<br/>\n"; + } + if($CHANGED_CONSTANTS) + { + $CHANGED_CONSTANTS = "<a name='Constants'></a><h2 style='margin-bottom:0px;padding-bottom:0px;'>Constants Problems ($Constants_Number)</h2><hr/>\n"."<!--Changed_Constants-->\n".$CHANGED_CONSTANTS."<!--Changed_Constants_End-->\n"."<input id='Changed_Constants_Count' type='hidden' value=\'$Constants_Number\' /><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + } + return $CHANGED_CONSTANTS; +} + +sub get_Report_Added() +{ + my $ADDED_INTERFACES; + #added interfaces + my %FuncAddedInHeaderLib; + foreach my $Interface (sort keys(%CompatProblems)) + { + foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) + { + foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) + { + if($Kind eq "Added_Interface") + { + $FuncAddedInHeaderLib{$CompatProblems{$Interface}{$Kind}{$Location}{"Header"}}{$CompatProblems{$Interface}{$Kind}{$Location}{"New_SoName"}}{$Interface} = 1; + last; + } + } + } + } + my $Added_Number = 0; + foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%FuncAddedInHeaderLib)) + { + foreach my $SoName (sort {lc($a) cmp lc($b)} keys(%{$FuncAddedInHeaderLib{$HeaderName}})) + { + if($HeaderName) + { + $ADDED_INTERFACES .= "<span class='header_name'>$HeaderName</span>, <span class='solib_name'>$SoName</span><br/>\n"; + } + else + { + $ADDED_INTERFACES .= "<span class='solib_name'>$SoName</span><br/>\n"; + } + foreach my $Interface (sort {lc($CompatProblems{$a}{"Added_Interface"}{"SharedLibrary"}{"Signature"}) cmp lc($CompatProblems{$b}{"Added_Interface"}{"SharedLibrary"}{"Signature"})} keys(%{$FuncAddedInHeaderLib{$HeaderName}{$SoName}})) + { + $Added_Number += 1; + my $SubReport = ""; + my $Signature = $CompatProblems{$Interface}{"Added_Interface"}{"SharedLibrary"}{"Signature"}; + if($Interface =~ /\A_Z/) + { + if($Signature) + { + $SubReport = insertIDs($ContentSpanStart.highLight_Signature_Italic_Color(htmlSpecChars($Signature)).$ContentSpanEnd."<br/>\n".$ContentDivStart."<span class='mangled'>[ symbol: <b>$Interface</b> ]</span><br/><br/>".$ContentDivEnd."\n"); + } + else + { + $SubReport = "<span class=\"interface_name\">".$Interface."</span>"."<br/>\n"; + } + } + else + { + if($Signature) + { + $SubReport = "<span class=\"interface_name\">".highLight_Signature_Italic_Color($Signature)."</span>"."<br/>\n"; + } + else + { + $SubReport = "<span class=\"interface_name\">".$Interface."</span>"."<br/>\n"; + } + } + $ADDED_INTERFACES .= $SubReport; + } + $ADDED_INTERFACES .= "<br/>\n"; + } + } + if($ADDED_INTERFACES) + { + $ADDED_INTERFACES = "<a name='Added'></a><h2 style='margin-bottom:0px;padding-bottom:0px;'>Added Interfaces ($Added_Number)</h2><hr/>\n"."<!--Added_Interfaces-->\n".$ADDED_INTERFACES."<!--Added_Interfaces_End-->\n"."<input id='Added_Interfaces_Count' type='hidden' value=\'$Added_Number\' /><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + } + return $ADDED_INTERFACES; +} + +sub get_Report_Withdrawn() +{ + my $WITHDRAWN_INTERFACES; + #withdrawn interfaces + my %FuncWithdrawnFromHeaderLib; + foreach my $Interface (sort keys(%CompatProblems)) + { + foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) + { + foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) + { + if($Kind eq "Withdrawn_Interface") + { + $FuncWithdrawnFromHeaderLib{$CompatProblems{$Interface}{$Kind}{$Location}{"Header"}}{$CompatProblems{$Interface}{$Kind}{$Location}{"Old_SoName"}}{$Interface} = 1; + last; + } + } + } + } + my $Withdrawn_Number = 0; + foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%FuncWithdrawnFromHeaderLib)) + { + foreach my $SoName (sort {lc($a) cmp lc($b)} keys(%{$FuncWithdrawnFromHeaderLib{$HeaderName}})) + { + if($HeaderName) + { + $WITHDRAWN_INTERFACES .= "<span class='header_name'>$HeaderName</span>, <span class='solib_name'>$SoName</span><br/>\n"; + } + else + { + $WITHDRAWN_INTERFACES .= "<span class='solib_name'>$SoName</span><br/>\n"; + } + foreach my $Interface (sort {lc($CompatProblems{$a}{"Withdrawn_Interface"}{"SharedLibrary"}{"Signature"}) cmp lc($CompatProblems{$b}{"Withdrawn_Interface"}{"SharedLibrary"}{"Signature"})} keys(%{$FuncWithdrawnFromHeaderLib{$HeaderName}{$SoName}})) + { + $Withdrawn_Number += 1; + my $SubReport = ""; + my $Signature = $CompatProblems{$Interface}{"Withdrawn_Interface"}{"SharedLibrary"}{"Signature"}; + if($Interface =~ /\A_Z/) + { + if($Signature) + { + $SubReport = insertIDs($ContentSpanStart.highLight_Signature_Italic_Color(htmlSpecChars($Signature)).$ContentSpanEnd."<br/>\n".$ContentDivStart."<span class='mangled'>[ symbol: <b>$Interface</b> ]</span><br/><br/>".$ContentDivEnd."\n"); + } + else + { + $SubReport = "<span class=\"interface_name\">".$Interface."</span>"."<br/>\n"; + } + } + else + { + if($Signature) + { + $SubReport = "<span class=\"interface_name\">".highLight_Signature_Italic_Color($Signature)."</span>"."<br/>\n"; + } + else + { + $SubReport = "<span class=\"interface_name\">".$Interface."</span>"."<br/>\n"; + } + } + $WITHDRAWN_INTERFACES .= $SubReport; + } + $WITHDRAWN_INTERFACES .= "<br/>\n"; + } + } + if($WITHDRAWN_INTERFACES) + { + $WITHDRAWN_INTERFACES = "<a name='Withdrawn'></a><h2 style='margin-bottom:0px;padding-bottom:0px;'>Withdrawn Interfaces ($Withdrawn_Number)</h2><hr/>\n"."<!--Withdrawn_Interfaces-->\n".$WITHDRAWN_INTERFACES."<!--Withdrawn_Interfaces_End-->\n"."<input id='Withdrawn_Interfaces_Count' type='hidden' value=\'$Withdrawn_Number\' /><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + } + return $WITHDRAWN_INTERFACES; +} + +sub get_Report_InterfaceProblems($) +{ + my $TargetPriority = $_[0]; + my ($INTERFACE_PROBLEMS, %FuncHeaderLib); + foreach my $Interface (sort keys(%CompatProblems)) + { + foreach my $Kind (sort keys(%{$CompatProblems{$Interface}})) + { + if($InterfaceProblems_Kind{$Kind} and ($Kind ne "Added_Interface") and ($Kind ne "Withdrawn_Interface")) + { + foreach my $Location (sort keys(%{$CompatProblems{$Interface}{$Kind}})) + { + my $SoName = $CompatProblems{$Interface}{$Kind}{$Location}{"Old_SoName"}; + my $HeaderName = $CompatProblems{$Interface}{$Kind}{$Location}{"Header"}; + $FuncHeaderLib{$HeaderName}{$SoName}{$Interface} = 1; + last; + } + } + } + } + my $Problems_Number = 0; + #interface problems + foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%FuncHeaderLib)) + { + foreach my $SoName (sort {lc($a) cmp lc($b)} keys(%{$FuncHeaderLib{$HeaderName}})) + { + my $HEADER_LIB_REPORT = ""; + foreach my $Interface (sort {lc($tr_name{$a}) cmp lc($tr_name{$b})} keys(%{$FuncHeaderLib{$HeaderName}{$SoName}})) + { + my $Signature = ""; + my $InterfaceProblemsReport = ""; + my $ProblemNum = 1; + foreach my $Kind (keys(%{$CompatProblems{$Interface}})) + { + foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) + { + my $Incompatibility = ""; + my $Effect = ""; + my $Old_Value = htmlSpecChars($CompatProblems{$Interface}{$Kind}{$Location}{"Old_Value"}); + my $New_Value = htmlSpecChars($CompatProblems{$Interface}{$Kind}{$Location}{"New_Value"}); + my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; + my $Target = $CompatProblems{$Interface}{$Kind}{$Location}{"Target"}; + my $Old_Size = $CompatProblems{$Interface}{$Kind}{$Location}{"Old_Size"}; + my $New_Size = $CompatProblems{$Interface}{$Kind}{$Location}{"New_Size"}; + my $InitialType_Type = $CompatProblems{$Interface}{$Kind}{$Location}{"InitialType_Type"}; + my $Parameter_Position = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Position"}; + my $Parameter_Position_Str = num_to_str($Parameter_Position + 1); + $Signature = $CompatProblems{$Interface}{$Kind}{$Location}{"Signature"} if(not $Signature); + next if($Priority ne $TargetPriority); + if($Kind eq "Function_Become_Static") + { + $Incompatibility = "Function become <b>static</b>.\n"; + $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; + } + elsif($Kind eq "Function_Become_NonStatic") + { + $Incompatibility = "Function become <b>non-static</b>.\n"; + $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; + } + elsif($Kind eq "Parameter_Type_And_Size") + { + $Incompatibility = "Type of $Parameter_Position_Str parameter <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>.\n"; + $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; + } + elsif($Kind eq "Parameter_Type") + { + $Incompatibility = "Type of $Parameter_Position_Str parameter <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>.\n"; + $Effect = "Replacement of parameter data type may indicate a change in the semantic meaning of this parameter."; + } + elsif($Kind eq "Withdrawn_Parameter") + { + $Incompatibility = "$Parameter_Position_Str parameter <b>$Target</b> has been withdrawn from the interface signature.\n"; + $Effect = "This parameter will be ignored by the interface."; + } + elsif($Kind eq "Added_Parameter") + { + $Incompatibility = "$Parameter_Position_Str parameter <b>$Target</b> has been added to the interface signature.\n"; + $Effect = "This parameter will not be initialized by applications."; + } + elsif($Kind eq "Parameter_BaseType_And_Size") + { + if($InitialType_Type eq "Pointer") + { + $Incompatibility = "Base type of $Parameter_Position_Str parameter <b>$Target</b> (pointer) has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>.\n"; + $Effect = "Memory stored by pointer may be incorrectly initialized by applications."; + } + else + { + $Incompatibility = "Base type of $Parameter_Position_Str parameter <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>.\n"; + $Effect = "Layout of parameter's stack has been changed and therefore parameters in higher positions in the stack may be incorrectly initialized by applications."; + } + } + elsif($Kind eq "Parameter_BaseType") + { + if($InitialType_Type eq "Pointer") + { + $Incompatibility = "Base type of $Parameter_Position_Str parameter <b>$Target</b> (pointer) has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>.\n"; + $Effect = "Memory stored by pointer may be incorrectly initialized by applications."; + } + else + { + $Incompatibility = "Base type of $Parameter_Position_Str parameter <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>.\n"; + $Effect = "Replacement of parameter base type may indicate a change in the semantic meaning of this parameter."; + } + } + elsif($Kind eq "Parameter_PointerLevel") + { + $Incompatibility = "Type pointer level of $Parameter_Position_Str parameter <b>$Target</b> has been changed from <b>$Old_Value</b> to <b>$New_Value</b>.\n"; + $Effect = "Possible incorrect initialization of $Parameter_Position_Str parameter <b>$Target</b> by applications."; + } + elsif($Kind eq "Return_Type_And_Size") + { + $Incompatibility = "Type of return value has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>.\n"; + $Effect = "Applications will get a different return value and execution may change."; + } + elsif($Kind eq "Return_Type") + { + $Incompatibility = "Type of return value has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>.\n"; + $Effect = "Replacement of return type may indicate a change in its semantic meaning."; + } + elsif($Kind eq "Return_BaseType_And_Size") + { + $Incompatibility = "Base type of return value has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>.\n"; + $Effect = "Applications will get a different return value and execution may change."; + } + elsif($Kind eq "Return_BaseType") + { + $Incompatibility = "Base type of return value has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>.\n"; + $Effect = "Replacement of return base type may indicate a change in its semantic meaning."; + } + elsif($Kind eq "Return_PointerLevel") + { + $Incompatibility = "Type pointer level of return value has been changed from <b>$Old_Value</b> to <b>$New_Value</b>.\n"; + $Effect = "Applications will get a different return value and execution may change."; + } + if($Incompatibility) + { + $InterfaceProblemsReport .= "<tr><td align='center' class='table_header'><span class='problem_num'>$ProblemNum</span></td><td align='left' valign='top'><span class='problem_body'>".$Incompatibility."</span></td><td align='left' valign='top'><span class='problem_body'>".$Effect."</span></td></tr>\n"; + $ProblemNum += 1; + $Problems_Number += 1; + } + } + } + $ProblemNum -= 1; + if($InterfaceProblemsReport) + { + if($Interface =~ /\A_Z/) + { + if($Signature) + { + $HEADER_LIB_REPORT .= $ContentSpanStart."<span class='extension'>[+]</span> ".highLight_Signature_Italic_Color(htmlSpecChars($Signature))." ($ProblemNum)".$ContentSpanEnd."<br/>\n$ContentDivStart<span class='mangled'>[ symbol: <b>$Interface</b> ]</span><br/>\n"; + } + else + { + $HEADER_LIB_REPORT .= $ContentSpanStart."<span class='extension'>[+]</span> ".$Interface." ($ProblemNum)".$ContentSpanEnd."<br/>\n$ContentDivStart\n"; + } + } + else + { + if($Signature) + { + $HEADER_LIB_REPORT .= $ContentSpanStart."<span class='extension'>[+]</span> ".highLight_Signature_Italic_Color(htmlSpecChars($Signature))." ($ProblemNum)".$ContentSpanEnd."<br/>\n$ContentDivStart\n"; + } + else + { + $HEADER_LIB_REPORT .= $ContentSpanStart."<span class='extension'>[+]</span> ".$Interface." ($ProblemNum)".$ContentSpanEnd."<br/>\n$ContentDivStart\n"; + } + } + $HEADER_LIB_REPORT .= "<table width='900px' cellpadding='3' cellspacing='0' class='problems_table'><tr><td align='center' width='2%' class='table_header'><span class='problem_title' style='white-space:nowrap;'></span></td><td width='47%' align='center' class='table_header'><span class='problem_sub_title'>Incompatibility</span></td><td align='center' class='table_header'><span class='problem_sub_title'>Effect</span></td></tr>$InterfaceProblemsReport</table><br/>$ContentDivEnd\n"; + $HEADER_LIB_REPORT = insertIDs($HEADER_LIB_REPORT); + } + } + if($HEADER_LIB_REPORT) + { + $INTERFACE_PROBLEMS .= "<span class='header_name'>$HeaderName</span>, <span class='solib_name'>$SoName</span><br/>\n".$HEADER_LIB_REPORT."<br/>"; + } + } + } + if($INTERFACE_PROBLEMS) + { + $INTERFACE_PROBLEMS = "<a name=\'Interface_Problems_$TargetPriority\'></a>\n<h2 style='margin-bottom:0px;padding-bottom:0px;'>Interface problems, $TargetPriority risk ($Problems_Number)</h2><hr/>\n"."<!--Interface_Problems_".$TargetPriority."-->\n".$INTERFACE_PROBLEMS."<!--Interface_Problems_".$TargetPriority."_End-->\n"."<input id=\'Interface_Problems_$TargetPriority"."_Count"."\' type='hidden' value=\'$Problems_Number\' /><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + } + return $INTERFACE_PROBLEMS; +} + +sub get_Report_TypeProblems($) +{ + my $TargetPriority = $_[0]; + my ($TYPE_PROBLEMS, %TypeHeader, %TypeChanges, %Type_MaxPriority) = (); + foreach my $Interface (sort keys(%CompatProblems)) + { + foreach my $Kind (keys(%{$CompatProblems{$Interface}})) + { + if($TypeProblems_Kind{$Kind}) + { + foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) + { + my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; + my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; + my $Type_Header = $CompatProblems{$Interface}{$Kind}{$Location}{"Header"}; + %{$TypeChanges{$Type_Name}{$Kind}{$Location}} = %{$CompatProblems{$Interface}{$Kind}{$Location}}; + $TypeHeader{$Type_Header}{$Type_Name} = 1; + $Type_MaxPriority{$Type_Name}{$Kind} = max_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority); + } + } + } + } + foreach my $Type_Name (keys(%TypeChanges)) + { + foreach my $Kind (keys(%{$TypeChanges{$Type_Name}})) + { + foreach my $Location (keys(%{$TypeChanges{$Type_Name}{$Kind}})) + { + my $Priority = $TypeChanges{$Type_Name}{$Kind}{$Location}{"Priority"}; + if(cmp_priority($Type_MaxPriority{$Type_Name}{$Kind}, $Priority)) + { + delete($TypeChanges{$Type_Name}{$Kind}{$Location}); + } + } + } + } + my $Problems_Number = 0; + foreach my $HeaderName (sort {lc($a) cmp lc($b)} keys(%TypeHeader)) + { + my $HEADER_REPORT = ""; + foreach my $TypeName (sort {lc($a) cmp lc($b)} keys(%{$TypeHeader{$HeaderName}})) + { + my $ProblemNum = 1; + my $TypeProblemsReport = ""; + my %Kinds_Locations = (); + my %Kinds_Target = (); + foreach my $Kind (keys(%{$TypeChanges{$TypeName}})) + { + foreach my $Location (keys(%{$TypeChanges{$TypeName}{$Kind}})) + { + my $Priority = $TypeChanges{$TypeName}{$Kind}{$Location}{"Priority"}; + next if($Priority ne $TargetPriority); + $Kinds_Locations{$Kind}{$Location} = 1; + my $Incompatibility = ""; + my $Effect = ""; + my $Target = $TypeChanges{$TypeName}{$Kind}{$Location}{"Target"}; + next if($Kinds_Target{$Kind}{$Target}); + $Kinds_Target{$Kind}{$Target} = 1; + my $Old_Value = htmlSpecChars($TypeChanges{$TypeName}{$Kind}{$Location}{"Old_Value"}); + my $New_Value = htmlSpecChars($TypeChanges{$TypeName}{$Kind}{$Location}{"New_Value"}); + my $Old_Size = $TypeChanges{$TypeName}{$Kind}{$Location}{"Old_Size"}; + my $New_Size = $TypeChanges{$TypeName}{$Kind}{$Location}{"New_Size"}; + my $Type_Type = $TypeChanges{$TypeName}{$Kind}{$Location}{"Type_Type"}; + my $InitialType_Type = $TypeChanges{$TypeName}{$Kind}{$Location}{"InitialType_Type"}; + + if($Kind eq "Added_Virtual_Function") + { + $Incompatibility = "Virtual method "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Target))."</span>"." has been added to this class and therefore the layout of virtual table has been changed."; + $Effect = "Call of any virtual method in this class or its subclasses will result in crash of application."; + } + elsif($Kind eq "Withdrawn_Virtual_Function") + { + $Incompatibility = "Virtual method "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Target))."</span>"." has been withdrawn from this class and therefore the layout of virtual table has been changed."; + $Effect = "Call of any virtual method in this class or its subclasses will result in crash of application."; + } + elsif($Kind eq "Virtual_Function_Position") + { + $Incompatibility = "The relative position of virtual method "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Target))."</span>"." has been changed from <b>$Old_Value</b> to <b>$New_Value</b> and therefore the layout of virtual table has been changed."; + $Effect = "Call of this virtual method will result in crash of application."; + } + elsif($Kind eq "Virtual_Function_Redefinition") + { + $Incompatibility = "Virtual method "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Old_Value))."</span>"." has been redefined by "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($New_Value))."</span>"; + $Effect = "Method <span class='interface_name_black'>".highLight_Signature(htmlSpecChars($New_Value))."</span> will be called instead of <span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Old_Value))."</span>"; + } + elsif($Kind eq "Virtual_Function_Redefinition_B") + { + $Incompatibility = "Virtual method "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($New_Value))."</span>"." has been redefined by "."<span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Old_Value))."</span>"; + $Effect = "Method <span class='interface_name_black'>".highLight_Signature(htmlSpecChars($Old_Value))."</span> will be called instead of <span class='interface_name_black'>".highLight_Signature(htmlSpecChars($New_Value))."</span>"; + } + elsif($Kind eq "Size") + { + $Incompatibility = "Size of this type has been changed from <b>$Old_Value</b> to <b>$New_Value</b> bytes."; + $Effect = "Change of type size may lead to different effects in different contexts. $ContentSpanStart"."<span style='color:Black'>[+] ...</span>"."$ContentSpanEnd <label id=\"CONTENT_ID\" style=\"display:none;\"> In the context of function parameters, this change affects the parameter's stack layout and may lead to incorrect initialization of parameters in higher positions in the stack. In the context of structure members, this change affects the member's layout and may lead to incorrect attempts to access members in higher positions. Other effects are possible.</label>"; + } + elsif($Kind eq "BaseType") + { + $Incompatibility = "Base of this type has been changed from <b>$Old_Value</b> to <b>$New_Value</b>."; + $Effect = "Possible incorrect initialization of interface parameters by applications."; + } + elsif($Kind eq "Added_Member_And_Size") + { + $Incompatibility = "Member <b>$Target</b> has been added to this type."; + $Effect = "The size of the inclusive type has been changed."; + } + elsif($Kind eq "Added_Middle_Member_And_Size") + { + $Incompatibility = "Member <b>$Target</b> has been added between the first member and the last member of this structural type."; + $Effect = "1) Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications.<br/>2) The size of the inclusive type will also be affected."; + } + elsif($Kind eq "Member_Rename") + { + $Incompatibility = "Member <b>$Target</b> has been renamed to <b>$New_Value</b>."; + $Effect = "Renaming of a member in a structural data type may indicate a change in the semantic meaning of the member."; + } + elsif($Kind eq "Withdrawn_Member_And_Size") + { + $Incompatibility = "Member <b>$Target</b> has been withdrawn from this type."; + $Effect = "1) Applications will access incorrect memory when attempting to access this member.<br/>2) The size of the inclusive type will also be affected."; + } + elsif($Kind eq "Withdrawn_Member") + { + $Incompatibility = "Member <b>$Target</b> has been withdrawn from this type."; + $Effect = "Applications will access incorrect memory when attempting to access this member."; + } + elsif($Kind eq "Withdrawn_Middle_Member_And_Size") + { + $Incompatibility = "Member <b>$Target</b> has been withdrawn from this structural type between the first member and the last member."; + $Effect = "1) Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications.<br/>2) Previous accesses of applications to the withdrawn member will be incorrect."; + } + elsif($Kind eq "Withdrawn_Middle_Member") + { + $Incompatibility = "Member <b>$Target</b> has been withdrawn from this structural type between the first member and the last member."; + $Effect = "1) Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications.<br/>2) Applications will access incorrect memory when attempting to access this member."; + } + elsif($Kind eq "Enum_Member_Value") + { + $Incompatibility = "Value of member <b>$Target</b> has been changed from <b>$Old_Value</b> to <b>$New_Value</b>."; + $Effect = "Applications may execute another branch of library code."; + } + elsif($Kind eq "Enum_Member_Name") + { + $Incompatibility = "Name of member with value <b>$Target</b> has been changed from <b>$Old_Value</b> to <b>$New_Value</b>."; + $Effect = "Applications may execute another branch of library code."; + } + elsif($Kind eq "Member_Type_And_Size") + { + $Incompatibility = "Type of member <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>."; + $Effect = "Layout of structure members has been changed and therefore members in higher positions in the structure definition may be incorrectly accessed by applications."; + } + elsif($Kind eq "Member_Type") + { + $Incompatibility = "Type of member <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>."; + $Effect = "Replacement of the member data type may indicate a change in the semantic meaning of the member."; + } + elsif($Kind eq "Member_BaseType_And_Size") + { + if($InitialType_Type eq "Pointer") + { + $Incompatibility = "Base type of member <b>$Target</b> (pointer) has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>."; + $Effect = "Possible access of applications to incorrect memory via member pointer."; + } + else + { + $Incompatibility = "Base type of member <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b> (<b>$Old_Size</b> bytes)</span> to <span style='white-space:nowrap;'><b>$New_Value</b> (<b>$New_Size</b> bytes)</span>."; + $Effect = "Layout of structure members has been changed and therefore members in higher positions in structure definition may be incorrectly accessed by applications."; + } + } + elsif($Kind eq "Member_BaseType") + { + if($InitialType_Type eq "Pointer") + { + $Incompatibility = "Base type of member <b>$Target</b> (pointer) has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>."; + $Effect = "Possible access of applications to incorrect memory via member pointer."; + } + else + { + $Incompatibility = "Base type of member <b>$Target</b> has been changed from <span style='white-space:nowrap;'><b>$Old_Value</b></span> to <span style='white-space:nowrap;'><b>$New_Value</b></span>."; + $Effect = "Replacement of member base type may indicate a change in the semantic meaning of this member."; + } + } + elsif($Kind eq "Member_PointerLevel") + { + $Incompatibility = "Type pointer level of member <b>$Target</b> has been changed from <b>$Old_Value</b> to <b>$New_Value</b>."; + $Effect = "Possible incorrect initialization of member <b>$Target</b> by applications."; + } + if($Incompatibility) + { + $TypeProblemsReport .= "<tr><td align='center' valign='top' class='table_header'><span class='problem_num'>$ProblemNum</span></td><td align='left' valign='top'><span class='problem_body'>".$Incompatibility."</span></td><td align='left' valign='top'><span class='problem_body'>$Effect</span></td></tr>\n"; + $ProblemNum += 1; + $Problems_Number += 1; + $Kinds_Locations{$Kind}{$Location} = 1; + } + } + } + $ProblemNum -= 1; + if($TypeProblemsReport) + { + my ($Affected_Interfaces_Header, $Affected_Interfaces) = getAffectedInterfaces($TypeName, \%Kinds_Locations); + $HEADER_REPORT .= $ContentSpanStart."<span class='extension'>[+]</span> ".htmlSpecChars($TypeName)." ($ProblemNum)".$ContentSpanEnd."<br/>\n$ContentDivStart<table width='900px' cellpadding='3' cellspacing='0' class='problems_table'><tr><td align='center' width='2%' class='table_header'><span class='problem_title' style='white-space:nowrap;'></span></td><td width='47%' align='center' class='table_header'><span class='problem_sub_title'>Incompatibility</span></td><td align='center' class='table_header'><span class='problem_sub_title'>Effect</span></td></tr>$TypeProblemsReport</table>"."<span style='padding-left:10px'>$Affected_Interfaces_Header</span>$Affected_Interfaces<br/><br/>$ContentDivEnd\n"; + $HEADER_REPORT = insertIDs($HEADER_REPORT); + } + } + if($HEADER_REPORT) + { + $TYPE_PROBLEMS .= "<span class='header_name'>$HeaderName</span><br/>\n".$HEADER_REPORT."<br/>"; + } + } + if($TYPE_PROBLEMS) + { + my $Notations = ""; + if($TYPE_PROBLEMS =~ /'RetVal|'Obj/) + { + my @Notations_Array = (); + if($TYPE_PROBLEMS =~ /'RetVal/) + { + @Notations_Array = (@Notations_Array, "<span style='color:#444444;padding-left:5px;'><b>RetVal</b></span> - function's return value"); + } + if($TYPE_PROBLEMS =~ /'Obj/) + { + @Notations_Array = (@Notations_Array, "<span style='color:#444444;'><b>Obj</b></span> - method's object (C++)"); + } + $Notations = "Shorthand notations: ".join("; ", @Notations_Array).".<br/>\n"; + } + $TYPE_PROBLEMS = "<a name=\'Type_Problems_$TargetPriority\'></a>\n<h2 style='margin-bottom:0px;padding-bottom:0px;'>Problems in Data Types, $TargetPriority risk ($Problems_Number)</h2><hr/>\n".$Notations."<!--Type_Problems_".$TargetPriority."-->\n".$TYPE_PROBLEMS."<!--Type_Problems_".$TargetPriority."_End-->\n"."<input id=\'Type_Problems_$TargetPriority"."_Count"."\' type='hidden' value=\'$Problems_Number\' /><a style='font-size:11px;' href='#Top'>to the top</a><br/>\n"; + } + return $TYPE_PROBLEMS; +} + +my $ContentSpanStart_2 = "<span style='line-height:25px;' class=\"section_2\" onclick=\"javascript:showContent(this, 'CONTENT_ID')\">\n"; + +sub getAffectedInterfaces($$) +{ + my ($Target_TypeName, $Kinds_Locations) = @_; + my ($Affected_Interfaces_Header, $Affected_Interfaces, %FunctionNumber) = (); + foreach my $Interface (sort {lc($tr_name{$a}) cmp lc($tr_name{$b})} keys(%CompatProblems)) + { + next if(($Interface =~ /C2/) or ($Interface =~ /D2/) or ($Interface =~ /D0/)); + next if(keys(%FunctionNumber)>1000); + my $FunctionProblem = ""; + my $MinPath_Length = ""; + my $MaxPriority = 0; + my $Location_Last = ""; + foreach my $Kind (keys(%{$CompatProblems{$Interface}})) + { + foreach my $Location (keys(%{$CompatProblems{$Interface}{$Kind}})) + { + next if(not $Kinds_Locations->{$Kind}{$Location}); + my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; + my $Signature = $CompatProblems{$Interface}{$Kind}{$Location}{"Signature"}; + my $Parameter_Position = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Position"}; + my $Priority = $CompatProblems{$Interface}{$Kind}{$Location}{"Priority"}; + if($Type_Name eq $Target_TypeName) + { + $FunctionNumber{$Interface} = 1; + my $Path_Length = 0; + while($Location =~ /\-\>/g){$Path_Length += 1;} + if(($MinPath_Length eq "") or ($Path_Length<$MinPath_Length and $Priority_Value{$Priority}>$MaxPriority) or (($Location_Last =~ /RetVal/ or $Location_Last =~ /Obj/) and $Location !~ /RetVal|Obj/ and $Location !~ /\-\>/) or ($Location_Last =~ /RetVal|Obj/ and $Location_Last =~ /\-\>/ and $Location !~ /RetVal|Obj/ and $Location =~ /\-\>/)) + { + $MinPath_Length = $Path_Length; + $MaxPriority = $Priority_Value{$Priority}; + $Location_Last = $Location; + my $Description = get_AffectDescription($Interface, $Kind, $Location); + $FunctionProblem = "<span class='interface_name_black' style='padding-left:20px;'>".highLight_Signature_PPos_Italic(htmlSpecChars($Signature), $Parameter_Position, 1, 0)."</span>:<br/>"."<span class='affect_description'>".addArrows($Description)."</span><br/><div style='height:4px;'> </div>\n"; + } + } + } + } + $Affected_Interfaces .= $FunctionProblem; + } + $Affected_Interfaces .= "and other...<br/>" if(keys(%FunctionNumber)>5000); + if($Affected_Interfaces) + { + $Affected_Interfaces_Header = $ContentSpanStart_2."[+] affected interfaces (".keys(%FunctionNumber).")".$ContentSpanEnd; + $Affected_Interfaces = $ContentDivStart.$Affected_Interfaces.$ContentDivEnd; + } + return ($Affected_Interfaces_Header, $Affected_Interfaces); +} + +my %Kind_TypeStructureChanged=( + "Size"=>1, + "Added_Member_And_Size"=>1, + "Added_Middle_Member_And_Size"=>1, + "Member_Rename"=>1, + "Withdrawn_Member_And_Size"=>1, + "Withdrawn_Member"=>1, + "Withdrawn_Middle_Member_And_Size"=>1, + "Enum_Member_Value"=>1, + "Enum_Member_Name"=>1, + "Member_Type_And_Size"=>1, + "Member_Type"=>1, + "Member_BaseType_And_Size"=>1, + "Member_BaseType"=>1, + "Member_PointerLevel"=>1, + "BaseType"=>1 +); + +my %Kind_VirtualTableChanged=( + "Added_Virtual_Function"=>1, + "Withdrawn_Virtual_Function"=>1, + "Virtual_Function_Position"=>1, + "Virtual_Function_Redefinition"=>1, + "Virtual_Function_Redefinition_B"=>1 +); + +sub get_AffectDescription($$$) +{ + my ($Interface, $Kind, $Location) = @_; + my $Target = $CompatProblems{$Interface}{$Kind}{$Location}{"Target"}; + my $Old_Value = $CompatProblems{$Interface}{$Kind}{$Location}{"Old_Value"}; + my $New_Value = $CompatProblems{$Interface}{$Kind}{$Location}{"New_Value"}; + my $Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Type_Name"}; + my $Parameter_Position = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Position"}; + my $Parameter_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Name"}; + my $Parameter_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Parameter_Type_Name"}; + my $Member_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Member_Type_Name"}; + my $Object_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Object_Type_Name"}; + my $Return_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Return_Type_Name"}; + my $Start_Type_Name = $CompatProblems{$Interface}{$Kind}{$Location}{"Start_Type_Name"}; + my $InitialType_Type = $CompatProblems{$Interface}{$Kind}{$Location}{"InitialType_Type"}; + my $Parameter_Position_Str = num_to_str($Parameter_Position + 1); + my @Sentence_Parts = (); + my $Location_To_Type = $Location; + $Location_To_Type =~ s/\-\>[^>]+?\Z//; + if($Kind_VirtualTableChanged{$Kind}) + { + if($Kind eq "Virtual_Function_Redefinition") + { + @Sentence_Parts = (@Sentence_Parts, "This method become virtual and will be called instead of redefined method '".highLight_Signature(htmlSpecChars($Old_Value))."'."); + } + elsif($Kind eq "Virtual_Function_Redefinition_B") + { + @Sentence_Parts = (@Sentence_Parts, "This method become non-virtual and redefined method '".highLight_Signature(htmlSpecChars($Old_Value))."' will be called instead of it."); + } + else + { + @Sentence_Parts = (@Sentence_Parts, "Call of this virtual method will result in crash of application because the layout of virtual table has been changed."); + } + } + elsif($Kind_TypeStructureChanged{$Kind}) + { + if($Location_To_Type =~ /RetVal/) + {#return value + if($Location_To_Type =~ /\-\>/) + { + @Sentence_Parts = (@Sentence_Parts, "Member \'$Location_To_Type\' in return value"); + } + else + { + @Sentence_Parts = (@Sentence_Parts, "Return value"); + } + } + elsif($Location_To_Type =~ /Obj/) + {#object + if($Location_To_Type =~ /\-\>/) + { + @Sentence_Parts = (@Sentence_Parts, "Member \'$Location_To_Type\' in the object of this method"); + } + else + { + @Sentence_Parts = (@Sentence_Parts, "Object"); + } + } + else + {#parameters + if($Location_To_Type =~ /\-\>/) + { + @Sentence_Parts = (@Sentence_Parts, "Member \'$Location_To_Type\' of $Parameter_Position_Str parameter"); + } + else + { + @Sentence_Parts = (@Sentence_Parts, "$Parameter_Position_Str parameter"); + } + if($Parameter_Name) + { + @Sentence_Parts = (@Sentence_Parts, "\'$Parameter_Name\'"); + } + if($InitialType_Type eq "Pointer") + { + @Sentence_Parts = (@Sentence_Parts, "(pointer)"); + } + } + if($Start_Type_Name eq $Type_Name) + { + @Sentence_Parts = (@Sentence_Parts, "has type \'$Type_Name\'."); + } + else + { + @Sentence_Parts = (@Sentence_Parts, "has base type \'$Type_Name\'."); + } + } + return join(" ", @Sentence_Parts); +} + +sub create_HtmlReport() +{ + my $CssStyles = "<style type=\"text/css\"> + body{font-family:Arial;} + hr{color:Black;background-color:Black;height:1px;border:0;} + span.section{font-weight:bold;cursor:pointer;margin-left:7px;font-size:16px;font-family:Arial;color:#003E69;} + span:hover.section{color:#336699;} + span.section_2{cursor:pointer;margin-left:7px;font-size:14px;font-family:Arial;color:#cc3300;} + span.extension{font-weight:100;font-size:16px;} + span.problem_exact_location{color:Red;font-size:14px;} + span.header_name{color:#cc3300;font-size:14px;font-family:Arial;font-weight:bold;} + span.header_list_elem{padding-left:10px;color:#333333;font-size:15px;font-family:Arial;} + span.solib_list_elem{padding-left:10px;color:#333333;font-size:15px;font-family:Arial;} + span.solib_name{color:Green;font-size:14px;font-family:Arial;font-weight:bold;} + span.interface_name{font-weight:bold;font-size:16px;font-family:Arial;color:#003E69;margin-left:7px;} + span.interface_name_black{font-weight:bold;font-size:15px;font-family:Arial;color:#333333;} + span.problem_title{color:#333333;font-weight:bold;font-size:13px;font-family:Verdana;} + span.problem_sub_title{color:#333333;text-decoration:none;font-weight:bold;font-size:13px;font-family:Verdana;} + span.problem_body{color:Black;font-size:14px;} + span.int_p{font-weight:normal;} + span.affect_description{padding-left:30px;font-size:14px;font-style:italic;line-height:13px;} + table.problems_table{line-height:16px;margin-left:15px;margin-top:3px;border-collapse:collapse;} + table.problems_table td{border-style:solid;border-color:Gray;border-width:1px;} + td.table_header{background-color:#eeeeee;} + td.summary_item{font-size:15px;font-family:Arial;text-align:left;} + td.summary_item_value{padding-left:5px;padding-right:5px;width:35px;text-align:right;} + span.problem_num{color:#333333;font-weight:bold;font-size:13px;font-family:Verdana;} + span.mangled{padding-left:15px;font-size:13px;cursor:text;color:#444444;} + span.symver{color:#555555;font-size:13px;white-space:nowrap;} + span.color_param{font-style:italic;color:Brown;} + span.focus_param{font-style:italic;color:Red;}</style>"; + + my $JScripts = "<script type=\"text/javascript\" language=\"JavaScript\"> + function showContent(header, id) { + e = document.getElementById(id); + if(e.style.display == 'none') + { + e.style.display = ''; + e.style.visibility = 'visible'; + header.innerHTML = header.innerHTML.replace(/\\\[[^0-9 ]\\\]/gi,\"[−]\"); + } + else + { + e.style.display = 'none'; + e.style.visibility = 'hidden'; + header.innerHTML = header.innerHTML.replace(/\\\[[^0-9 ]\\\]/gi,\"[+]\"); + } + }</script>"; + + writeFile("$REPORT_PATH/abi_compat_report.html", "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN\" \"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">\n<html xmlns=\"http://www.w3.org/1999/xhtml\" xml:lang=\"en\" lang=\"en\">\n<head>\n<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\" /> + <title>ABI compliance report for the library $TargetLibraryName from version ".$Descriptor{1}{"Version"}." to ".$Descriptor{2}{"Version"}." on ".getArch()."\n</title>\n<!--Styles-->\n".$CssStyles."\n<!--Styles_End-->\n"."<!--JScripts-->\n".$JScripts."\n<!--JScripts_End-->\n</head>\n<body>\n<div><a name='Top'></a>\n".get_Report_Header()."<br/>\n".get_Summary()."<br/>\n".get_Report_Added().get_Report_Withdrawn().get_Report_TypeProblems("High").get_Report_TypeProblems("Medium").get_Report_TypeProblems("Low").get_Report_InterfaceProblems("High").get_Report_InterfaceProblems("Medium").get_Report_InterfaceProblems("Low").get_Report_ChangedConstants().get_SourceInfo()."</div>\n"."<br/><br/><br/><hr/><div style='width:100%;font-family:Arial;font-size:11px;' align='right'><i>Generated on ".(localtime time)." for <span style='font-weight:bold'>$TargetLibraryName</span> by <a href='http://ispras.linux-foundation.org/index.php/ABI_compliance_checker'>ABI-compliance-checker</a> $ABI_COMPLIANCE_CHECKER_VERSION </i></div>\n<div style='height:999px;'></div>\n</body></html>"); +} + +sub trivialCmp($$) +{ + if(int($_[0]) > int($_[1])) + { + return 1; + } + elsif($_[0] eq $_[1]) + { + return 0; + } + else + { + return -1; + } +} + +sub addArrows($) +{ + my $Text = $_[0]; + #$Text =~ s/\-\>/→/g; + $Text =~ s/\-\>/−>/g; + return $Text; +} + +sub insertIDs($) +{ + my $Text = $_[0]; + while($Text =~ /CONTENT_ID/) + { + if(int($Content_Counter)%2) + { + $ContentID -= 1; + } + $Text =~ s/CONTENT_ID/c_$ContentID/; + $ContentID += 1; + $Content_Counter += 1; + } + return $Text; +} + +sub restrict_num_decimal_digits +{ + my $num=shift; + my $digs_to_cut=shift; + + if ($num=~/\d+\.(\d){$digs_to_cut,}/) + { + $num=sprintf("%.".($digs_to_cut-1)."f", $num); + } + return $num; +} + +sub parse_constants() +{ + my $CurHeader = ""; + foreach my $String (split("\n", $ConstantsSrc{$Version})) + {#detecting public and private constants using sources + if($String=~/#[ \t]+\d+[ \t]+\"(.+)\"/) + { + $CurHeader=$1; + } + if($String=~/\#[ \t]*define[ \t]+([_A-Z]+)[ \t]+(.*)[ \t]*\Z/) + { + my ($Name, $Value) = ($1, $2); + if(not $Constants{$Version}{$Name}{"Access"}) + { + $Constants{$Version}{$Name}{"Access"} = "public"; + $Constants{$Version}{$Name}{"Value"} = $Value; + $Constants{$Version}{$Name}{"Header"} = get_FileName($CurHeader); + } + } + elsif($String=~/\#[ \t]*undef[ \t]+([_A-Z]+)[ \t]*/) + { + my $Name = $1; + $Constants{$Version}{$Name}{"Access"} = "private"; + } + } + foreach my $Constant (keys(%{$Constants{$Version}})) + { + if(($Constants{$Version}{$Constant}{"Access"} eq "private") or not $Constants{$Version}{$Constant}{"Value"} + or $Constant=~/_h\Z/i) + { + delete($Constants{$Version}{$Constant}); + } + else + { + delete($Constants{$Version}{$Constant}{"Access"}); + } + } +} + +sub mergeConstants() +{ + return if(defined $AppPath); + foreach my $Constant (keys(%{$Constants{1}})) + { + my $Old_Value = $Constants{1}{$Constant}{"Value"}; + my $New_Value = $Constants{2}{$Constant}{"Value"}; + my $Header = $Constants{1}{$Constant}{"Header"}; + if($New_Value and $Old_Value and ($New_Value ne $Old_Value)) + { + %{$ConstantProblems{$Constant}} = ( + "Old_Value"=>$Old_Value, + "New_Value"=>$New_Value, + "Header"=>$Header + ); + } + } +} + +sub mergeHeaders_Separately() +{ + system("mkdir", "-p", "header_compile_errors/".$TargetLibraryName); + system("rm", "-fr", $ERR_PATH{1}, $ERR_PATH{2}); + my ($Header_Num, $Prev_Header_Length) = (0, 0); + my $All_Count = keys(%{$Headers{1}}); + foreach my $Header_Dest (sort {int($Headers{1}{$a}{"Position"})<=>int($Headers{1}{$b}{"Position"})} keys(%{$Headers{1}})) + { + my $Header_Name = $Headers{1}{$Header_Dest}{"Name"}; + my $Dest_Count = keys(%{$HeaderName_Destinations{1}{$Header_Name}}); + my $Identity = $Headers{1}{$Header_Dest}{"Identity"}; + my $Dest_Comment = ($Dest_Count>1 and $Identity=~/\//)?" ($Identity)":""; + print get_one_step_title($Header_Name.$Dest_Comment, $Header_Num, $All_Count, $Prev_Header_Length, 1)."\r"; + %TypeDescr = (); + %FuncDescr = (); + %ClassFunc = (); + %ClassVirtFunc = (); + %LibInfo = (); + %CompleteSignature = (); + %Cache = (); + $Version = 1; + parseHeader($Header_Dest); + $Version = 2; + my $PairHeaderDest = find_pair_header($Header_Dest); + if(not $PairHeaderDest) + { + $Header_Num += 1; + next; + } + parseHeader($PairHeaderDest); + mergeSignatures(); + mergeConstants(); + $Header_Num += 1; + $Prev_Header_Length = length($Header_Name.$Dest_Comment); + } + print get_one_step_title("", $All_Count, $All_Count, $Prev_Header_Length, 0)."\n"; +} + +sub get_one_step_title($$$$$) +{ + my ($Header_Name, $Num, $All_Count, $SpacesAtTheEnd, $ShowCurrent) = @_; + my ($Spaces_1, $Spaces_2, $Title) = (); + my $Title_1 = "checking headers: $Num/$All_Count [".restrict_num_decimal_digits($Num*100/$All_Count, 3)."%]".(($ShowCurrent)?",":""); + foreach (0 .. length("checking headers: ")+length($All_Count)*2+11 - length($Title_1)) + { + $Spaces_1 .= " "; + } + $Title .= $Title_1.$Spaces_1; + if($ShowCurrent) + { + my $Title_2 = "current: $Header_Name"; + foreach (0 .. $SpacesAtTheEnd - length($Header_Name)-1) + { + $Spaces_2 .= " "; + } + $Title .= $Title_2.$Spaces_2; + } + else + { + foreach (0 .. $SpacesAtTheEnd + length(" current: ") - 1) + { + $Title .= " "; + } + } + return $Title."\r"; +} + +sub find_pair_header($) +{ + my $Header_Dest = $_[0]; + my $Header_Name = $Headers{1}{$Header_Dest}{"Name"}; + my $Identity = $Headers{1}{$Header_Dest}{"Identity"}; + my @Pair_Dest = keys(%{$HeaderName_Destinations{2}{$Header_Name}}); + if($#Pair_Dest==0) + { + return $Pair_Dest[0]; + } + elsif($#Pair_Dest==-1) + { + return ""; + } + else + { + foreach my $Pair_Dest (@Pair_Dest) + { + my $Pair_Identity = $Headers{2}{$Pair_Dest}{"Identity"}; + if($Identity eq $Pair_Identity) + { + return $Pair_Dest; + } + } + return ""; + } +} + +sub getSymbols($) +{ + my $LibVersion = $_[0]; + my @SoLibPaths = getSoPaths($LibVersion); + if($#SoLibPaths eq -1 and not $CheckHeadersOnly) + { + print "ERROR: shared objects were not found\n"; + exit(1); + } + foreach my $SoLibPath (@SoLibPaths) + { + getSymbols_Lib($LibVersion, $SoLibPath, 0); + } +} + +sub separatePath($) +{ + return ("", $_[0])if($_[0] !~ /\//); + if($_[0] =~ /\A(.*\/)([^\/]*)\Z/) + { + return ($1, $2); + } + else + { + return ("", $_[0]); + } +} + +sub translateSymbols($) +{ + my $LibVersion = $_[0]; + my (@MnglNames, @UnMnglNames) = (); + foreach my $Interface (sort keys(%{$Interface_Library{$LibVersion}})) + { + if($Interface =~ /\A_Z/) + { + $Interface =~ s/[\@]+(.*)\Z//; + push(@MnglNames, $Interface); + } + else + { + $tr_name{$Interface} = $Interface; + $mangled_name{$tr_name{$Interface}} = $Interface; + } + } + if($#MnglNames > -1) + { + @UnMnglNames = reverse(unmangleArray(@MnglNames)); + foreach my $Interface (sort keys(%{$Interface_Library{$LibVersion}})) + { + if($Interface =~ /\A_Z/) + { + $Interface =~ s/[\@]+(.*)\Z//; + $tr_name{$Interface} = pop(@UnMnglNames); + $mangled_name{correctName($tr_name{$Interface})} = $Interface; + } + } + } +} + +sub detectAdded() +{ + #detecting added + foreach my $Interface (keys(%{$Interface_Library{2}})) + { + if(not $Interface_Library{1}{$Interface}) + { + $AddedInt{$Interface} = 1; + my ($MnglName, $SymbolVersion) = ($Interface, ""); + if($Interface =~ /\A(.+)[\@]+(.+)\Z/) + { + ($MnglName, $SymbolVersion) = ($1, $2); + } + $FuncAttr{2}{$Interface}{"Signature"} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); + } + } +} + +sub detectWithdrawn() +{ + #detecting withdrawn + foreach my $Interface (keys(%{$Interface_Library{1}})) + { + if(not $Interface_Library{2}{$Interface} and not $Interface_Library{2}{$SymVer{2}{$Interface}}) + { + next if($DepInterfaces{2}{$Interface}); + $WithdrawnInt{$Interface} = 1; + my ($MnglName, $SymbolVersion) = ($Interface, ""); + if($Interface =~ /\A(.+)[\@]+(.+)\Z/) + { + ($MnglName, $SymbolVersion) = ($1, $2); + } + $FuncAttr{1}{$Interface}{"Signature"} = $tr_name{$MnglName}.(($SymbolVersion)?"\@".$SymbolVersion:""); + } + } +} + +sub isRecurLib($) +{ + my $LibName = $_[0]; + foreach my $LibNameInStack (@RecurLib) + { + if($LibName eq $LibNameInStack) + { + return 1; + } + } + return 0; +} + +sub getSymbols_App($) +{ + my $Path = $_[0]; + return () if(not $Path or not -f $Path); + my @Ints = (); + open(APP, "readelf -WhlSsdA $Path |"); + my $symtab=0;#indicates that we are processing 'symtab' section of 'readelf' output + while(<APP>) + { + if($symtab == 1) { + #do nothing with symtab (but there are some plans for the future) + next; + } + if( /'.dynsym'/ ) { + $symtab=0; + } + elsif( /'.symtab'/ ) { + $symtab=1; + } + elsif(my ($fullname, $idx, $Ndx) = readlile_ELF($_)) { + if( $Ndx eq "UND" ) { + #only exported interfaces + push(@Ints, $fullname); + } + } + } + close(APP); + return @Ints; +} + +sub readlile_ELF($) +{ + if($_[0]=~/\s*\d+:\s+(\w*)\s+\w+\s+(\w+)\s+(\w+)\s+(\w+)\s+(\w+)\s((\w|@|\.)+)/) + {#the line of 'readelf' output corresponding to the interface + my ($value, $type, $bind, $vis, $Ndx, $fullname)=($1, $2, $3, $4, $5, $6); + if(($bind ne "WEAK") and ($bind ne "GLOBAL")) { + return (); + } + if(($type ne "FUNC") and ($type ne "OBJECT") and ($type ne "COMMON")) { + return (); + } + if($vis ne "DEFAULT") { + return (); + } + if(($Ndx eq "ABS") and ($value !~ /\D|1|2|3|4|5|6|7|8|9/)) { + return (); + } + return ($fullname, $value, $Ndx); + } + else + { + return (); + } +} + +sub getSymbols_Lib($$$) +{ + my ($LibVersion, $Lib_Path, $IsNeededLib) = @_; + return if(not $Lib_Path or not -f $Lib_Path); + my ($Lib_Dir, $Lib_SoName) = separatePath($Lib_Path); + return if($CheckedSoLib{$LibVersion}{$Lib_SoName} and $IsNeededLib); + return if(isRecurLib($Lib_SoName) or $#RecurLib>=1); + $CheckedSoLib{$LibVersion}{$Lib_SoName} = 1; + push(@RecurLib, $Lib_SoName); + my (%Value_Interface, %Interface_Value, %NeededLib) = (); + if(not $IsNeededLib) + { + $SoNames_All{$LibVersion}{$Lib_SoName} = 1; + } + open(SOLIB, "readelf -WhlSsdA $Lib_Path |"); + my $symtab=0;#indicates that we are processing 'symtab' section of 'readelf' output + while(<SOLIB>) + { + if($symtab == 1) { + #do nothing with symtab (but there are some plans for the future) + next; + } + if(/'.dynsym'/) { + $symtab=0; + } + elsif(/'.symtab'/) { + $symtab=1; + } + elsif(/NEEDED.+\[([^\[\]]+)\]/) + { + $NeededLib{$1} = 1; + } + elsif(my ($fullname, $idx, $Ndx) = readlile_ELF($_)) { + if( $Ndx eq "UND" ) { + #ignore interfaces that are exported form somewhere else + next; + } + my ($realname, $version) = ($fullname, ""); + if($fullname =~ /\A([^@]+)[\@]+([^@]+)\Z/) + { + ($realname, $version) = ($1, $2); + } + next if(defined $InterfacesListPath and not $InterfacesList{$realname}); + next if(defined $AppPath and not $InterfacesList_App{$realname}); + if($IsNeededLib) + { + $DepInterfaces{$LibVersion}{$fullname} = 1; + } + if(not $IsNeededLib or (defined $InterfacesListPath and $InterfacesList{$realname}) or (defined $AppPath and $InterfacesList_App{$realname})) + { + $Interface_Library{$LibVersion}{$fullname} = $Lib_SoName; + $Library_Interface{$LibVersion}{$Lib_SoName}{$fullname} = 1; + $Interface_Value{$LibVersion}{$fullname} = $idx; + $Value_Interface{$LibVersion}{$idx}{$fullname} = 1; + if(not $Language{$LibVersion}{$Lib_SoName}) + { + if($fullname =~ /\A_Z[A-Z]*[0-9]+/) + { + $Language{$LibVersion}{$Lib_SoName} = "C++"; + } + } + } + } + } + close(SOLIB); + if(not $IsNeededLib) + { + foreach my $Interface_Name (keys(%{$Interface_Library{$LibVersion}})) + { + next if($Interface_Name !~ /\@/); + my $Interface_SymName = ""; + foreach my $InterfaceName_SameValue (keys(%{$Value_Interface{$LibVersion}{$Interface_Value{$LibVersion}{$Interface_Name}}})) + { + if($InterfaceName_SameValue ne $Interface_Name) + { + $SymVer{$LibVersion}{$InterfaceName_SameValue} = $Interface_Name; + $Interface_SymName = $InterfaceName_SameValue; + last; + } + } + if(not $Interface_SymName) + { + if($Interface_Name =~ /\A([^@]*)[\@]+([^@]*)\Z/ and not $SymVer{$LibVersion}{$1}) + { + $SymVer{$LibVersion}{$1} = $Interface_Name; + } + } + } + } + foreach my $SoLib (keys(%NeededLib)) + { + getSymbols_Lib($LibVersion, find_solib_path($Lib_Dir, $SoLib), 1); + } + pop(@RecurLib); +} + +sub find_solib_path($$) +{ + my ($Dir, $SoName) = @_; + $Dir=~s/\/\Z//g; + if(-f $Dir."/".$SoName) + { + return $Dir."/".$SoName; + } + else + { + return $SoLib_DefaultPath{$SoName}; + } +} + +sub symbols_Preparation($) +{#recreate %SoNames and %Language using info from *.abi file + my $LibVersion = $_[0]; + foreach my $Lib_SoName (keys(%{$Library_Interface{$LibVersion}})) + { + foreach my $Interface_Name (keys(%{$Library_Interface{$LibVersion}{$Lib_SoName}})) + { + $Interface_Library{$LibVersion}{$Interface_Name} = $Lib_SoName; + $SoNames_All{$LibVersion}{$Lib_SoName} = 1; + if(not $Language{$LibVersion}{$Lib_SoName}) + { + if($Interface_Name =~ /\A_Z[A-Z]*[0-9]+/) + { + $Language{$LibVersion}{$Lib_SoName} = "C++"; + } + } + } + } +} + +sub getSoPaths($) +{ + my $LibVersion = $_[0]; + my @SoPaths = (); + foreach my $Dest (split("\n", $Descriptor{$LibVersion}{"Libs"})) + { + $Dest =~ s/\A\s+|\s+\Z//g; + next if(not $Dest); + if(not -e $Dest) + { + print "ERROR: can't access \'$Dest\'\n"; + } + my @SoPaths_Dest = getSOPaths_Dest($Dest); + foreach (@SoPaths_Dest) + { + push(@SoPaths, $_); + } + } + return @SoPaths; +} + +sub getSOPaths_Dest($) +{ + my $Dest = $_[0]; + if(-f $Dest) + { + return $Dest; + } + my @AllObjects = cmd_find($Dest,"f","*\.so*"); + my @SOPaths = (); + foreach my $SharedObject (@AllObjects) + { + if(cmd_file($SharedObject) =~ /shared object/) + { + @SOPaths = (@SOPaths, $SharedObject); + } + } + return @SOPaths; +} + +sub genDescriptorTemplate() +{ + writeFile("library-descriptor.xml", $Descriptor_Template."\n"); + print "descriptor template named 'library-descriptor.xml' has been generated in the current directory\n"; +} + +sub detectPointerSize() +{ + `mkdir -p temp`; + writeFile("temp/get_pointer_size.c", "#include <stdio.h> +int main() +{ + printf(\"\%d\", sizeof(int*)); + return 0; +}\n"); + system("gcc temp/get_pointer_size.c -o temp/get_pointer_size"); + $POINTER_SIZE = `./temp/get_pointer_size`; + `rm -fr temp`; +} + +sub data_Preparation($) +{ + my $LibVersion = $_[0]; + if($Descriptor{$LibVersion}{"Path"} =~ /\.abi\.tar\.gz/) + { + my $FileName = cmd_tar($Descriptor{$LibVersion}{"Path"}); + if($FileName =~ /\.abi/) + { + chomp($FileName); + my $LibraryABI = eval readFile($FileName); + system("rm", "-f", $FileName); + $TypeDescr{$LibVersion} = $LibraryABI->{"TypeDescr"}; + $FuncDescr{$LibVersion} = $LibraryABI->{"FuncDescr"}; + $Library_Interface{$LibVersion} = $LibraryABI->{"Interfaces"}; + $SymVer{$LibVersion} = $LibraryABI->{"SymVer"}; + $Tid_TDid{$LibVersion} = $LibraryABI->{"Tid_TDid"}; + $Descriptor{$LibVersion}{"Version"} = $LibraryABI->{"LibraryVersion"}; + $OpaqueTypes{$LibVersion} = $LibraryABI->{"OpaqueTypes"}; + $InternalInterfaces{$LibVersion} = $LibraryABI->{"InternalInterfaces"}; + $Headers{$LibVersion} = $LibraryABI->{"Headers"}; + $SoNames_All{$LibVersion} = $LibraryABI->{"SharedObjects"}; + $Constants{$LibVersion} = $LibraryABI->{"Constants"}; + if($LibraryABI->{"ABI_COMPLIANCE_CHECKER_VERSION"} ne $ABI_COMPLIANCE_CHECKER_VERSION) + { + print "ERROR: incompatible version of specified ABI dump (allowed only $ABI_COMPLIANCE_CHECKER_VERSION)\n"; + exit(1); + } + foreach my $Destination (keys(%{$Headers{$LibVersion}})) + { + my $Header = get_FileName($Destination); + $HeaderName_Destinations{$LibVersion}{$Header}{$Destination} = 1; + } + symbols_Preparation($LibVersion); + } + } + elsif($Descriptor{$LibVersion}{"Path"} =~ /\.tar\.gz\Z/) + { + print "ERROR: descriptor must be an XML file or '*.abi.tar.gz' ABI dump\n"; + exit(1); + } + else + { + readDescriptor($LibVersion); + if(not $CheckHeadersOnly) + { + getSymbols($LibVersion); + } + headerSearch($LibVersion); + } +} + +sub dump_sorting($) +{ + my $hash = $_[0]; + if((keys(%{$hash}))[0] =~ /\A[0-9]+\Z/) + { + return [sort {int($a) <=> int($b)} keys %{$hash}]; + } + else + { + return [sort {$a cmp $b} keys %{$hash}]; + } +} + +sub get_solib_default_paths() +{ + foreach my $Line (split("\n", `ldconfig -p`)) + { + if($Line=~/\A[ \t]*([^ \t]+) .* \=\> (.+)\Z/) + { + $SoLib_DefaultPath{$1} = $2; + } + } +} + +sub scenario() +{ + if(defined $Help) + { + HELP_MESSAGE(); + exit(0); + } + if(defined $ShowVersion) + { + print "ABI Compliance Checker $ABI_COMPLIANCE_CHECKER_VERSION\nCopyright (C) The Linux Foundation\nCopyright (C) Institute for System Programming, RAS\nLicense GPLv2: GNU GPL version 2 <http://www.gnu.org/licenses/>\nThis program is free software: you can redistribute it and/or modify it.\n\nWritten by Andrey Ponomarenko.\n"; + exit(0); + } + $Data::Dumper::Sortkeys = \&dump_sorting; + if(defined $TestSystem) + { + testSystem_cpp(); + testSystem_c(); + exit(0); + } + if($GenerateDescriptor) + { + genDescriptorTemplate(); + exit(0); + } + if(not defined $TargetLibraryName) + { + print "select library name (option -l <name>)\n"; + exit(1); + } + if(defined $InterfacesListPath) + { + if(not -f $InterfacesListPath) + { + print "ERROR: can't access file $InterfacesListPath\n"; + exit(1); + } + foreach my $Interface (split("\n", readFile($InterfacesListPath))) + { + $InterfacesList{$Interface} = 1; + } + } + if($AppPath) + { + if(-f $AppPath) + { + foreach my $Interface (getSymbols_App($AppPath)) + { + $InterfacesList_App{$Interface} = 1; + } + } + else + { + print "ERROR: can't access file \'$AppPath\'\n"; + exit(1); + } + } + get_solib_default_paths(); + if($DumpInfo_DescriptorPath) + { + if(not -f $DumpInfo_DescriptorPath) + { + print "ERROR: can't access file \'$DumpInfo_DescriptorPath\'\n"; + exit(1); + } + $Descriptor{1}{"Path"} = $DumpInfo_DescriptorPath; + readDescriptor(1); + detectPointerSize(); + getSymbols(1); + translateSymbols(1); + headerSearch(1); + parseHeaders_AllInOne(1); + cleanData(1); + my %LibraryABI = (); + print "creating library ABI info dump ...\n"; + $LibraryABI{"TypeDescr"} = $TypeDescr{1}; + $LibraryABI{"FuncDescr"} = $FuncDescr{1}; + $LibraryABI{"Interfaces"} = $Library_Interface{1}; + $LibraryABI{"SymVer"} = $SymVer{1}; + $LibraryABI{"LibraryVersion"} = $Descriptor{1}{"Version"}; + $LibraryABI{"Library"} = $TargetLibraryName; + $LibraryABI{"SharedObjects"} = $SoNames_All{1}; + $LibraryABI{"Tid_TDid"} = $Tid_TDid{1}; + $LibraryABI{"OpaqueTypes"} = $OpaqueTypes{1}; + $LibraryABI{"InternalInterfaces"} = $InternalInterfaces{1}; + $LibraryABI{"Headers"} = $Headers{1}; + $LibraryABI{"Constants"} = $Constants{1}; + $LibraryABI{"ABI_COMPLIANCE_CHECKER_VERSION"} = $ABI_COMPLIANCE_CHECKER_VERSION; + my $InfoDump_FilePath = "abi_dumps/$TargetLibraryName"; + my $InfoDump_FileName = $TargetLibraryName."_".$Descriptor{1}{"Version"}.".abi"; + system("mkdir", "-p", $InfoDump_FilePath); + system("rm", "-f", $InfoDump_FilePath."/".$InfoDump_FileName.".tar.gz"); + writeFile("$InfoDump_FilePath/$InfoDump_FileName", Dumper(\%LibraryABI)); + system("cd ".esc($InfoDump_FilePath)." && tar -cf ".esc($InfoDump_FileName).".tar ".esc($InfoDump_FileName)); + system("cd ".esc($InfoDump_FilePath)." && gzip ".esc($InfoDump_FileName).".tar --best"); + system("rm", "-f", $InfoDump_FilePath."/".$InfoDump_FileName); + if($?) + { + print "ERROR: can't create library ABI info dump\n"; + exit(1); + } + else + { + print "see library ABI info dump in \'$InfoDump_FilePath/$InfoDump_FileName\.tar\.gz\': use it instead of library version descriptor on other machine\n"; + exit(0); + } + } + if(not $Descriptor{1}{"Path"}) + { + print "select 1st library descriptor (option -d1 <path>)\n"; + exit(1); + } + if(not -f $Descriptor{1}{"Path"}) + { + print "ERROR: descriptor d1 does not exist, incorrect file path '".$Descriptor{1}{"Path"}."'\n"; + exit(1); + } + if(not $Descriptor{2}{"Path"}) + { + print "select 2nd library descriptor (option -d2 <path>)\n"; + exit(1); + } + if(not -f $Descriptor{2}{"Path"}) + { + print "ERROR: descriptor d2 does not exist, incorrect file path '".$Descriptor{2}{"Path"}."'\n"; + exit(1); + } + $StartTime = localtime time; + print "preparation...\n"; + data_Preparation(1); + data_Preparation(2); + if($AppPath and not keys(%{$Interface_Library{1}})) + { + print "WARNING: symbols from the specified application were not found in the specified library shared objects\n"; + } + $REPORT_PATH = "compat_reports/$TargetLibraryName/".$Descriptor{1}{"Version"}."_to_".$Descriptor{2}{"Version"}; + system("mkdir", "-p", $REPORT_PATH); + system("rm", "-f", $REPORT_PATH."/abi_compat_report.html"); + detectPointerSize(); + translateSymbols(1); + translateSymbols(2); + if(not $CheckHeadersOnly) + { + detectAdded(); + detectWithdrawn(); + } + #headers merging + if($HeaderCheckingMode_Separately and $Descriptor{1}{"Path"} !~ /\.abi\.tar\.gz/ and $Descriptor{2}{"Path"} !~ /\.abi\.tar\.gz/) + { + mergeHeaders_Separately(); + } + else + { + if($Descriptor{1}{"Path"} !~ /\.abi\.tar\.gz/) + { + parseHeaders_AllInOne(1); + } + if($Descriptor{2}{"Path"} !~ /\.abi\.tar\.gz/) + { + parseHeaders_AllInOne(2); + } + print "comparing headers ...\n"; + mergeSignatures(); + mergeConstants(); + } + #libraries merging + if(not $CheckHeadersOnly) + { + print "comparing shared objects ...\n"; + mergeLibs(); + } + print "creating ABI compliance report ...\n"; + create_HtmlReport(); + if($HeaderCheckingMode_Separately) + { + if(keys(%HeaderCompileError)) + { + print "\nWARNING: compilation errors in following headers:\n"; + foreach my $Header (keys(%HeaderCompileError)) + { + print $Header." "; + } + print "\nyou can see compilation errors in the following files:\n '$ERR_PATH{1}'\n '$ERR_PATH{2}'\n"; + } + } + `rm -fr temp`; + print "\nstarted: $StartTime, finished: ".(localtime time)."\n" if($ShowExpendTime); + print "see the ABI compliance report in the file '$REPORT_PATH/abi_compat_report.html'\n"; + exit(0); +} + +scenario(); diff --git a/abicheck/apt_build.xml.in b/abicheck/apt_build.xml.in new file mode 100644 index 000000000..f7d4c90cf --- /dev/null +++ b/abicheck/apt_build.xml.in @@ -0,0 +1,11 @@ +<version> + build-branch +</version> + + <headers> + @build_path@/include/apt-pkg + </headers> + + <libs> + @build_path@/bin/ + </libs> diff --git a/abicheck/apt_installed.xml.in b/abicheck/apt_installed.xml.in new file mode 100644 index 000000000..c3ddd0838 --- /dev/null +++ b/abicheck/apt_installed.xml.in @@ -0,0 +1,11 @@ +<version> + installed +</version> + +<headers> + /usr/include/apt-pkg/ +</headers> + +<libs> + @installed_libapt@ +</libs> diff --git a/abicheck/run_abi_test b/abicheck/run_abi_test new file mode 100755 index 000000000..4e4bdf298 --- /dev/null +++ b/abicheck/run_abi_test @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ ! -d ../build ]; then + echo "../build missing, did you run make?" + exit 1 +fi + +LIBPATH=$(find /usr/lib/ -type f -name "libapt-*.so.*" -printf %p\\\\n) +sed s#@installed_libapt@#$LIBPATH# apt_installed.xml.in > apt_installed.xml + +BUILDPATH=$(readlink -f ../build) +sed s#@build_path@#$BUILDPATH# apt_build.xml.in > apt_build.xml + +perl abi-compliance-checker.pl -l apt -d1 apt_installed.xml -d2 apt_build.xml diff --git a/apt-inst/contrib/arfile.h b/apt-inst/contrib/arfile.h index 96e18bc60..7f6c68302 100644 --- a/apt-inst/contrib/arfile.h +++ b/apt-inst/contrib/arfile.h @@ -39,6 +39,7 @@ class ARArchive // Locate a member by name const Member *FindMember(const char *Name) const; + inline Member *Members() { return List; } ARArchive(FileFd &File); ~ARArchive(); diff --git a/apt-inst/makefile b/apt-inst/makefile index abc8c3fd9..785dc62ba 100644 --- a/apt-inst/makefile +++ b/apt-inst/makefile @@ -14,7 +14,7 @@ include ../buildlib/libversion.mak # The library name LIBRARY=apt-inst -MAJOR=1.1 +MAJOR=1.2 MINOR=0 SLIBS=$(PTHREADLIB) -lapt-pkg APT_DOMAIN:=libapt-inst$(MAJOR) diff --git a/apt-pkg/aptconfiguration.cc b/apt-pkg/aptconfiguration.cc index 429219cbd..a1379ce7d 100644 --- a/apt-pkg/aptconfiguration.cc +++ b/apt-pkg/aptconfiguration.cc @@ -152,6 +152,7 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, builtin.push_back(c); } } + closedir(D); // get the environment language codes: LC_MESSAGES (and later LANGUAGE) // we extract both, a long and a short code and then we will @@ -217,7 +218,8 @@ std::vector<std::string> const Configuration::getLanguages(bool const &All, environment.push_back(envLong); environment.push_back(envShort); // take care of LANGUAGE - string envLang = Locale == 0 ? getenv("LANGUAGE") : *(Locale+1); + const char *language_env = getenv("LANGUAGE") == 0 ? "" : getenv("LANGUAGE"); + string envLang = Locale == 0 ? language_env : *(Locale+1); if (envLang.empty() == false) { std::vector<string> env = ExplodeString(envLang,':'); short addedLangs = 0; // add a maximum of 3 fallbacks from the environment diff --git a/apt-pkg/cdrom.cc b/apt-pkg/cdrom.cc index 83165c6c0..93deb49c4 100644 --- a/apt-pkg/cdrom.cc +++ b/apt-pkg/cdrom.cc @@ -281,7 +281,8 @@ bool pkgCdrom::DropRepeats(vector<string> &List,const char *Name) List[J] = string(); } } - + delete[] Inodes; + // Wipe erased entries for (unsigned int I = 0; I < List.size();) { diff --git a/apt-pkg/contrib/cmndline.cc b/apt-pkg/contrib/cmndline.cc index bfd53695e..0b16bf51a 100644 --- a/apt-pkg/contrib/cmndline.cc +++ b/apt-pkg/contrib/cmndline.cc @@ -135,7 +135,9 @@ bool CommandLine::Parse(int argc,const char **argv) for (; I != argc; I++) *Files++ = argv[I]; *Files = 0; - + + SaveInConfig(argc, argv); + return true; } /*}}}*/ @@ -351,3 +353,41 @@ bool CommandLine::DispatchArg(Dispatch *Map,bool NoMatch) return false; } /*}}}*/ +// CommandLine::SaveInConfig - for output later in a logfile or so /*{{{*/ +// --------------------------------------------------------------------- +/* We save the commandline here to have it around later for e.g. logging. + It feels a bit like a hack here and isn't bulletproof, but it is better + than nothing after all. */ +void CommandLine::SaveInConfig(unsigned int const &argc, char const * const * const argv) +{ + char cmdline[300]; + unsigned int length = 0; + bool lastWasOption = false; + bool closeQuote = false; + for (unsigned int i = 0; i < argc; ++i, ++length) + { + for (unsigned int j = 0; argv[i][j] != '\0' && length < sizeof(cmdline)-1; ++j, ++length) + { + cmdline[length] = argv[i][j]; + if (lastWasOption == true && argv[i][j] == '=') + { + // That is possibly an option: Quote it if it includes spaces, + // the benefit is that this will eliminate also most false positives + const char* c = &argv[i][j+1]; + for (; *c != '\0' && *c != ' '; ++c); + if (*c == '\0') continue; + cmdline[++length] = '"'; + closeQuote = true; + } + } + if (closeQuote == true) + cmdline[length++] = '"'; + // Problem: detects also --hello + if (cmdline[length-1] == 'o') + lastWasOption = true; + cmdline[length] = ' '; + } + cmdline[--length] = '\0'; + _config->Set("CommandLine::AsString", cmdline); +} + /*}}}*/ diff --git a/apt-pkg/contrib/cmndline.h b/apt-pkg/contrib/cmndline.h index e28071e81..7c0c71aa7 100644 --- a/apt-pkg/contrib/cmndline.h +++ b/apt-pkg/contrib/cmndline.h @@ -60,6 +60,7 @@ class CommandLine Configuration *Conf; bool HandleOpt(int &I,int argc,const char *argv[], const char *&Opt,Args *A,bool PreceedeMatch = false); + void static SaveInConfig(unsigned int const &argc, char const * const * const argv); public: diff --git a/apt-pkg/contrib/mmap.cc b/apt-pkg/contrib/mmap.cc index f440f9489..b3f29032c 100644 --- a/apt-pkg/contrib/mmap.cc +++ b/apt-pkg/contrib/mmap.cc @@ -27,6 +27,7 @@ #include <unistd.h> #include <fcntl.h> #include <stdlib.h> +#include <errno.h> #include <cstring> /*}}}*/ @@ -35,7 +36,7 @@ // --------------------------------------------------------------------- /* */ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0), - Base(0) + Base(0), SyncToFd(NULL) { if ((Flags & NoImmMap) != NoImmMap) Map(F); @@ -45,7 +46,7 @@ MMap::MMap(FileFd &F,unsigned long Flags) : Flags(Flags), iSize(0), // --------------------------------------------------------------------- /* */ MMap::MMap(unsigned long Flags) : Flags(Flags), iSize(0), - Base(0) + Base(0), SyncToFd(NULL) { } /*}}}*/ @@ -78,7 +79,24 @@ bool MMap::Map(FileFd &Fd) // Map it. Base = mmap(0,iSize,Prot,Map,Fd.Fd(),0); if (Base == (void *)-1) - return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"),iSize); + { + if (errno == ENODEV || errno == EINVAL) + { + // The filesystem doesn't support this particular kind of mmap. + // So we allocate a buffer and read the whole file into it. + int const dupped_fd = dup(Fd.Fd()); + if (dupped_fd == -1) + return _error->Errno("mmap", _("Couldn't duplicate file descriptor %i"), Fd.Fd()); + + Base = new unsigned char[iSize]; + SyncToFd = new FileFd (dupped_fd); + if (!SyncToFd->Seek(0L) || !SyncToFd->Read(Base, iSize)) + return false; + } + else + return _error->Errno("mmap",_("Couldn't make mmap of %lu bytes"), + iSize); + } return true; } @@ -93,10 +111,19 @@ bool MMap::Close(bool DoSync) if (DoSync == true) Sync(); - - if (munmap((char *)Base,iSize) != 0) - _error->Warning("Unable to munmap"); - + + if (SyncToFd != NULL) + { + delete[] (char *)Base; + delete SyncToFd; + SyncToFd = NULL; + } + else + { + if (munmap((char *)Base, iSize) != 0) + _error->WarningE("mmap", _("Unable to close mmap")); + } + iSize = 0; Base = 0; return true; @@ -113,8 +140,18 @@ bool MMap::Sync() #ifdef _POSIX_SYNCHRONIZED_IO if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base,iSize,MS_SYNC) < 0) - return _error->Errno("msync","Unable to write mmap"); + { + if (SyncToFd != NULL) + { + if (!SyncToFd->Seek(0) || !SyncToFd->Write(Base, iSize)) + return false; + } + else + { + if (msync((char *)Base, iSize, MS_SYNC) < 0) + return _error->Errno("msync", _("Unable to synchronize mmap")); + } + } #endif return true; } @@ -130,8 +167,19 @@ bool MMap::Sync(unsigned long Start,unsigned long Stop) #ifdef _POSIX_SYNCHRONIZED_IO unsigned long PSize = sysconf(_SC_PAGESIZE); if ((Flags & ReadOnly) != ReadOnly) - if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) - return _error->Errno("msync","Unable to write mmap"); + { + if (SyncToFd != 0) + { + if (!SyncToFd->Seek(0) || + !SyncToFd->Write (((char *)Base)+Start, Stop-Start)) + return false; + } + else + { + if (msync((char *)Base+(int)(Start/PSize)*PSize,Stop - Start,MS_SYNC) < 0) + return _error->Errno("msync", _("Unable to synchronize mmap")); + } + } #endif return true; } diff --git a/apt-pkg/contrib/mmap.h b/apt-pkg/contrib/mmap.h index cd2b15ba2..5ca951204 100644 --- a/apt-pkg/contrib/mmap.h +++ b/apt-pkg/contrib/mmap.h @@ -44,6 +44,11 @@ class MMap unsigned long iSize; void *Base; + // In case mmap can not be used, we keep a dup of the file + // descriptor that should have been mmaped so that we can write to + // the file in Sync(). + FileFd *SyncToFd; + bool Map(FileFd &Fd); bool Close(bool DoSync = true); diff --git a/apt-pkg/contrib/strutl.cc b/apt-pkg/contrib/strutl.cc index 3bbaf5f30..1b9922a31 100644 --- a/apt-pkg/contrib/strutl.cc +++ b/apt-pkg/contrib/strutl.cc @@ -1341,3 +1341,15 @@ string URI::SiteOnly(const string &URI) return U; } /*}}}*/ +// URI::NoUserPassword - Return the schema, site and path for the URI /*{{{*/ +// --------------------------------------------------------------------- +/* */ +string URI::NoUserPassword(const string &URI) +{ + ::URI U(URI); + U.User.clear(); + U.Password.clear(); + U.Port = 0; + return U; +} + /*}}}*/ diff --git a/apt-pkg/contrib/strutl.h b/apt-pkg/contrib/strutl.h index d65f975d2..e72288f4c 100644 --- a/apt-pkg/contrib/strutl.h +++ b/apt-pkg/contrib/strutl.h @@ -121,6 +121,7 @@ class URI inline void operator =(const string &From) {CopyFrom(From);}; inline bool empty() {return Access.empty();}; static string SiteOnly(const string &URI); + static string NoUserPassword(const string &URI); URI(string Path) {CopyFrom(Path);}; URI() : Port(0) {}; diff --git a/apt-pkg/deb/debindexfile.cc b/apt-pkg/deb/debindexfile.cc index bb8fae7cb..b89429d86 100644 --- a/apt-pkg/deb/debindexfile.cc +++ b/apt-pkg/deb/debindexfile.cc @@ -35,12 +35,12 @@ debSourcesIndex::debSourcesIndex(string URI,string Dist,string Section,bool Trus // SourcesIndex::SourceInfo - Short 1 liner describing a source /*{{{*/ // --------------------------------------------------------------------- /* The result looks like: - http://foo/ stable/main src 1.1.1 (dsc) */ + http://foo/debian/ stable/main src 1.1.1 (dsc) */ string debSourcesIndex::SourceInfo(pkgSrcRecords::Parser const &Record, pkgSrcRecords::File const &File) const { string Res; - Res = ::URI::SiteOnly(URI) + ' '; + Res = ::URI::NoUserPassword(URI) + ' '; if (Dist[Dist.size() - 1] == '/') { if (Dist != "/") @@ -88,7 +88,7 @@ string debSourcesIndex::Describe(bool Short) const /* */ string debSourcesIndex::Info(const char *Type) const { - string Info = ::URI::SiteOnly(URI) + ' '; + string Info = ::URI::NoUserPassword(URI) + ' '; if (Dist[Dist.size() - 1] == '/') { if (Dist != "/") @@ -162,7 +162,7 @@ debPackagesIndex::debPackagesIndex(string const &URI, string const &Dist, string /* This is a shorter version that is designed to be < 60 chars or so */ string debPackagesIndex::ArchiveInfo(pkgCache::VerIterator Ver) const { - string Res = ::URI::SiteOnly(URI) + ' '; + string Res = ::URI::NoUserPassword(URI) + ' '; if (Dist[Dist.size() - 1] == '/') { if (Dist != "/") @@ -200,7 +200,7 @@ string debPackagesIndex::Describe(bool Short) const /* */ string debPackagesIndex::Info(const char *Type) const { - string Info = ::URI::SiteOnly(URI) + ' '; + string Info = ::URI::NoUserPassword(URI) + ' '; if (Dist[Dist.size() - 1] == '/') { if (Dist != "/") @@ -402,7 +402,7 @@ string debTranslationsIndex::Describe(bool Short) const /* */ string debTranslationsIndex::Info(const char *Type) const { - string Info = ::URI::SiteOnly(URI) + ' '; + string Info = ::URI::NoUserPassword(URI) + ' '; if (Dist[Dist.size() - 1] == '/') { if (Dist != "/") diff --git a/apt-pkg/deb/debversion.cc b/apt-pkg/deb/debversion.cc index ad45e9a44..755ffbe96 100644 --- a/apt-pkg/deb/debversion.cc +++ b/apt-pkg/deb/debversion.cc @@ -190,8 +190,22 @@ int debVersioningSystem::DoCmpVersion(const char *A,const char *AEnd, dlhs++; if (drhs != rhs) drhs++; - - return CmpFragment(dlhs,AEnd,drhs,BEnd); + + // no debian revision need to be treated like -0 + if (*(dlhs-1) == '-' && *(drhs-1) == '-') + return CmpFragment(dlhs,AEnd,drhs,BEnd); + else if (*(dlhs-1) == '-') + { + const char* null = "0"; + return CmpFragment(dlhs,AEnd,null, null+1); + } + else if (*(drhs-1) == '-') + { + const char* null = "0"; + return CmpFragment(null, null+1, drhs, BEnd); + } + else + return 0; } /*}}}*/ // debVS::CheckDep - Check a single dependency /*{{{*/ diff --git a/apt-pkg/deb/dpkgpm.cc b/apt-pkg/deb/dpkgpm.cc index 3dca2b209..9ba60060c 100644 --- a/apt-pkg/deb/dpkgpm.cc +++ b/apt-pkg/deb/dpkgpm.cc @@ -550,46 +550,108 @@ void pkgDPkgPM::DoDpkgStatusFd(int statusfd, int OutStatusFd) dpkgbuf_pos = dpkgbuf+dpkgbuf_pos-p; } /*}}}*/ +// DPkgPM::WriteHistoryTag /*{{{*/ +void pkgDPkgPM::WriteHistoryTag(string tag, string value) +{ + if (value.size() > 0) + { + // poor mans rstrip(", ") + if (value[value.size()-2] == ',' && value[value.size()-1] == ' ') + value.erase(value.size() - 2, 2); + fprintf(history_out, "%s: %s\n", tag.c_str(), value.c_str()); + } +} /*}}}*/ // DPkgPM::OpenLog /*{{{*/ bool pkgDPkgPM::OpenLog() { - string logdir = _config->FindDir("Dir::Log"); + string const logdir = _config->FindDir("Dir::Log"); if(not FileExists(logdir)) return _error->Error(_("Directory '%s' missing"), logdir.c_str()); - string logfile_name = flCombine(logdir, + + // get current time + char timestr[200]; + time_t const t = time(NULL); + struct tm const * const tmp = localtime(&t); + strftime(timestr, sizeof(timestr), "%F %T", tmp); + + // open terminal log + string const logfile_name = flCombine(logdir, _config->Find("Dir::Log::Terminal")); if (!logfile_name.empty()) { term_out = fopen(logfile_name.c_str(),"a"); if (term_out == NULL) - return _error->WarningE(_("Could not open file '%s'"), logfile_name.c_str()); + return _error->WarningE("OpenLog", _("Could not open file '%s'"), logfile_name.c_str()); chmod(logfile_name.c_str(), 0600); - // output current time - char outstr[200]; - time_t t = time(NULL); - struct tm *tmp = localtime(&t); - strftime(outstr, sizeof(outstr), "%F %T", tmp); - fprintf(term_out, "\nLog started: %s\n", outstr); + fprintf(term_out, "\nLog started: %s\n", timestr); } + + // write your history + string const history_name = flCombine(logdir, + _config->Find("Dir::Log::History")); + if (!history_name.empty()) + { + history_out = fopen(history_name.c_str(),"a"); + if (history_out == NULL) + return _error->WarningE("OpenLog", _("Could not open file '%s'"), history_name.c_str()); + chmod(history_name.c_str(), 0644); + fprintf(history_out, "\nStart-Date: %s\n", timestr); + string remove, purge, install, upgrade, downgrade; + for (pkgCache::PkgIterator I = Cache.PkgBegin(); I.end() == false; I++) + { + if (Cache[I].NewInstall()) + install += I.Name() + string(" (") + Cache[I].CandVersion + string("), "); + else if (Cache[I].Upgrade()) + upgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); + else if (Cache[I].Downgrade()) + downgrade += I.Name() + string(" (") + Cache[I].CurVersion + string(", ") + Cache[I].CandVersion + string("), "); + else if (Cache[I].Delete()) + { + if ((Cache[I].iFlags & pkgDepCache::Purge) == pkgDepCache::Purge) + purge += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); + else + remove += I.Name() + string(" (") + Cache[I].CurVersion + string("), "); + } + } + if (_config->Exists("Commandline::AsString") == true) + WriteHistoryTag("Commandline", _config->Find("Commandline::AsString")); + WriteHistoryTag("Install", install); + WriteHistoryTag("Upgrade", upgrade); + WriteHistoryTag("Downgrade",downgrade); + WriteHistoryTag("Remove",remove); + WriteHistoryTag("Purge",purge); + fflush(history_out); + } + return true; } /*}}}*/ // DPkg::CloseLog /*{{{*/ bool pkgDPkgPM::CloseLog() { + char timestr[200]; + time_t t = time(NULL); + struct tm *tmp = localtime(&t); + strftime(timestr, sizeof(timestr), "%F %T", tmp); + if(term_out) { - char outstr[200]; - time_t t = time(NULL); - struct tm *tmp = localtime(&t); - strftime(outstr, sizeof(outstr), "%F %T", tmp); fprintf(term_out, "Log ended: "); - fprintf(term_out, "%s", outstr); + fprintf(term_out, "%s", timestr); fprintf(term_out, "\n"); fclose(term_out); } term_out = NULL; + + if(history_out) + { + if (dpkg_error.size() > 0) + fprintf(history_out, "Error: %s\n", dpkg_error.c_str()); + fprintf(history_out, "End-Date: %s\n", timestr); + fclose(history_out); + } + return true; } /*}}}*/ @@ -1059,11 +1121,14 @@ bool pkgDPkgPM::Go(int OutStatusFd) RunScripts("DPkg::Post-Invoke"); if (WIFSIGNALED(Status) != 0 && WTERMSIG(Status) == SIGSEGV) - _error->Error("Sub-process %s received a segmentation fault.",Args[0]); + strprintf(dpkg_error, "Sub-process %s received a segmentation fault.",Args[0]); else if (WIFEXITED(Status) != 0) - _error->Error("Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); + strprintf(dpkg_error, "Sub-process %s returned an error code (%u)",Args[0],WEXITSTATUS(Status)); else - _error->Error("Sub-process %s exited unexpectedly",Args[0]); + strprintf(dpkg_error, "Sub-process %s exited unexpectedly",Args[0]); + + if(dpkg_error.size() > 0) + _error->Error(dpkg_error.c_str()); if(stopOnError) { diff --git a/apt-pkg/deb/dpkgpm.h b/apt-pkg/deb/dpkgpm.h index 43e5c7d45..330c788a2 100644 --- a/apt-pkg/deb/dpkgpm.h +++ b/apt-pkg/deb/dpkgpm.h @@ -29,7 +29,9 @@ class pkgDPkgPM : public pkgPackageManager char dpkgbuf[1024]; int dpkgbuf_pos; FILE *term_out; - + FILE *history_out; + string dpkg_error; + protected: // progress reporting @@ -66,6 +68,7 @@ class pkgDPkgPM : public pkgPackageManager // Helpers bool RunScriptsWithPkgs(const char *Cnf); bool SendV2Pkgs(FILE *F); + void WriteHistoryTag(string tag, string value); // dpkg log bool OpenLog(); diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index ffa4fe71c..75f69ee11 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -257,7 +257,22 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ pkgCache::PkgIterator pkg = Cache->FindPkg(pkgname, pkgarch); if(pkg.end() || pkg.VersionList().end()) continue; - bool const newAuto = (PkgState[pkg->ID].Flags & Flag::Auto); + StateCache const &P = PkgState[pkg->ID]; + bool newAuto = (P.Flags & Flag::Auto); + // skip not installed or now-removed ones if requested + if (InstalledOnly && ( + (pkg->CurrentVer == 0 && P.Mode != ModeInstall) || + (pkg->CurrentVer != 0 && P.Mode == ModeDelete))) + { + // The section is obsolete if it contains no other tag + unsigned int const count = section.Count(); + if (count < 2 || + (count == 2 && section.Exists("Auto-Installed")) || + (count == 3 && section.Exists("Auto-Installed") && section.Exists("Architecture"))) + continue; + else + newAuto = false; + } if(_config->FindB("Debug::pkgAutoRemove",false)) std::clog << "Update existing AutoInstall info: " << pkg.FullName() << std::endl; @@ -277,14 +292,17 @@ bool pkgDepCache::writeStateFile(OpProgress *prog, bool InstalledOnly) /*{{{*/ // then write the ones we have not seen yet std::ostringstream ostr; for(pkgCache::PkgIterator pkg=Cache->PkgBegin(); !pkg.end(); pkg++) { - if(PkgState[pkg->ID].Flags & Flag::Auto) { + StateCache const &P = PkgState[pkg->ID]; + if(P.Flags & Flag::Auto) { if (pkgs_seen.find(pkg.FullName()) != pkgs_seen.end()) { if(debug_autoremove) std::clog << "Skipping already written " << pkg.FullName() << std::endl; continue; } // skip not installed ones if requested - if(InstalledOnly && pkg->CurrentVer == 0) + if (InstalledOnly && ( + (pkg->CurrentVer == 0 && P.Mode != ModeInstall) || + (pkg->CurrentVer != 0 && P.Mode == ModeDelete))) continue; const char* const pkgarch = pkg.Arch(); if (strcmp(pkgarch, "all") == 0) diff --git a/apt-pkg/depcache.h b/apt-pkg/depcache.h index ea605f199..6765d3e7c 100644 --- a/apt-pkg/depcache.h +++ b/apt-pkg/depcache.h @@ -447,7 +447,7 @@ class pkgDepCache : protected pkgCache::Namespace // read persistent states bool readStateFile(OpProgress *prog); - bool writeStateFile(OpProgress *prog, bool InstalledOnly=false); + bool writeStateFile(OpProgress *prog, bool InstalledOnly=true); // Size queries inline double UsrSize() {return iUsrSize;}; diff --git a/apt-pkg/init.cc b/apt-pkg/init.cc index d8c201b9d..6310aff11 100644 --- a/apt-pkg/init.cc +++ b/apt-pkg/init.cc @@ -75,6 +75,7 @@ bool pkgInitConfig(Configuration &Cnf) // State Cnf.Set("Dir::Log","var/log/apt"); Cnf.Set("Dir::Log::Terminal","term.log"); + Cnf.Set("Dir::Log::History","history.log"); // Translation Cnf.Set("APT::Acquire::Translation", "environment"); diff --git a/apt-pkg/init.h b/apt-pkg/init.h index f0757f644..b3e4b147f 100644 --- a/apt-pkg/init.h +++ b/apt-pkg/init.h @@ -22,7 +22,7 @@ // 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_MINOR 9 #define APT_PKG_RELEASE 0 extern const char *pkgVersion; diff --git a/apt-pkg/pkgcachegen.cc b/apt-pkg/pkgcachegen.cc index 3d1a654d1..8187b3950 100644 --- a/apt-pkg/pkgcachegen.cc +++ b/apt-pkg/pkgcachegen.cc @@ -189,17 +189,22 @@ bool pkgCacheGenerator::MergeList(ListParser &List, pkgCache::VerIterator Ver = Pkg.VersionList(); map_ptrloc *LastVer = &Pkg->VersionList; int Res = 1; + unsigned long const Hash = List.VersionHash(); for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) { Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); - if (Res >= 0) + // Version is higher as current version - insert here + if (Res > 0) break; + // Versionstrings are equal - is hash also equal? + if (Res == 0 && Ver->Hash == Hash) + break; + // proceed with the next till we have either the right + // or we found another version (which will be lower) } - - /* We already have a version for this item, record that we - saw it */ - unsigned long Hash = List.VersionHash(); - if (Res == 0 && Ver->Hash == Hash) + + /* We already have a version for this item, record that we saw it */ + if (Res == 0 && Ver.end() == false && Ver->Hash == Hash) { if (List.UsePackage(Pkg,Ver) == false) return _error->Error(_("Error occurred while processing %s (UsePackage2)"), @@ -218,17 +223,6 @@ bool pkgCacheGenerator::MergeList(ListParser &List, } continue; - } - - // Skip to the end of the same version set. - if (Res == 0) - { - for (; Ver.end() == false; LastVer = &Ver->NextVer, Ver++) - { - Res = Cache.VS->CmpVersion(Version,Ver.VerStr()); - if (Res != 0) - break; - } } // Add a new version diff --git a/apt-pkg/tagfile.cc b/apt-pkg/tagfile.cc index 7c5d15a58..0d4999ee7 100644 --- a/apt-pkg/tagfile.cc +++ b/apt-pkg/tagfile.cc @@ -193,17 +193,8 @@ bool pkgTagFile::Jump(pkgTagSection &Tag,unsigned long Offset) /*}}}*/ // TagSection::Scan - Scan for the end of the header information /*{{{*/ // --------------------------------------------------------------------- -/* This looks for the first double new line in the data stream. It also - indexes the tags in the section. This very simple hash function for the - last 8 letters gives very good performance on the debian package files */ -inline static unsigned long AlphaHash(const char *Text, const char *End = 0) -{ - unsigned long Res = 0; - for (; Text != End && *Text != ':' && *Text != 0; Text++) - Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1); - return Res & 0xFF; -} - +/* This looks for the first double new line in the data stream. + It also indexes the tags in the section. */ bool pkgTagSection::Scan(const char *Start,unsigned long MaxLength) { const char *End = Start + MaxLength; diff --git a/apt-pkg/tagfile.h b/apt-pkg/tagfile.h index 321329a23..f63a51d07 100644 --- a/apt-pkg/tagfile.h +++ b/apt-pkg/tagfile.h @@ -33,7 +33,18 @@ class pkgTagSection unsigned int AlphaIndexes[0x100]; unsigned int TagCount; - + + /* This very simple hash function for the last 8 letters gives + very good performance on the debian package files */ + inline static unsigned long AlphaHash(const char *Text, const char *End = 0) + { + unsigned long Res = 0; + for (; Text != End && *Text != ':' && *Text != 0; Text++) + Res = ((unsigned long)(*Text) & 0xDF) ^ (Res << 1); + return Res & 0xFF; + } + + protected: const char *Stop; @@ -54,6 +65,8 @@ class pkgTagSection virtual void TrimRecord(bool BeforeRecord, const char* &End); inline unsigned int Count() const {return TagCount;}; + inline bool Exists(const char* const Tag) {return AlphaIndexes[AlphaHash(Tag)] != 0;} + inline void Get(const char *&Start,const char *&Stop,unsigned int I) const {Start = Section + Indexes[I]; Stop = Section + Indexes[I+1];} diff --git a/buildlib/library.mak b/buildlib/library.mak index 2a4bb782a..029e87463 100644 --- a/buildlib/library.mak +++ b/buildlib/library.mak @@ -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)\ diff --git a/buildlib/libversion.mak b/buildlib/libversion.mak index 26ca86ced..796c956e7 100644 --- a/buildlib/libversion.mak +++ b/buildlib/libversion.mak @@ -12,10 +12,3 @@ LIBAPTPKG_RELEASE=$(shell grep -E '^\#define APT_PKG_RELEASE' $(BASE)/apt-pkg/in # 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) - -# FIXME: In previous releases this lovely variable includes -# the detected libc and libdc++ version. As this is bogus we -# want to drop this, but this a ABI break. -# And we don't want to do this now. So we hardcode a value here, -# and drop it later on (hopefully as fast as possible). -LIBEXT=-libc6.9-6 diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 4596c3d61..7875ae20f 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1109,7 +1109,17 @@ bool TryToInstall(pkgCache::PkgIterator Pkg,pkgDepCache &Cache, Pkg.FullName(true).c_str()); return true; } - + + // Ignore request for install if package would be new + if (_config->FindB("APT::Get::Only-Upgrade", false) == true && + Pkg->CurrentVer == 0) + { + if (AllowFail == true) + ioprintf(c1out,_("Skipping %s, it is not installed and only upgrades are requested.\n"), + Pkg.Name()); + return true; + } + // Check if there is something at all to install pkgDepCache::StateCache &State = Cache[Pkg]; if (Remove == true && Pkg->CurrentVer == 0) @@ -1790,6 +1800,7 @@ bool DoInstall(CommandLine &CmdL) Cache[Pkg].Install() == false && (Cache[Pkg].Flags & pkgCache::Flag::Auto) && _config->FindB("APT::Get::ReInstall",false) == false && + _config->FindB("APT::Get::Only-Upgrade",false) == false && _config->FindB("APT::Get::Download-Only",false) == false) { ioprintf(c1out,_("%s set to manually installed.\n"), @@ -2299,6 +2310,7 @@ bool DoSource(CommandLine &CmdL) { for (unsigned I = 0; I != J; I++) ioprintf(cout,_("Fetch source %s\n"),Dsc[I].Package.c_str()); + delete[] Dsc; return true; } @@ -2309,6 +2321,7 @@ bool DoSource(CommandLine &CmdL) for (; I != Fetcher.UriEnd(); I++) cout << '\'' << I->URI << "' " << flNotDir(I->Owner->DestFile) << ' ' << I->Owner->FileSize << ' ' << I->Owner->HashSum() << endl; + delete[] Dsc; return true; } @@ -2334,6 +2347,7 @@ bool DoSource(CommandLine &CmdL) if (_config->FindB("APT::Get::Download-only",false) == true) { c1out << _("Download complete and in download only mode") << endl; + delete[] Dsc; return true; } @@ -2395,7 +2409,8 @@ bool DoSource(CommandLine &CmdL) _exit(0); } - + delete[] Dsc; + // Wait for the subprocess int Status = 0; while (waitpid(Process,&Status,0) != Process) @@ -2831,6 +2846,7 @@ int main(int argc,const char *argv[]) /*{{{*/ {0,"fix-missing","APT::Get::Fix-Missing",0}, {0,"ignore-hold","APT::Ignore-Hold",0}, {0,"upgrade","APT::Get::upgrade",0}, + {0,"only-upgrade","APT::Get::Only-Upgrade",0}, {0,"force-yes","APT::Get::force-yes",0}, {0,"print-uris","APT::Get::Print-URIs",0}, {0,"diff-only","APT::Get::Diff-Only",0}, diff --git a/cmdline/apt-mark b/cmdline/apt-mark index 2326ece38..18552177c 100755 --- a/cmdline/apt-mark +++ b/cmdline/apt-mark @@ -19,10 +19,10 @@ def show_automatic(filename): if not os.path.exists(STATE_FILE): return auto = set() - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) - while tagfile.Step(): - pkgname = tagfile.Section.get("Package") - autoInst = tagfile.Section.get("Auto-Installed") + tagfile = apt_pkg.TagFile(open(STATE_FILE)) + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if int(autoInst): auto.add(pkgname) print "\n".join(sorted(auto)) @@ -33,24 +33,24 @@ def mark_unmark_automatic(filename, action, pkgs): # open the statefile if os.path.exists(STATE_FILE): try: - tagfile = apt_pkg.ParseTagFile(open(STATE_FILE)) + tagfile = apt_pkg.TagFile(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") + for section in tagfile: + pkgname = section.get("Package") + autoInst = section.get("Auto-Installed") if pkgname in pkgs: if options.verbose: print "changing %s to %s" % (pkgname,action) - newsec = apt_pkg.RewriteSection(tagfile.Section, + newsec = apt_pkg.rewrite_section(section, [], [ ("Auto-Installed",str(action)) ]) pkgs.remove(pkgname) outfile.write(newsec+"\n") else: - outfile.write(str(tagfile.Section)+"\n") + outfile.write(str(section)+"\n") if action == 1: for pkgname in pkgs: if options.verbose: @@ -76,9 +76,13 @@ if __name__ == "__main__": help="print verbose status messages to stdout") (options, args) = parser.parse_args() + if not args: + parser.print_help() + sys.exit(1) + # get the state-file if not options.filename: - STATE_FILE = apt_pkg.Config.FindDir("Dir::State") + "extended_states" + STATE_FILE = apt_pkg.config.find_dir("Dir::State") + "extended_states" else: STATE_FILE=options.filename diff --git a/debian/apt.logrotate b/debian/apt.logrotate index 3e924d383..9a6e5d155 100644 --- a/debian/apt.logrotate +++ b/debian/apt.logrotate @@ -1,5 +1,13 @@ /var/log/apt/term.log { - rotate 6 + rotate 12 + monthly + compress + missingok + notifempty +} + +/var/log/apt/history.log { + rotate 12 monthly compress missingok diff --git a/debian/changelog b/debian/changelog index 8a4e2ac20..595285dbf 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,17 +1,78 @@ apt (0.7.26) UNRELEASED; urgency=low + [ Christian Perrier ] + * German translation update. Closes: #571037 + * Spanish manpages translation update. Closes: #573293 + [ David Kalnischkies ] - * [BREAK] add possibility to download and use multiply - Translation files, configurable with Acquire::Translation - (Closes: #444222, #448216, #550564) * [BREAK] merge MultiArch-ABI. We don't support MultiArch, but we support the usage of the new ABI so libapt users can start to prepare for MultiArch (Closes: #536029) * Ignore :qualifiers after package name in build dependencies in the library by default, but try to honour them in apt-get as we have some sort of MultiArch support ready (Closes: #558103) + * Switch to dpkg-source 3.0 (native) format + * apt-pkg/depcache.cc: + - remove Auto-Installed information from extended_states + together with the package itself (Closes: #572364) + * cmdline/apt-mark: + - don't crash if no arguments are given (Closes: #570962) + * debian/control: + - remove some years old and obsolete Replaces + - add automake/conf build-depends/conflicts as recommend by + the autotools-dev README (Closes: #572615) + * apt-pkg/contrib/mmap.{h,cc}: + - add char[] fallback for filesystems without shared writable + mmap() like JFFS2. Thanks to Marius Vollmer for writing + and to Loïc Minier for pointing to the patch! (Closes: #314334) + * doc/apt_preferences.5.xml: + - fix two typos and be more verbose in the novice warning. + Thanks to Osamu Aoki for pointing it out! (Closes: #567669) + * apt-pkg/deb/dpkgpm.cc: + - fix error message construction in OpenLog() + - if available store the Commandline in the history + * cmdline/apt-get.cc: + - add a --only-upgrade flag to install command (Closes: #572259) + - fix memory leaks in error conditions in DoSource() + * apt-pkg/contrib/cmndline.cc: + - save Commandline in Commandline::AsString for logging + * apt-pkg/deb/debversion.cc: + - consider absent of debian revision equivalent to 0 (Closes: #573592) + * doc/makefile, doc/*: + - generate subdirectories for building the manpages in on the fly + depending on the po files we have. + * apt-pkg/pkgcachegen.cc: + - merge versions correctly even if multiple different versions + with the same version number are available. + Thanks to Magnus Holmgren for the patch! (Closes: #351056) + + [ Julian Andres Klode ] + * cmdline/apt-mark: + - Use the new python-apt API (and conflict with python-apt << 0.7.93.2). + * apt-inst/contrib/arfile.h: + - Add public ARArchive::Members() which returns the list of members. + * debian/rules: + - Fix the libraries name to be e.g. libapt-pkg4.9 instead of + libapt-pkg-4.9. + + -- David Kalnischkies <kalnischkies@gmail.com> Sun, 14 Mar 2010 16:47:07 +0100 + +apt (0.7.26~exp2) experimental; urgency=low + + * fix crash when LANGUAGE is not set + + -- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 22:07:23 +0100 + +apt (0.7.26~exp1) experimental; urgency=low + + [ David Kalnischkies ] + * [BREAK] add possibility to download and use multiply + Translation files, configurable with Acquire::Translation + (Closes: #444222, #448216, #550564) + * Ignore :qualifiers after package name in build dependencies + for now as long we don't understand them (Closes: #558103) * apt-pkg/contrib/mmap.{cc,h}: - - extend it to have a growable flag - unused now but maybe… + - extend it to have a growable flag - unused now but maybe... * apt-pkg/pkgcache.h: - use long instead of short for {Ver,Desc}File size, patch from Víctor Manuel Jáquez Leal, thanks! (Closes: #538917) @@ -36,11 +97,35 @@ apt (0.7.26) UNRELEASED; urgency=low - update with no changes to debian policy 3.8.4 * doc/apt_preferences.5.xml: - explicitly warn against careless use (Closes: #567669) + * debian/rules: + - remove creation of empty dir /usr/share/apt + * doc/apt-cdrom.8.xml: + - fix typo spotted by lintian: proc(c)eed [ Ivan Masár ] * Slovak translation update. Closes: #568294 - - -- David Kalnischkies <kalnischkies@gmail.com> Sat, 13 Feb 2010 01:42:50 +0100 + + [ Michael Vogt ] + * [BREAK] merged lp:~mvo/apt/history + - this writes a /var/log/apt/history tagfile that contains details + from the transaction (complements term.log) + * methods/http.cc: + - add cache-control headers even if no cache is given to allow + adding options for intercepting proxies + - add Acquire::http::ProxyAutoDetect configuration that + can be used to call a external helper to figure out the + proxy configuration and return it to apt via stdout + (this is a step towards WPAD and zeroconf/avahi support) + * abicheck/ + - add new abitest tester using the ABI Compliance Checker from + http://ispras.linuxfoundation.org/index.php/ABI_compliance_checker + + [ Robert Collins ] + * Change the package index Info methods to allow apt-cache policy to be + useful when using several different archives on the same host. + (Closes: #329814, LP: #22354) + + -- Michael Vogt <mvo@debian.org> Thu, 18 Feb 2010 16:11:39 +0100 apt (0.7.25.3) unstable; urgency=low @@ -49,7 +134,7 @@ apt (0.7.25.3) unstable; urgency=low [ David Kalnischkies ] * apt-pkg/contrib/macros.h: - - install the header system.h with a new name to be able to use + - install the header system.h with a new name to be able to use it in other headers (Closes: #567662) * cmdline/acqprogress.cc: - Set Mode to Medium so that the correct prefix is used. @@ -58,7 +143,7 @@ apt (0.7.25.3) unstable; urgency=low - generate sha1 and sha256 checksums for dsc (Closes: #567343) * cmdline/apt-get.cc: - don't mark as manually if in download only (Closes: #468180) - + -- Michael Vogt <mvo@debian.org> Mon, 01 Feb 2010 18:41:15 +0100 apt (0.7.25.2) unstable; urgency=low @@ -82,7 +167,7 @@ apt (0.7.25.2) unstable; urgency=low packages that are not in the extended_states file yet (closes: #534920) * ftparchive/writer.{cc,h}: - - merge crash fix for apt-ftparchive on hurd, thanks to + - merge crash fix for apt-ftparchive on hurd, thanks to Samuel Thibault for the patch (closes: #566664) [ David Kalnischkies ] @@ -121,7 +206,7 @@ apt (0.7.25.1) unstable; urgency=low * French manpage translation update * Russian translation update by Yuri Kozlov Closes: #564171 - + [Chris Leick] * spot & fix various typos in all manpages * German manpage translation update @@ -1370,13 +1455,6 @@ apt (0.7.6) unstable; urgency=low -- Otavio Salvador <otavio@debian.org> Wed, 01 Aug 2007 19:49:51 -0300 -apt (0.7.6) unstable; urgency=low - - * Applied patch from Aurelien Jarno <aurel32@debian.org> to fix wrong - directory downloading on non-linux architectures (closes: #435597) - - -- Otavio Salvador <otavio@debian.org> Wed, 01 Aug 2007 19:49:51 -0300 - apt (0.7.5) unstable; urgency=low [ Otavio Salvador ] diff --git a/debian/control b/debian/control index de2bf6544..b7c3e5712 100644 --- a/debian/control +++ b/debian/control @@ -6,14 +6,15 @@ 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.4 -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 +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, autoconf, automake +Build-Conflicts: autoconf2.13, automake1.4 Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} -Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} +Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. @@ -27,7 +28,6 @@ Package: apt-doc Architecture: all Priority: optional Depends: ${misc:Depends} -Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT This package contains the user guide and offline guide, for APT, an @@ -56,7 +56,6 @@ Package: apt-utils Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} -Replaces: apt (<< 0.5.9) Description: APT utility programs This package contains some APT utility programs such as apt-ftparchive, apt-sortpkgs and apt-extracttemplates. diff --git a/debian/rules b/debian/rules index 37c96ef20..2fe6ed69c 100755 --- a/debian/rules +++ b/debian/rules @@ -78,21 +78,21 @@ APT_UTILS=ftparchive sortpkgs extracttemplates include buildlib/libversion.mak # Determine which package we should provide in the control files -LIBAPTPKG_PROVIDE=libapt-pkg$(LIBEXT)-$(LIBAPTPKG_MAJOR) -LIBAPTINST_PROVIDE=libapt-inst$(LIBEXT)-$(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$(LIBEXT) $(LIBAPTPKG_MAJOR)" > $@.apt + echo "libapt-pkg $(LIBAPTPKG_MAJOR)" > $@.apt - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils - echo "libapt-inst$(LIBEXT) $(LIBAPTINST_MAJOR)" >> $@.apt-utils + echo "libapt-pkg $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@.apt-utils + echo "libapt-inst $(LIBAPTINST_MAJOR)" >> $@.apt-utils - echo "libapt-pkg$(LIBEXT) $(LIBAPTPKG_MAJOR) $(LIBAPTPKG_PROVIDE)" > $@ - echo "libapt-inst$(LIBEXT) $(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 @@ -190,7 +190,7 @@ apt: build build-doc debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ dh_clean -p$@ -k - dh_installdirs -p$@ /usr/share/bug/$@ /usr/share/$@ + dh_installdirs -p$@ # # apt install # diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 000000000..89ae9db8f --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (native) diff --git a/doc/apt-cdrom.8.xml b/doc/apt-cdrom.8.xml index e57942610..423569fc1 100644 --- a/doc/apt-cdrom.8.xml +++ b/doc/apt-cdrom.8.xml @@ -65,7 +65,7 @@ <varlistentry><term>add</term> <listitem><para><literal>add</literal> is used to add a new disc to the source list. It will unmount the - CDROM device, prompt for a disk to be inserted and then procceed to + CDROM device, prompt for a disk to be inserted and then proceed to scan it and copy the index files. If the disc does not have a proper <filename>disk</filename> directory you will be prompted for a descriptive title. diff --git a/doc/apt-get.8.xml b/doc/apt-get.8.xml index 3d22f262c..4f8c80169 100644 --- a/doc/apt-get.8.xml +++ b/doc/apt-get.8.xml @@ -444,6 +444,13 @@ Configuration Item: <literal>APT::Get::Upgrade</literal>.</para></listitem> </varlistentry> + <varlistentry><term><option>--only-upgrade</option></term> + <listitem><para>Do not install new packages; When used in conjunction with <literal>install</literal>, + <literal>only-upgrade</literal> will prevent packages on the command line + from being upgraded if they are not already installed. + Configuration Item: <literal>APT::Get::Only-Upgrade</literal>.</para></listitem> + </varlistentry> + <varlistentry><term><option>--force-yes</option></term> <listitem><para>Force yes; This is a dangerous option that will cause apt to continue without prompting if it is doing something potentially harmful. It diff --git a/doc/apt_preferences.5.xml b/doc/apt_preferences.5.xml index 3d7896226..e773ad144 100644 --- a/doc/apt_preferences.5.xml +++ b/doc/apt_preferences.5.xml @@ -59,6 +59,9 @@ APT will not questioning the preferences so wrong settings will therefore lead to uninstallable packages or wrong decisions while upgrading packages. Even more problems will arise if multiply distribution releases are mixed without a good understanding of the following paragraphs. +Packages included in a specific release aren't tested in and +therefore doesn't always work as expected in older or newer releases or +together with other packages from different releases. You have been warned.</para> <para>Note that the files in the <filename>/etc/apt/preferences.d</filename> diff --git a/doc/es/makefile b/doc/es/makefile deleted file mode 100644 index 0b5b52222..000000000 --- a/doc/es/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/es - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=es - -include $(PO4A_MANPAGE_H) diff --git a/doc/examples/configure-index b/doc/examples/configure-index index 0b30a50a9..f07302efd 100644 --- a/doc/examples/configure-index +++ b/doc/examples/configure-index @@ -338,6 +338,14 @@ Dir "/" // Location of the logfile Log "var/log/apt" { Terminal "term.log"; + History "history.log"; + }; + + // Media + Media + { + // Media AutoDetect mount path + MountPath "/media/apt"; }; // Media diff --git a/doc/fr/makefile b/doc/fr/makefile deleted file mode 100644 index 214534736..000000000 --- a/doc/fr/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/fr - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=fr - -include $(PO4A_MANPAGE_H) diff --git a/doc/it/makefile b/doc/it/makefile deleted file mode 100644 index 2179ec15f..000000000 --- a/doc/it/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- 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) diff --git a/doc/ja/makefile b/doc/ja/makefile deleted file mode 100644 index f44bb1c0f..000000000 --- a/doc/ja/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/ja - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=ja - -include $(PO4A_MANPAGE_H) diff --git a/doc/de/makefile b/doc/lang.makefile index a827a0f24..9fdc6ea70 100644 --- a/doc/de/makefile +++ b/doc/lang.makefile @@ -1,11 +1,11 @@ # -*- make -*- BASE=../.. -SUBDIR=doc/de +SUBDIR=doc/@@LANG@@ # Bring in the default rules include ../../buildlib/defaults.mak # Language Code of this translation -LC=de +LC=@@LANG@@ include $(PO4A_MANPAGE_H) diff --git a/doc/makefile b/doc/makefile index 6e6186466..93504e23e 100644 --- a/doc/makefile +++ b/doc/makefile @@ -46,9 +46,14 @@ TO = $(DOC) TARGET = binary include $(COPY_H) -#.PHONY: headers library clean veryclean all binary program doc doc.pt_BR doc.fr +.PHONY: clean clean-subdirs veryclean veryclean-subdirs all binary doc doc: - for dir in $(SUBDIRS); do\ + for i in $(shell ls po/*.po | sed -r 's#po/([a-z]+[A-Z_]*).po#\1#'); do \ + test -d $$i || mkdir $$i; \ + test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + done + # it is likely that we have changed the list, so SUBDIRS is incorrect + for dir in $(dir $(wildcard */makefile)); do\ $(MAKE) -C $$dir $@; \ done @@ -70,7 +75,7 @@ doc: po4a clean: po4a-clean -.PHONY: update-po po4a +.PHONY: update-po po4a stats update-po: po4a --previous --no-backups --force --no-translations po4a.conf @@ -79,6 +84,10 @@ po4a-clean: po4a: po4a --previous --no-backups po4a.conf + +stats: + for i in po/*.po; do echo -n "$$i: "; msgfmt --statistics $$i; done + endif ifdef DOXYGEN diff --git a/doc/pl/makefile b/doc/pl/makefile deleted file mode 100644 index 7e77b29b9..000000000 --- a/doc/pl/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/pl - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=pl - -include $(PO4A_MANPAGE_H) diff --git a/doc/po/apt-doc.pot b/doc/po/apt-doc.pot index 40ed1f589..ea6f2c6fb 100644 --- a/doc/po/apt-doc.pot +++ b/doc/po/apt-doc.pot @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -894,7 +894,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 +#: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 sources.list.5.xml:33 msgid "Description" msgstr "" @@ -1284,7 +1284,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 +#: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1307,7 +1307,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 apt-sortpkgs.1.xml:58 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1327,12 +1327,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1381,7 +1381,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1477,12 +1477,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 apt-sortpkgs.1.xml:64 +#: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "" @@ -1492,7 +1492,7 @@ msgid "&file-sourceslist; &file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 sources.list.5.xml:233 +#: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1502,7 +1502,7 @@ msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 +#: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1566,7 +1566,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1606,7 +1606,7 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1750,7 +1750,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1801,7 +1801,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 apt-sortpkgs.1.xml:70 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1862,7 +1862,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "" @@ -1910,7 +1910,8 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> " -"<arg><option>--contents</option></arg> <arg><option>-o " +"<arg><option>--contents</option></arg> <arg><option>--arch " +"<replaceable>architecture</replaceable></option></arg> <arg><option>-o " "<replaceable>config</replaceable>=<replaceable>string</replaceable></option></arg> " "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " "choice=\"req\"> <arg>packages<arg choice=\"plain\" " @@ -1929,7 +1930,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1938,7 +1939,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the " @@ -1948,7 +1949,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1958,12 +1959,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -1972,17 +1973,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1991,7 +1992,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -1999,12 +2000,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it for " @@ -2015,12 +2016,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2030,7 +2031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under " @@ -2044,12 +2045,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2059,24 +2060,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2087,17 +2088,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2106,12 +2107,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2119,44 +2120,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the " "<literal>FileList</literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2164,12 +2165,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2178,60 +2179,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section " @@ -2239,24 +2240,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2264,12 +2265,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each " "day. The contents files are round-robined so that over several days they " @@ -2277,12 +2278,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is " @@ -2293,60 +2294,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to " "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to " "<filename>$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to " "<filename>$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to " "<filename>$(DIST)/$(SECTION)/source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to " @@ -2354,12 +2355,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to " "<filename>$(DIST)/Contents-$(ARCH)</filename>. If this setting causes " @@ -2369,34 +2370,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, " "<command>apt-ftparchive</command> should read the list of files from the " @@ -2404,12 +2405,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, " "<command>apt-ftparchive</command> should read the list of files from the " @@ -2418,12 +2419,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2433,7 +2434,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2442,7 +2443,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2450,7 +2451,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2460,7 +2461,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section " "<command>apt-ftparchive</command> performs an operation similar to: " @@ -2468,12 +2469,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib " @@ -2481,12 +2482,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2494,56 +2495,56 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2553,64 +2554,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2620,19 +2621,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder " "type=\"literallayout\" id=\"0\"/> or simply, <placeholder " @@ -2643,12 +2644,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2656,12 +2657,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2669,12 +2670,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2682,19 +2683,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2703,12 +2704,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2717,12 +2718,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2732,12 +2733,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: " @@ -2745,26 +2746,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: " "<literal>APT::FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2776,12 +2791,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2791,12 +2806,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 sources.list.5.xml:193 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "" "<command>apt-ftparchive</command> packages " @@ -2805,14 +2820,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3435,12 +3450,26 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 -msgid "<option>--force-yes</option>" +msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 msgid "" +"Do not install new packages; When used in conjunction with " +"<literal>install</literal>, <literal>only-upgrade</literal> will prevent " +"packages on the command line from being upgraded if they are not already " +"installed. Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " "not be used except in very special situations. Using " @@ -3449,12 +3478,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3467,12 +3496,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be " @@ -3482,24 +3511,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3510,17 +3539,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3535,12 +3564,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where " @@ -3550,24 +3579,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or " "<literal>remove</literal>, then this option acts like running " @@ -3576,12 +3605,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and " "<literal>build-dep</literal> commands. Indicates that the given source " @@ -3593,22 +3622,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, " @@ -3617,24 +3646,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: " @@ -3642,14 +3671,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, " @@ -3657,29 +3686,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "" @@ -5875,7 +5904,7 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5923,6 +5952,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or " @@ -5932,12 +5975,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, no-wrap msgid "" "<command>apt-get install -t testing " @@ -5945,13 +5988,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5968,39 +6011,39 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:112 msgid "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -6008,7 +6051,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -6016,14 +6059,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -6033,19 +6076,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the " @@ -6053,7 +6096,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -6064,7 +6107,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -6074,7 +6117,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6086,12 +6129,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6100,7 +6143,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6110,7 +6153,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@ -6119,7 +6162,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6129,7 +6172,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6137,7 +6180,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@ -6146,7 +6189,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6156,7 +6199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is " @@ -6164,7 +6207,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@ -6173,7 +6216,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is " @@ -6181,7 +6224,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@ -6190,7 +6233,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6198,7 +6241,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@ -6207,82 +6250,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6290,7 +6333,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6299,14 +6342,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@ -6323,12 +6366,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6338,7 +6381,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6346,7 +6389,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an " @@ -6355,12 +6398,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6368,27 +6411,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/<replaceable>component</replaceable>/<replaceable>arch</replaceable></filename>: " @@ -6400,12 +6443,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6416,18 +6459,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6438,13 +6481,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6455,7 +6498,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6464,12 +6507,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6481,18 +6524,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6501,18 +6544,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is " @@ -6521,13 +6564,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6541,7 +6584,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6556,12 +6599,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6569,7 +6612,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6578,12 +6621,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6598,7 +6641,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6608,7 +6651,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6617,7 +6660,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6626,13 +6669,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6641,12 +6684,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@ -6663,7 +6706,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6674,7 +6717,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6683,13 +6726,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6701,12 +6744,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package " @@ -6728,7 +6771,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6743,7 +6786,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6752,13 +6795,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6770,12 +6813,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/de.po b/doc/po/de.po index f9d374a6d..19026bf3e 100644 --- a/doc/po/de.po +++ b/doc/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-doc 0.7.24\n" "Report-Msgid-Bugs-To: APT Development Team <deity@lists.debian.org>\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2009-12-31 17:41+GMT\n" "Last-Translator: Chris Leick <c.leick@vollbio.de>\n" "Language-Team: German <debian-l10n-german@lists.debian.org>\n" @@ -1217,7 +1217,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1750,7 +1750,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "Optionen" @@ -1778,7 +1778,7 @@ msgstr "" "pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1806,12 +1806,12 @@ msgstr "" "srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1870,7 +1870,7 @@ msgstr "" "Konfigurationselement: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1987,14 +1987,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "Dateien" @@ -2005,9 +2005,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 msgid "See Also" msgstr "Siehe auch" @@ -2019,7 +2019,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnose" @@ -2099,9 +2099,16 @@ msgstr "add" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2154,7 +2161,7 @@ msgid "Options" msgstr "Optionen" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2330,7 +2337,7 @@ msgstr "" "Anwendungen zu benutzen ist." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -2397,7 +2404,7 @@ msgid "Just show the contents of the configuration space." msgstr "Nur der Inhalt des Konfigurationsbereichs wird angezeigt." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2477,7 +2484,7 @@ msgstr "" "angegeben wurde" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2528,10 +2535,32 @@ msgstr "Hilfsprogramm zum Generieren von Indexdateien" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o <replaceable>config</" +#| "replaceable>=<replaceable>string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2568,7 +2597,7 @@ msgstr "" "arg></group>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2581,7 +2610,7 @@ msgstr "" "Inhalts dieser Stelle generiert werden." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2595,7 +2624,7 @@ msgstr "" "für ein komplettes Archiv zu »skripten«." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2611,12 +2640,12 @@ msgstr "" "Ausgabedateien erzeugt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "packages" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2629,7 +2658,7 @@ msgstr "" "Befehl entspricht etwa &dpkg-scanpackages;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" @@ -2637,12 +2666,12 @@ msgstr "" "Zwischenspeichern von Programmen anzugeben." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "sources" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2655,7 +2684,7 @@ msgstr "" "stdout ausgibt. Dieser Befehl entspricht etwa &dpkg-scansources;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2666,12 +2695,12 @@ msgstr "" "benutzt werden, um die Quellen-Override-Datei, die benutzt wird, zu ändern." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "contents" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2689,12 +2718,12 @@ msgstr "" "getrennt in der Ausgabe." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2709,7 +2738,7 @@ msgstr "" "stdout, die einen MD5- und SHA1-Hash für jede Datei enthält." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2729,12 +2758,12 @@ msgstr "" "<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "generate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2750,12 +2779,12 @@ msgstr "" "Verwaltung der erforderlichen Einstellungen bereitstellt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." @@ -2765,12 +2794,12 @@ msgstr "" "Datensätze entfernt." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "Die Generate-Konfiguration" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2788,7 +2817,7 @@ msgstr "" "wenn die Markierung »scope« behandelt wird." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" @@ -2796,12 +2825,12 @@ msgstr "" "unterhalb beschrieben" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "Dir-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2815,12 +2844,12 @@ msgstr "" "absoluten Pfad zu bilden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "ArchiveDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2831,32 +2860,32 @@ msgstr "" "enthält." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "OverrideDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "Gibt den Ort der Override-Dateien an" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "CacheDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "Gibt den Ort der Zwischenspeicherdateien an" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "FileListDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." @@ -2865,12 +2894,12 @@ msgstr "" "unterhalb gesetzt ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "Vorgabe-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2881,12 +2910,12 @@ msgstr "" "können diese Vorgaben mit einer Einstellung pro Abschnitt überschreiben." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2899,12 +2928,12 @@ msgstr "" "»gzip« und »bzip2«. Die Vorgabe für alle Kompressionsschemata ist ». gzip«." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "Packages::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." @@ -2913,12 +2942,12 @@ msgstr "" "Vorgabe ist ».deb«." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "Sources::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." @@ -2927,12 +2956,12 @@ msgstr "" "Kompression der Quelldateien steuert." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "Sources::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." @@ -2941,12 +2970,12 @@ msgstr "" "Vorgabe ist ».dsc«." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "Contents::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." @@ -2955,12 +2984,12 @@ msgstr "" "Kompression der Inhaltsdateien steuert." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "DeLinkLimit" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2971,12 +3000,12 @@ msgstr "" "<literal>External-Links</literal>-Einstellung pro Abschnitt benutzt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "FileMode" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." @@ -2985,12 +3014,12 @@ msgstr "" "Indexdateien werden ohne Beachtung von umask auf diese Rechte gesetzt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "TreeDefault-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -3001,12 +3030,12 @@ msgstr "" "$(SECTION) und $(ARCH) durch ihre jeweiligen Werte ersetzt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "MaxContentsChange" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -3017,12 +3046,12 @@ msgstr "" "Tage alle neu gebildet werden." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "ContentsAge" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -3040,12 +3069,12 @@ msgstr "" "eine neue Datei benötigen. Die Vorgabe ist 10, die Einheiten sind Tage." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" @@ -3054,12 +3083,12 @@ msgstr "" "$(SECTION)/binary-$(ARCH)/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "SrcDirectory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" @@ -3068,12 +3097,12 @@ msgstr "" "$(DIST)/$(SECTION)/source/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "Packages" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" @@ -3082,12 +3111,12 @@ msgstr "" "binary-$(ARCH)/Packages</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 #, fuzzy #| msgid "" #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" @@ -3100,12 +3129,12 @@ msgstr "" "source/Sources</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "InternalPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -3116,12 +3145,12 @@ msgstr "" "<filename>$(DIST)/$(SECTION)/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "Contents" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -3135,22 +3164,22 @@ msgstr "" "automatisch integrieren." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "Contents::Header" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "Setzt die Kopfdatendatei, um sie der Inhaltsausgabe voranzustellen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "BinCacheDB" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." @@ -3159,12 +3188,12 @@ msgstr "" "Abschnitt. Mehrere Abschnitte können sich die gleiche Datenbank teilen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "FileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3175,12 +3204,12 @@ msgstr "" "Relativen Dateinamen wird das Archivverzeichnis vorangestellt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3193,12 +3222,12 @@ msgstr "" "benutzt, wenn Quellindizes verarbeitet werden." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "Tree-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3213,7 +3242,7 @@ msgstr "" "<literal>Directory</literal>-Ersetzungsvariable definiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3227,7 +3256,7 @@ msgstr "" "filename>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3238,7 +3267,7 @@ msgstr "" "Variablen benutzt werden." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, fuzzy, no-wrap #| msgid "" #| "for i in Sections do \n" @@ -3255,7 +3284,7 @@ msgstr "" " Generiere for DIST=Geltungsbereich SECTION=i ARCH=j\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 #, fuzzy #| msgid "" #| "When processing a <literal>Tree</literal> section <command>apt-" @@ -3269,12 +3298,12 @@ msgstr "" "<command>apt-ftparchive</command> eine Operation aus, die folgender ähnelt:" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "Abschnitte" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3285,12 +3314,12 @@ msgstr "" "non-free</literal>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "Architekturen" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3301,12 +3330,12 @@ msgstr "" "benutzt, um anzugeben, dass dieser Baum ein Quellarchiv besitzt." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "BinOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." @@ -3315,12 +3344,12 @@ msgstr "" "Priorität und Adressinformationen des Betreuers." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "SrcOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." @@ -3329,32 +3358,32 @@ msgstr "" "Abschnittsinformationen." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "ExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "Setzt die zusätzliche Programm-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "SrcExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "Setzt die zusätzliche Quell-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "BinDirectory-Abschnitt" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3369,12 +3398,12 @@ msgstr "" "<literal>Abschnitt</literal><literal>Architektur</literal> ähnlich." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "Setzt die Packages-Dateiausgabe." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." @@ -3383,52 +3412,52 @@ msgstr "" "<literal>Sources</literal> ist erforderlich." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "Setzt die Contents-Dateiausgabe. (optional)" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "Setzt die Programm-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "Setzt die Quell-Override-Datei." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "Setzt die Zwischenspeicherdatenbank." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "PathPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "Hängt einen Pfad an alle Ausgabepfade an." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "FileList, SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "Gibt die Dateilistendatei an." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "Die Programm-Override-Datei " #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3443,19 +3472,19 @@ msgstr "" "und das letzte Feld ist das Betreuerumsetzungsfeld." #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "alt [// oldn]* => neu" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "neu" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3472,12 +3501,12 @@ msgstr "" "bedingungslos." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "Die Quell-Override-Datei" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3488,12 +3517,12 @@ msgstr "" "Quellpaketname, das zweite ist der Abschnitt, dem er zugeordnet ist." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "Die zusätzlich Override-Datei" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3505,12 +3534,12 @@ msgstr "" "ist der neue Wert." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "<option>--md5</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3521,12 +3550,12 @@ msgstr "" "ist. Konfigurationselement: <literal>APT::FTPArchive::MD5</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3536,7 +3565,7 @@ msgstr "" "DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3550,12 +3579,12 @@ msgstr "" "Konfigurationselement: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3569,12 +3598,12 @@ msgstr "" "DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3590,12 +3619,12 @@ msgstr "" "Konfigurationselement: <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3606,12 +3635,12 @@ msgstr "" "SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3620,16 +3649,43 @@ msgstr "" "<literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Wenn der Befehl entweder <literal>install</literal> oder <literal>remove</" +"literal> lautet, dann bewirkt diese Option wie das Ausführen des " +"<literal>autoremove</literal>-Befehls das Entfernen der nicht benutzten " +"Abhhängigkeitspakete. Konfigurationselement: <literal>APT::Get::" +"AutomaticRemove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy #| msgid "<option>APT::FTPArchive::LongDescription</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3641,12 +3697,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3661,19 +3717,19 @@ msgstr "" "Dateien mit <command>apt-ftparchive</command> zu erstellen." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 msgid "Examples" msgstr "Beispiele" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> Pakete <replaceable>Verzeichnis</replaceable> | <command>gzip</command> > <filename>Pakete.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3683,7 +3739,7 @@ msgstr "" ">" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4566,11 +4622,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 +#, fuzzy +#| msgid "<option>--no-upgrade</option>" +msgid "<option>--only-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "" +#| "Do not upgrade packages; When used in conjunction with <literal>install</" +#| "literal>, <literal>no-upgrade</literal> will prevent packages on the " +#| "command line from being upgraded if they are already installed. " +#| "Configuration Item: <literal>APT::Get::Upgrade</literal>." +msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" +"Kein Upgrade von Paketen durchführen; Wenn es zusammen mit <literal>install</" +"literal> benutzt wird, wird <literal>no-upgrade</literal> auf der " +"Befehlszeile ein Upgrade von Paketen verhindern, wenn sie bereits " +"installiert sind. Konfigurationselement: <literal>APT::Get::Upgrade</" +"literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:448 +#: apt-get.8.xml:455 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4585,12 +4668,12 @@ msgstr "" "zerstören! Konfigurationselement: <literal>APT::Get::force-yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4612,12 +4695,12 @@ msgstr "" "Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 #, fuzzy #| msgid "" #| "Use purge instead of remove for anything that would be removed. An " @@ -4637,12 +4720,12 @@ msgstr "" "option>. Konfigurationselement: <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4651,12 +4734,12 @@ msgstr "" "Version sind. Konfigurationselement: <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4674,17 +4757,17 @@ msgstr "" "Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4709,12 +4792,12 @@ msgstr "" "auch die &apt-preferences;-Handbuchseite." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4728,12 +4811,12 @@ msgstr "" "Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4742,12 +4825,12 @@ msgstr "" "Nachfrage ab. Konfigurationselement: <literal>APT::Get::Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4761,12 +4844,12 @@ msgstr "" "AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4785,22 +4868,22 @@ msgstr "" "Get::Only-Source</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4812,12 +4895,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4826,12 +4909,12 @@ msgstr "" "Konfigurationselement: <literal>APT::Get::Arch-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4842,7 +4925,7 @@ msgstr "" "<literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4851,7 +4934,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4862,7 +4945,7 @@ msgstr "" "preferences;, das APT-Howto." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4871,22 +4954,22 @@ msgstr "" "100 bei Fehlern." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "ORIGINALAUTOREN" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "AKTUELLE AUTOREN" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -7930,7 +8013,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "&apt-author.team; &apt-email; &apt-product; <date>04. Mai 2009</date>" #. type: Content of: <refentry><refnamediv><refname> @@ -7997,6 +8083,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -8006,24 +8106,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "APTs Standardprioritätszuweisungen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>irgendein_Paket</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8051,22 +8151,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "Priorität 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "zu der Version, die bereits installiert ist (wenn vorhanden)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "Priorität 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8075,19 +8175,19 @@ msgstr "" "gehören." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "Priorität 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:112 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" "zu den Versionen, die nicht installiert sind und zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8098,7 +8198,7 @@ msgstr "" "Zuweisung: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8109,7 +8209,7 @@ msgstr "" "installierten Paketversionen eine Priorität von 500 zu." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8119,7 +8219,7 @@ msgstr "" "ist." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8135,12 +8235,12 @@ msgstr "" "Downgrading eines Paketes riskant sein kann.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "Die Version mit der höchsten Priorität installieren." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8149,7 +8249,7 @@ msgstr "" "aktuellste installiert (das ist die mit der höheren Versionsnummer)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8161,7 +8261,7 @@ msgstr "" "installierte installiert." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8177,7 +8277,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8191,7 +8291,7 @@ msgstr "" "upgrade</command> ausgeführt wird." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8211,12 +8311,12 @@ msgstr "" "hat." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "Die Auswirkungen von APT-Einstellungen" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8230,7 +8330,7 @@ msgstr "" "allgemeine Gestalt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8246,7 +8346,7 @@ msgstr "" "können durch Leerzeichen getrennt werden." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@ -8258,7 +8358,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8273,7 +8373,7 @@ msgstr "" "ausgebildeten Domänennamen identifiziert wird, eine Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8284,7 +8384,7 @@ msgstr "" "Paketversionen eine hohe Priorität zu, die lokal liegen." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@ -8296,7 +8396,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8312,7 +8412,7 @@ msgstr "" "wie »Debian« oder »Ximian«." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8323,7 +8423,7 @@ msgstr "" "Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@ -8335,7 +8435,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8346,7 +8446,7 @@ msgstr "" "zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@ -8358,7 +8458,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8369,7 +8469,7 @@ msgstr "" "Nummer »<literal>3.0</literal>« ist, eine hohe Priorität zu." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@ -8381,17 +8481,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "Wie APT Prioritäten interpretiert" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8400,12 +8500,12 @@ msgstr "" "des Pakets durchführt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8414,12 +8514,12 @@ msgstr "" "Ziel-Release kommt, außer wenn die installierte Version aktueller ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8429,12 +8529,12 @@ msgstr "" "neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8444,12 +8544,12 @@ msgstr "" "installierte Version neuer ist" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8458,17 +8558,17 @@ msgstr "" "installierte Version des Pakets gibt" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "verhindert das Installieren der Version" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8479,7 +8579,7 @@ msgstr "" "(grob gesagt): <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8493,7 +8593,7 @@ msgstr "" "erste dieser Datensätze die Priorität der Paketversion fest." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8502,7 +8602,7 @@ msgstr "" "bereits gezeigten Datensätze:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@ -8530,12 +8630,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "Dann:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8550,7 +8650,7 @@ msgstr "" "dann wird von <literal>perl</literal> ein Downgrade durchgeführt." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8561,7 +8661,7 @@ msgstr "" "sogar wenn diese Versionen zum Ziel-Release gehören." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8575,12 +8675,12 @@ msgstr "" "Pakets installiert ist." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" msgstr "Festlegung von Paketversion und Distributions-Eigenschaften" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8591,27 +8691,27 @@ msgstr "" "bereitstellen, um die an diesem Ort verfügbaren Pakete zu beschreiben." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "die <literal>Package:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "gibt den Paketnamen an" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "die <literal>Version:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "gibt die Versionsnummer für das genannte Paket an" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8632,12 +8732,12 @@ msgstr "" "Prioritäten relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "die <literal>Archive:</literal>- oder <literal>Suite:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8654,18 +8754,18 @@ msgstr "" "folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "die <literal>Codename:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8681,13 +8781,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8703,7 +8803,7 @@ msgstr "" "eine der folgenden Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8715,12 +8815,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "die <literal>Component:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8738,18 +8838,18 @@ msgstr "" "Zeilen benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "die <literal>Origin:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8761,18 +8861,18 @@ msgstr "" "in der APT-Einstellungsdatei anzugeben würde die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "die <literal>Label:</literal>-Zeile" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8785,13 +8885,13 @@ msgstr "" "die folgende Zeile benötigen:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8813,7 +8913,7 @@ msgstr "" "relevant: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8839,12 +8939,12 @@ msgstr "" "Distribution heruntergeladen wurde." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "Optionale Zeilen in einem APT-Einstellungsdatensatz" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8855,7 +8955,7 @@ msgstr "" "anfangen. Dieses stellt einen Platz für Kommentare bereit." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8869,12 +8969,12 @@ msgstr "" "anfängt." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "Stable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8898,7 +8998,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8913,8 +9013,8 @@ msgstr "" "Distribution gehören. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8926,7 +9026,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8939,13 +9039,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>Paket</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8959,12 +9059,12 @@ msgstr "" "\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "Testing oder Unstable verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@ -8992,7 +9092,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -9009,7 +9109,7 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -9022,13 +9122,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>Paket</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9048,12 +9148,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "Die Entwicklung eines Codename-Releases verfolgen" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9087,7 +9187,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9113,7 +9213,7 @@ msgstr "" "benutzen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9126,13 +9226,13 @@ msgstr "" "durchzuführen. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>Paket</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9152,12 +9252,12 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po/es.po b/doc/po/es.po index 533978695..fe7a1c9be 100644 --- a/doc/po/es.po +++ b/doc/po/es.po @@ -1,72 +1,95 @@ -# Translation of apt package man pages -# Copyright (C) 2003, 2004 Debian Italian l10n team <debian-l10n-spanish@lists.debian.org> +# apt man pages translation to Spanish +# Copyright (C) 2003, 2004, 2009, 2010 Software in the Public Interest # This file is distributed under the same license as the apt package. # -# Translators: -# Ismael Fanlo, 2003 -# Carlos Mestre, 2003 -# Rudy Godoy <rudy@kernel-panik.org>, 2003 -# Gustavo Saldumbide <gsal@adinet.com.uy>, 2003 -# Javier Fernández-Sanguino <jfs@computer.org>, 2003 -# Rubén Porras Campo <nahoo@inicia.es>, 2003, 2004 +# Changes: +# - Initial translation +# Ismael Fanlo, 2003 +# Carlos Mestre, 2003 +# Rudy Godoy <rudy@kernel-panik.org>, 2003 +# Gustavo Saldumbide <gsal@adinet.com.uy>, 2003 +# Javier Fernández-Sanguino <jfs@computer.org>, 2003 +# Rubén Porras Campo <nahoo@inicia.es>, 2003, 2004 +# +# - Updates +# Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009, 2010 +# Omar Campagne <ocampagne@gmail.com>, 2009, 2010 +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" -"PO-Revision-Date: 2004-09-20 17:05+0000\n" -"Last-Translator: Rubén Porras Campo <nahoo@inicia.es>\n" -"Language-Team: <debian-l10n-spanish@lists.debian.org>\n" +"Project-Id-Version: apt 0.7.25\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" +"PO-Revision-Date: 2010-03-02 18:43+0200\n" +"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n" +"Language-Team: Debian Spanish l10n <debian-l10n-spanish@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Virtaal 0.5.2\n" #. type: TH #: apt.8:17 -#, fuzzy, no-wrap +#, no-wrap msgid "apt" -msgstr "B<apt>" +msgstr "apt" #. type: TH #: apt.8:17 -#, fuzzy, no-wrap +#, no-wrap msgid "16 June 1998" -msgstr "16 Junio 1998" +msgstr "16 de Junio de 1998" #. type: TH #: apt.8:17 -#, fuzzy, no-wrap +#, no-wrap msgid "Debian GNU/Linux" msgstr "Debian GNU/Linux" #. type: SH #: apt.8:18 -#, fuzzy, no-wrap +#, no-wrap msgid "NAME" msgstr "NOMBRE" #. type: Plain text #: apt.8:20 -#, fuzzy msgid "apt - Advanced Package Tool" -msgstr "apt - Herramienta Avanzada de Paquetes" +msgstr "apt - Herramienta avanzada de paquetes" #. type: SH #: apt.8:20 -#, fuzzy, no-wrap +#, no-wrap msgid "SYNOPSIS" msgstr "SINOPSIS" #. type: Plain text #: apt.8:22 -#, fuzzy msgid "B<apt>" msgstr "B<apt>" #. type: SH #: apt.8:22 -#, fuzzy, no-wrap +#, no-wrap msgid "DESCRIPTION" msgstr "DESCRIPCIÓN" @@ -78,97 +101,92 @@ msgid "" "(8) for the command line or B<synaptic>(8) for the X Window System. Some " "options are only implemented in B<apt-get>(8) though." msgstr "" +"APT es un sistema de gestión de paquetes de software. Dispone de varias " +"interfaces para la gestión de paquetes normal del día a día, tales como " +"B<aptitude>(8) para la línea de órdenes o B<synaptic>(8) para el sistema de " +"ventanas de X. Algunas opciones sólo están implementadas en B<apt-get>(8)." #. type: SH #: apt.8:31 -#, fuzzy, no-wrap +#, no-wrap msgid "OPTIONS" msgstr "OPCIONES" #. type: Plain text #: apt.8:33 apt.8:35 -#, fuzzy msgid "None." -msgstr "" -"#-#-#-#-# apt.es.8:31 #-#-#-#-#\n" -"Ninguna.\n" -"#-#-#-#-# apt.es.8:33 #-#-#-#-#\n" -"Ninguno." +msgstr "Ninguna." #. type: SH #: apt.8:33 -#, fuzzy, no-wrap +#, no-wrap msgid "FILES" msgstr "FICHEROS" #. type: SH #: apt.8:35 -#, fuzzy, no-wrap +#, no-wrap msgid "SEE ALSO" -msgstr "LEA TAMBIEN" +msgstr "VÉASE TAMBIÉN" #. type: Plain text #: apt.8:42 -#, fuzzy msgid "" "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " "B<apt_preferences>(5), B<apt-secure>(8)" -msgstr "B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5)" +msgstr "" +"B<apt-cache>(8), B<apt-get>(8), B<apt.conf>(5), B<sources.list>(5), " +"B<apt_preferences>(5), B<apt-secure>(8)" #. type: SH #: apt.8:42 -#, fuzzy, no-wrap +#, no-wrap msgid "DIAGNOSTICS" -msgstr "DIAGNÓSTICO" +msgstr "DIAGNÓSTICOS" #. type: Plain text #: apt.8:44 -#, fuzzy msgid "apt returns zero on normal operation, decimal 100 on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"apt devuelve cero si no hay ningún error, y el valor 100 en caso de error." #. type: SH #: apt.8:44 -#, fuzzy, no-wrap +#, no-wrap msgid "BUGS" -msgstr "ERRATAS" +msgstr "FALLOS" #. type: Plain text #: apt.8:46 -#, fuzzy msgid "This manpage isn't even started." -msgstr "Esta página de manual no está siquiera iniciada." +msgstr "Esta página de manual ni siquiera está iniciada." #. type: Plain text #: apt.8:55 -#, fuzzy msgid "" "See E<lt>http://bugs.debian.org/aptE<gt>. If you wish to report a bug in " "B<apt>, please see I</usr/share/doc/debian/bug-reporting.txt> or the " "B<reportbug>(1) command." msgstr "" "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de " -"error en B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> o " -"el programa B<reportbug>(1)" +"error sobre B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> " +"o use la orden B<reportbug>(1)." #. type: SH #: apt.8:55 -#, fuzzy, no-wrap +#, no-wrap msgid "AUTHOR" msgstr "AUTOR" #. type: Plain text #: apt.8:56 -#, fuzzy msgid "apt was written by the APT team E<lt>apt@packages.debian.orgE<gt>." msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt." #. type: Plain text #: apt.ent:2 msgid "<!-- -*- mode: sgml; mode: fold -*- -->" -msgstr "" +msgstr "<!-- -*- mode: sgml; mode: fold -*- -->" #. type: Plain text #: apt.ent:10 @@ -179,6 +197,11 @@ msgid "" "aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" "lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" msgstr "" +"<!-- Some common paths.. --> <!ENTITY docdir \"/usr/share/doc/apt/\"> <!" +"ENTITY guidesdir \"/usr/share/doc/apt-doc/\"> <!ENTITY configureindex " +"\"<filename>&docdir;examples/configure-index.gz</filename>\"> <!ENTITY " +"aptconfdir \"<filename>/etc/apt.conf</filename>\"> <!ENTITY statedir \"/var/" +"lib/apt\"> <!ENTITY cachedir \"/var/cache/apt\">" #. type: Plain text #: apt.ent:17 @@ -191,6 +214,12 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!-- Cross references to other man pages -->\n" +"<!ENTITY apt-conf \"<citerefentry>\n" +" <refentrytitle><filename>apt.conf</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:23 @@ -202,6 +231,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-get \"<citerefentry>\n" +" <refentrytitle><command>apt-get</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:29 @@ -213,6 +247,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-config \"<citerefentry>\n" +" <refentrytitle><command>apt-config</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:35 @@ -224,6 +263,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-cdrom \"<citerefentry>\n" +" <refentrytitle><command>apt-cdrom</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:41 @@ -235,6 +279,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-cache \"<citerefentry>\n" +" <refentrytitle><command>apt-cache</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:47 @@ -246,6 +295,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-preferences \"<citerefentry>\n" +" <refentrytitle><command>apt_preferences</command></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:53 @@ -257,6 +311,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-key \"<citerefentry>\n" +" <refentrytitle><command>apt-key</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:59 @@ -268,6 +327,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-secure \"<citerefentry>\n" +" <refentrytitle>apt-secure</refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:65 @@ -279,6 +343,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY apt-ftparchive \"<citerefentry>\n" +" <refentrytitle><filename>apt-ftparchive</filename></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:72 @@ -290,6 +359,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY sources-list \"<citerefentry>\n" +" <refentrytitle><filename>sources.list</filename></refentrytitle>\n" +" <manvolnum>5</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:78 @@ -301,6 +375,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY reportbug \"<citerefentry>\n" +" <refentrytitle><command>reportbug</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:84 @@ -312,6 +391,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg \"<citerefentry>\n" +" <refentrytitle><command>dpkg</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:90 @@ -323,6 +407,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg-buildpackage \"<citerefentry>\n" +" <refentrytitle><command>dpkg-buildpackage</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:96 @@ -334,6 +423,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY gzip \"<citerefentry>\n" +" <refentrytitle><command>gzip</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:102 @@ -345,6 +439,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg-scanpackages \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scanpackages</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:108 @@ -356,6 +455,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dpkg-scansources \"<citerefentry>\n" +" <refentrytitle><command>dpkg-scansources</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:114 @@ -367,6 +471,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY dselect \"<citerefentry>\n" +" <refentrytitle><command>dselect</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:120 @@ -378,6 +487,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY aptitude \"<citerefentry>\n" +" <refentrytitle><command>aptitude</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:126 @@ -389,6 +503,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY synaptic \"<citerefentry>\n" +" <refentrytitle><command>synaptic</command></refentrytitle>\n" +" <manvolnum>8</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:132 @@ -400,6 +519,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY debsign \"<citerefentry>\n" +" <refentrytitle><command>debsign</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:138 @@ -411,6 +535,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY debsig-verify \"<citerefentry>\n" +" <refentrytitle><command>debsig-verify</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:144 @@ -422,6 +551,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY gpg \"<citerefentry>\n" +" <refentrytitle><command>gpg</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:150 @@ -433,6 +567,11 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY gnome-apt \"<citerefentry>\n" +" <refentrytitle><command>gnome-apt</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:156 @@ -444,10 +583,15 @@ msgid "" " </citerefentry>\"\n" ">\n" msgstr "" +"<!ENTITY wajig \"<citerefentry>\n" +" <refentrytitle><command>wajig</command></refentrytitle>\n" +" <manvolnum>1</manvolnum>\n" +" </citerefentry>\"\n" +">\n" #. type: Plain text #: apt.ent:168 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!-- Boiler plate docinfo section -->\n" "<!ENTITY apt-docinfo \"\n" @@ -461,13 +605,17 @@ msgid "" " <date>28 October 2008</date>\n" " <productname>Linux</productname>\n" msgstr "" -"\n" -" <docinfo>\n" -" <address><email>apt@packages.debian.org</></address>\n" -" <author><firstname>Jason</> <surname>Gunthorpe</></>\n" -" <copyright><year>1998-2001</> <holder>Jason Gunthorpe</></>\n" -" <date>12 March 2001</>\n" -" </docinfo>\n" +"<!-- Boiler plate docinfo section -->\n" +"<!ENTITY apt-docinfo \"\n" +" <refentryinfo>\n" +" <address><email>apt@packages.debian.org</email></address>\n" +" <author>\n" +" <firstname>Jason</firstname> <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +" <copyright><year>1998-2001</year> <holder>Jason Gunthorpe</holder></copyright>\n" +" <date>28 de Octubre de 2008</date>\n" +" <productname>Linux</productname>\n" #. type: Plain text #: apt.ent:171 @@ -476,6 +624,8 @@ msgid "" " </refentryinfo>\n" "\"> \n" msgstr "" +" </refentryinfo>\n" +"\"> \n" #. type: Plain text #: apt.ent:177 @@ -487,6 +637,11 @@ msgid "" " </address>\n" "\">\n" msgstr "" +"<!ENTITY apt-email \"\n" +" <address>\n" +" <email>apt@packages.debian.org</email>\n" +" </address>\n" +"\">\n" #. type: Plain text #: apt.ent:185 @@ -500,6 +655,13 @@ msgid "" " </author>\n" "\">\n" msgstr "" +"<!ENTITY apt-author.jgunthorpe \"\n" +" <author>\n" +" <firstname>Jason</firstname>\n" +" <surname>Gunthorpe</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" #. type: Plain text #: apt.ent:193 @@ -513,6 +675,13 @@ msgid "" " </author>\n" "\">\n" msgstr "" +"<!ENTITY apt-author.moconnor \"\n" +" <author>\n" +" <firstname>Mike</firstname>\n" +" <surname>O'Connor</surname>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" #. type: Plain text #: apt.ent:200 @@ -525,6 +694,12 @@ msgid "" " </author>\n" "\">\n" msgstr "" +"<!ENTITY apt-author.team \"\n" +" <author>\n" +" <othername>Equipo de APT</othername>\n" +" <contrib></contrib>\n" +" </author>\n" +"\">\n" #. type: Plain text #: apt.ent:204 apt.ent:215 @@ -534,6 +709,9 @@ msgid "" " <productname>Linux</productname>\n" "\">\n" msgstr "" +"<!ENTITY apt-product \"\n" +" <productname>Linux</productname>\n" +"\">\n" #. type: Plain text #: apt.ent:211 @@ -546,6 +724,12 @@ msgid "" " </copyright>\n" "\">\n" msgstr "" +"<!ENTITY apt-copyright \"\n" +" <copyright>\n" +" <holder>Jason Gunthorpe</holder>\n" +" <year>1998-2001</year>\n" +" </copyright>\n" +"\">\n" #. type: Plain text #: apt.ent:221 @@ -557,10 +741,15 @@ msgid "" "\t</para>\n" "\">\n" msgstr "" +"<!ENTITY apt-qapage \"\n" +"\t<para>\n" +"\t\t<ulink url='http://packages.qa.debian.org/a/apt.html'>Página de QA</ulink>\n" +"\t</para>\n" +"\">\n" #. type: Plain text #: apt.ent:232 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!-- Boiler plate Bug reporting section -->\n" "<!ENTITY manbugs \"\n" @@ -572,11 +761,21 @@ msgid "" " </para>\n" " </refsect1>\n" "\">\n" -msgstr "Consulte E<lt>http://bugs.debian.org/aptE<gt>. Si desea enviar un informe de error en B<apt>, por favor lea I</usr/share/doc/debian/bug-reporting.txt> o el programa B<reportbug>(1)" +msgstr "" +"<!-- Boiler plate Bug reporting section -->\n" +"<!ENTITY manbugs \"\n" +" <refsect1><title>Bugs</title>\n" +" <para><ulink url='http://bugs.debian.org/src:apt'>Página de errores de APT</ulink>. \n" +" Si quiere informar de un error en APT, consulte\n" +" <filename>/usr/share/doc/debian/bug-reporting.txt</filename> o use la orden\n" +" &reportbug;.\n" +" </para>\n" +" </refsect1>\n" +"\">\n" #. type: Plain text #: apt.ent:240 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!-- Boiler plate Author section -->\n" "<!ENTITY manauthor \"\n" @@ -585,7 +784,14 @@ msgid "" " </para>\n" " </refsect1>\n" "\">\n" -msgstr "El equipo APT E<lt>apt@packages.debian.orgE<gt> escribió apt." +msgstr "" +"<!-- Boiler plate Author section -->\n" +"<!ENTITY manauthor \"\n" +" <refsect1><title>Autor</title>\n" +" <para>El equipo APT <email>apt@packages.debian.org</email> escribió apt.\n" +" </para>\n" +" </refsect1>\n" +"\">\n" #. type: Plain text #: apt.ent:250 @@ -601,6 +807,15 @@ msgid "" " </listitem>\n" " </varlistentry>\n" msgstr "" +"<!-- Should be used within the option section of the text to\n" +" put in the blurb about -h, -v, -c and -o -->\n" +"<!ENTITY apt-commonoptions \"\n" +" <varlistentry><term><option>-h</option></term>\n" +" <term><option>--help</option></term>\n" +" <listitem><para>Muestra un mensaje corto sobre el uso.\n" +" </para>\n" +" </listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:258 @@ -614,6 +829,13 @@ msgid "" " </listitem>\n" " </varlistentry>\n" msgstr "" +" <varlistentry>\n" +" <term><option>-v</option></term>\n" +" <term><option>--version</option></term>\n" +" <listitem><para>Muestra la versión del programa.\n" +" </para>\n" +" </listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:268 @@ -629,6 +851,15 @@ msgid "" " </listitem>\n" " </varlistentry>\n" msgstr "" +" <varlistentry>\n" +" <term><option>-c</option></term>\n" +" <term><option>--config-file</option></term>\n" +" <listitem><para>Fichero de configuración: Especifica el fichero de configuración a usar. \n" +" El programa leerá el fichero de configuración predeterminado y, después, este \n" +" fichero de configuración. Consulte &apt-conf; para información sobre la sintaxis. \n" +" </para>\n" +" </listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:280 @@ -646,10 +877,21 @@ msgid "" " </varlistentry>\n" "\">\n" msgstr "" +" <varlistentry>\n" +" <term><option>-o</option></term>\n" +" <term><option>--option</option></term>\n" +" <listitem><para>Define una opción de configuración: Esto definirá una opción\n" +" arbitraria de configuración. La sintaxis es <option>-o Algo::Cosa=cosa</option>.\n" +" <option>-o</option> y <option>--option</option> se pueden usar varias\n" +" veces para definir diferentes opciones.\n" +" </para>\n" +" </listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:291 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!-- Should be used within the option section of the text to\n" " put in the blurb about -h, -v, -c and -o -->\n" @@ -662,15 +904,17 @@ msgid "" " </para>\n" "\">\n" msgstr "" -"\n" -" <para>\n" -" Todas las opciones de línea de órdenes pueden ser especificadas\n" -" mediante el fichero de configuración, en la descripción de cada opción\n" -" se indica la opción de configuración que hay que modificar. Para\n" -" opciones booleanas puedes modificar el fichero de configuración usando\n" -" cosas parecidas a <option/-f-/,<option/--no-f/, <option/-f=no/ y alguna que\n" -" otra variante.\n" +"<!-- Should be used within the option section of the text to\n" +" put in the blurb about -h, -v, -c and -o -->\n" +"<!ENTITY apt-cmdblurb \"\n" +" <para>Todas las opciones de la línea de órdenes se pueden definir\n" +" mediante el fichero de configuración, las descripciones indican la\n" +" opción de la configuración a definir. Para opciones de tipo «boolean»\n" +" puede invalidar el fichero de configuración utilizando algo como\n" +" <option>-f-</option>,<option>--no-f</option>, <option>-f=no</option>\n" +" u otras muchas variaciones.\n" " </para>\n" +"\">\n" #. type: Plain text #: apt.ent:297 @@ -682,6 +926,11 @@ msgid "" " Configuration Item: <literal>Dir::Etc::Main</literal>.</para></listitem>\n" " </varlistentry>\n" msgstr "" +"<!ENTITY file-aptconf \"\n" +" <varlistentry><term><filename>/etc/apt/apt.conf</filename></term>\n" +" <listitem><para>Fichero de configuración de APT.\n" +" Opción de configuración: <literal>Dir::Etc::Main</literal>.</para></listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:303 @@ -693,6 +942,11 @@ msgid "" " </varlistentry>\n" "\">\n" msgstr "" +" <varlistentry><term><filename>/etc/apt/apt.conf.d/</filename></term>\n" +" <listitem><para>Fragmentos del fichero de configuración de APT.\n" +" Opción de configuración: <literal>Dir::Etc::Parts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:309 @@ -704,21 +958,31 @@ msgid "" " Configuration Item: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n" " </varlistentry>\n" msgstr "" +"<!ENTITY file-cachearchives \"\n" +" <varlistentry><term><filename>&cachedir;/archives/</filename></term>\n" +" <listitem><para>Área de almacenamiento para los ficheros de paquetes descargados.\n" +" Opción de configuración: <literal>Dir::Cache::Archives</literal>.</para></listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:315 -#, fuzzy, no-wrap +#, no-wrap msgid "" " <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" " <listitem><para>Storage area for package files in transit.\n" " Configuration Item: <literal>Dir::Cache::Archives</literal> (implicit partial). </para></listitem>\n" " </varlistentry>\n" "\">\n" -msgstr "Directorio donde se guardan los ficheros en tránsito. Opción de Configuración: <literal>Dir::Cache::Archives</literal> (Implica partial)." +msgstr "" +" <varlistentry><term><filename>&cachedir;/archives/partial/</filename></term>\n" +" <listitem><para>Área de almacenamiento para los ficheros de paquete en tránsito.\n" +" Opción de configuración: <literal>Dir::Cache::Archives</literal> (parcialmente implícito). </para></listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:325 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!ENTITY file-preferences \"\n" " <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n" @@ -729,7 +993,15 @@ msgid "" " or from a different version of a distribution.\n" " Configuration Item: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n" " </varlistentry>\n" -msgstr "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</literal>." +msgstr "" +"<!ENTITY file-preferences \"\n" +" <varlistentry><term><filename>/etc/apt/preferences</filename></term>\n" +" <listitem><para>Ficheros de preferencias de versión.\n" +" Aquí puede especificar el anclaje ("pinning"),\n" +" una preferencia para conseguir ciertos paquetes a partir de\n" +" una fuente diferente o de una versión diferente de una distribución.\n" +" Opción de configuración: <literal>Dir::Etc::Preferences</literal>.</para></listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:331 @@ -741,6 +1013,11 @@ msgid "" " </varlistentry>\n" "\">\n" msgstr "" +" <varlistentry><term><filename>/etc/apt/preferences.d/</filename></term>\n" +" <listitem><para>Fragmentos de fichero para las preferencias de la versión.\n" +" Opción de configuración: <literal>Dir::Etc::PreferencesParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:337 @@ -752,6 +1029,11 @@ msgid "" " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" " </varlistentry>\n" msgstr "" +"<!ENTITY file-sourceslist \"\n" +" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +" <listitem><para>Ubicaciones de dónde conseguir los paquetes.\n" +" Opción de configuración: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:343 @@ -763,10 +1045,15 @@ msgid "" " </varlistentry>\n" "\">\n" msgstr "" +" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +" <listitem><para>Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n" +" Opción de configuración: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:350 -#, fuzzy, no-wrap +#, no-wrap msgid "" "<!ENTITY file-statelists \"\n" " <varlistentry><term><filename>&statedir;/lists/</filename></term>\n" @@ -775,22 +1062,16 @@ msgid "" " Configuration Item: <literal>Dir::State::Lists</literal>.</para></listitem>\n" " </varlistentry>\n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"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</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"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</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"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</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>." +"<!ENTITY file-statelists \"\n" +" <varlistentry><term><filename>&statedir;/lists/</filename></term>\n" +" <listitem><para>Área de almacenamiento para la información del estado\n" +" de cada fuente de paquetes especificado en &sources-list;\n" +" Opción de configuración: <literal>Dir::State::Lists</literal>.</para></listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:356 -#, fuzzy, no-wrap +#, no-wrap msgid "" " <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" " <listitem><para>Storage area for state information in transit.\n" @@ -798,22 +1079,21 @@ msgid "" " </varlistentry>\n" "\">\n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)." +" <varlistentry><term><filename>&statedir;/lists/partial/</filename></term>\n" +" <listitem><para>Área de almacenamiento para la información del estado en tránsito.\n" +" Opción de configuración: <literal>Dir::State::Lists</literal> (parcialmente implícito).</para></listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:362 #, fuzzy, no-wrap +#| msgid "" +#| "<!ENTITY file-sourceslist \"\n" +#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +#| " <listitem><para>Locations to fetch packages from.\n" +#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +#| " </varlistentry>\n" msgid "" "<!ENTITY file-trustedgpg \"\n" " <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" @@ -821,22 +1101,21 @@ msgid "" " Configuration Item: <literal>Dir::Etc::Trusted</literal>.</para></listitem>\n" " </varlistentry>\n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"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</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"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</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:565 apt-cache.es.8.sgml:565 apt-get.es.8.sgml:565 #-#-#-#-#\n" -"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</literal>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1130 apt-cache.es.8.sgml:1130 apt-get.es.8.sgml:1130 #-#-#-#-#\n" -"Directorio donde se almacena información de estado por cada sitio especificado en &sources-list; Opción de Configuración: <literal>Dir::State::Lists</literal>." +"<!ENTITY file-sourceslist \"\n" +" <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" +" <listitem><para>Ubicaciones de dónde conseguir los paquetes.\n" +" Opción de configuración: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" +" </varlistentry>\n" #. type: Plain text #: apt.ent:369 #, fuzzy, no-wrap +#| msgid "" +#| " <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +#| " <listitem><para>File fragments for locations to fetch packages from.\n" +#| " Configuration Item: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +#| " </varlistentry>\n" +#| "\">\n" msgid "" " <varlistentry><term><filename>/etc/apt/trusted.gpg.d/</filename></term>\n" " <listitem><para>File fragments for the trusted keys, additional keyrings can\n" @@ -845,18 +1124,11 @@ msgid "" " </varlistentry>\n" "\">\n" msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:572 apt-cache.es.8.sgml:572 apt-get.es.8.sgml:572 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (lo que implica que no estarán completos).\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:1136 apt-cache.es.8.sgml:1136 apt-get.es.8.sgml:1136 #-#-#-#-#\n" -"Directorio de almacenamiento para la información de estado en tránsito. Opción de Configuración: <literal>Dir::State::Lists</literal> (Implica partial)." +" <varlistentry><term><filename>/etc/apt/sources.list.d/</filename></term>\n" +" <listitem><para>Fragmentos de fichero para las ubicaciones de dónde descargar los paquetes.\n" +" Opción de configuración: <literal>Dir::Etc::SourceParts</literal>.</para></listitem>\n" +" </varlistentry>\n" +"\">\n" #. type: Plain text #: apt.ent:371 @@ -865,7 +1137,7 @@ msgstr "" #. type: Plain text #: apt.ent:380 -#, no-wrap, fuzzy +#, no-wrap msgid "" "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" " to the translation in the past, who is responsible now and maybe further information\n" @@ -876,14 +1148,6 @@ msgid "" " Debian Dummy l10n Team <email>debian-l10n-dummy@lists.debian.org</email>.\n" "\">\n" msgstr "" -"<!ENTITY translation-holder \"\n" -" The spanish translation was written 2003 and 2004 by Ismael Fanlo (2003), Carlos Mestre (2003),\n" -" Rudy Godoy <email>rudy@kernel-panik.org</email> (2003),\n" -" Gustavo Saldumbide <email>gsal@adinet.com.uy</email> (2003),\n" -" Javier Fernández-Sanguino <email>jfs@computer.org</email> (2003)\n" -" and Rubén Porras Campo <email>nahoo@inicia.es</email> (2003, 2004)\n" -" under the aegis of the debian spanish-l10n-team <email>debian-l10n-spanish@lists.debian.org</email>.\n" -"\">\n" #. type: Plain text #: apt.ent:387 @@ -906,10 +1170,11 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " "February 2004</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>29 " +"de Febrero de 2004</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-cache.8.xml:22 apt-cache.8.xml:29 -#, fuzzy msgid "apt-cache" msgstr "apt-cache" @@ -917,7 +1182,7 @@ msgstr "apt-cache" #: apt-cache.8.xml:23 apt-cdrom.8.xml:22 apt-config.8.xml:23 apt-get.8.xml:23 #: apt-key.8.xml:15 apt-mark.8.xml:23 apt-secure.8.xml:15 msgid "8" -msgstr "" +msgstr "8" #. type: Content of: <refentry><refmeta><refmiscinfo> #: apt-cache.8.xml:24 apt-cdrom.8.xml:23 apt-config.8.xml:24 @@ -926,17 +1191,15 @@ msgstr "" #: apt-sortpkgs.1.xml:24 apt.conf.5.xml:30 apt_preferences.5.xml:23 #: sources.list.5.xml:24 msgid "APT" -msgstr "" +msgstr "APT" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cache.8.xml:30 -#, fuzzy msgid "APT package handling utility -- cache manipulator" -msgstr "utilidad de manejo de paquetes APT -- manipulador de caché" +msgstr "Herramienta para la gestión de paquetes APT -- manipulador de la caché" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-cache.8.xml:36 -#, fuzzy msgid "" "<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" "o=<replaceable>config string</replaceable></option></arg> <arg><option>-" @@ -959,47 +1222,39 @@ msgid "" "\"><replaceable>pkgs</replaceable></arg></arg> <arg>madison <arg choice=" "\"plain\" rep=\"repeat\"><replaceable>pkgs</replaceable></arg></arg> </group>" msgstr "" -"<arg rep=\"norepeat\" choice=\"opt\">add <arg rep=\"repeat\" choice=\"plain" -"\"><replaceable>fichero</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">gencaches</arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">showpkg <arg rep=\"repeat\" choice=" -"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">showsrc <arg rep=\"repeat\" choice=" -"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">stats</arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">dump</arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">dumpavail</arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">unmet</arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">search <arg rep=\"norepeat\" choice=" -"\"plain\"><replaceable>expresión regular</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">show <arg rep=\"repeat\" choice=\"plain" -"\"><replaceable>paquete</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">depends <arg rep=\"repeat\" choice=" -"\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">rdepends <arg rep=\"repeat\" choice=" -"\"plain\"><replaceable>pkg</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">pkgnames <arg rep=\"norepeat\" choice=" -"\"plain\"><replaceable>prefijo</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">dotty <arg rep=\"repeat\" choice=\"plain" -"\"><replaceable>paquete</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">policy <arg rep=\"repeat\" choice=" -"\"plain\"><replaceable>paquetes</replaceable></arg></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\">madison <arg rep=\"repeat\" choice=" -"\"plain\"><replaceable>paquetes</replaceable></arg></arg>" +"<command>apt-cache</command> <arg><option>-hvsn</option></arg> <arg><option>-" +"o=<replaceable>cadena-de-configuración</replaceable></option></arg> " +"<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group " +"choice=\"req\"> <arg>add <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>fichero</replaceable></arg></arg> <arg>gencaches</arg> " +"<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> " +"<arg>dump</arg> <arg>dumpavail</arg> <arg>unmet</arg> <arg>search <arg " +"choice=\"plain\"><replaceable>exp_regular</replaceable></arg></arg> " +"<arg>show <arg choice=\"plain\" rep=\"repeat\"><replaceable></replaceable></" +"arg></arg> <arg>depends <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>paquete</replaceable></arg></arg> <arg>rdepends <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>paquete</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>xvcg <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>" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 -#, fuzzy msgid "Description" msgstr "Descripción" #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:63 -#, fuzzy msgid "" "<command>apt-cache</command> performs a variety of operations on APT's " "package cache. <command>apt-cache</command> does not manipulate the state of " @@ -1007,86 +1262,57 @@ msgid "" "output from the package metadata." msgstr "" "<command>apt-cache</command> realiza una serie de operaciones sobre la caché " -"de paquetes de APT. <command>apt-cache</command> 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." +"(registro o lista) de paquetes de APT. <command>apt-cache</command> no " +"modifica el estado del sistema pero proporciona operaciones de búsqueda y " +"genera información interesante a partir de los metadatos del paquete." #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:68 apt-get.8.xml:131 -#, fuzzy msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given, " "one of the commands below must be present." msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:227 apt-cache.es.8.sgml:227 apt-get.es.8." -"sgml:227 #-#-#-#-#\n" -"A menos que se proporcionen las opciones <option>-h</option>, o <option>--" -"help</option>, se debe de proporcionar una de las siguientes órdenes:\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:670 apt-cache.es.8.sgml:670 apt-get.es.8." -"sgml:670 #-#-#-#-#\n" -"Se debe proporcionar una de las siguientes órdenes a menos que se den las " -"opciones <option>-h</option>, o <option>--help</option>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:227 apt-cache.es.8.sgml:227 apt-get.es.8." -"sgml:227 #-#-#-#-#\n" -"A menos que se proporcionen las opciones <option>-h</option>, o <option>--" -"help</option>, se debe de proporcionar una de las siguientes órdenes:\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:670 apt-cache.es.8.sgml:670 apt-get.es.8." -"sgml:670 #-#-#-#-#\n" -"Se debe proporcionar una de las siguientes órdenes a menos que se den las " -"opciones <option>-h</option>, o <option>--help</option>.\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:227 apt-cache.es.8.sgml:227 apt-get.es.8." -"sgml:227 #-#-#-#-#\n" -"A menos que se proporcionen las opciones <option>-h</option>, o <option>--" -"help</option>, se debe de proporcionar una de las siguientes órdenes:\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:670 apt-cache.es.8.sgml:670 apt-get.es.8." -"sgml:670 #-#-#-#-#\n" -"Se debe proporcionar una de las siguientes órdenes a menos que se den las " -"opciones <option>-h</option>, o <option>--help</option>." +"A menos que se use la opción <option>-h</option> o <option>--help</option>, " +"una de las siguientes órdenes debe estar presente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:72 -#, fuzzy msgid "add <replaceable>file(s)</replaceable>" msgstr "add <replaceable>fichero(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:73 -#, fuzzy msgid "" "<literal>add</literal> adds the named package index files to the package " "cache. This is for debugging only." msgstr "" -"<literal>add</literal> añade el nombre del paquete a los ficheros de índices " -"de la caché de paquetes. Sólo para depuración." +"<literal>add</literal> añade los ficheros de índice del paquete nombrado a " +"la caché del paquete. Sólo para depuración." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:77 -#, fuzzy msgid "gencaches" msgstr "gencaches" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:78 -#, fuzzy msgid "" "<literal>gencaches</literal> performs the same operation as <command>apt-get " "check</command>. It builds the source and package caches from the sources in " "&sources-list; and from <filename>/var/lib/dpkg/status</filename>." msgstr "" "<literal>gencaches</literal> realiza la misma operación que <command>apt-get " -"check</command>. 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</filename>." +"check</command>. Genera las caches de los paquetes fuente y de los paquetes " +"binarios a partir de la lista de fuentes en &sources-list; y a partir de " +"<filename>/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:84 -#, fuzzy msgid "showpkg <replaceable>pkg(s)</replaceable>" msgstr "showpkg <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:85 -#, fuzzy msgid "" "<literal>showpkg</literal> displays information about the packages listed on " "the command line. Remaining arguments are package names. The available " @@ -1098,18 +1324,20 @@ msgid "" "dependencies need not be. For instance, <command>apt-cache showpkg " "libreadline2</command> would produce output similar to the following:" msgstr "" -"<literal>showpkg</literal> muestra información acerca de los paquetes " +"<literal>showpkg</literal> muestra la información relativa a 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</command> mostrará algo similar a lo siguiente: " -"<informalexample>" +"nombres de paquetes. Para cada paquete de la lista se listan las versiones y " +"dependencias inversas disponibles, así como las dependencias de cada " +"versión. Las dependencias (normales) son los paquetes de los que depende el " +"paquete en cuestión, las dependencias inversas son los paquetes que dependen " +"del paquete en cuestión. Por ello, las dependencias se deben satisfacer para " +"un paquete, pero las dependencias inversas no. Por ejemplo, <command>apt-" +"cache showpkg libreadline2</command> produciría una salida similar a la " +"siguiente:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt-cache.8.xml:97 -#, fuzzy, no-wrap +#, no-wrap msgid "" "Package: libreadline2\n" "Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" @@ -1122,13 +1350,12 @@ msgid "" "2.1-12 - \n" "Reverse Provides: \n" msgstr "" -"<programlisting>\n" -"Package: libreadline2\n" -"Versions: 2.1-12(/var/state/apt/lists/foo_Packages),\n" -"Reverse Depends: \n" +"Paquete: libreadline2\n" +"Versiones: 2.1-12(/var/state/apt/lists/foo_Packages),\n" +"Dependencias inversas: \n" " libreadlineg2,libreadline2\n" " libreadline2-altdev,libreadline2\n" -"Dependencies:\n" +"Dependencias:\n" "2.1-12 - libc5 (2 5.4.0-0) ncurses3.0 (0 (null))\n" "Provides:\n" "2.1-12 - \n" @@ -1136,7 +1363,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:109 -#, fuzzy msgid "" "Thus it may be seen that libreadline2, version 2.1-12, depends on libc5 and " "ncurses3.0 which must be installed for libreadline2 to work. In turn, " @@ -1146,57 +1372,52 @@ msgid "" "installed. For the specific meaning of the remainder of the output it is " "best to consult the apt source code." msgstr "" -"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." +"La información de salida muestra que libreadline2, con versión 2.1-12, " +"depende de libc5 y ncurses3.0, que se deben instalar para que libreadline2 " +"funcione. Además, libreadlineg2 y libreadline2-altdev dependen de " +"libreadline2. De modo que si libreadline2 está instalado, libc5 y ncurses3.0 " +"(y ldso) también deben estar instalados, pero libreadlineg2 y libreadline2-" +"altdev no tienen que estarlo. Para el significado específico del resto de la " +"salida lo mejor es consultar el código fuente de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:118 -#, fuzzy msgid "stats" msgstr "stats" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:118 -#, fuzzy msgid "" "<literal>stats</literal> displays some statistics about the cache. No " "further arguments are expected. Statistics reported are:" msgstr "" -"<literal>stats</literal> muestra algunas estadísticas acerca de la caché. No " +"<literal>stats</literal> muestra algunas estadísticas sobre la caché. No " "necesita ningún argumento adicional. Las estadísticas que muestra son:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:121 -#, fuzzy msgid "" "<literal>Total package names</literal> is the number of package names found " "in the cache." msgstr "" -"<literal>Total package names</literal> es el número de paquetes encontrados " -"en la caché." +"<literal>Total de nombres de paquetes</literal> es el número de paquetes " +"encontrados en la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:125 -#, fuzzy msgid "" "<literal>Normal packages</literal> is the number of regular, ordinary " "package names; these are packages that bear a one-to-one correspondence " "between their names and the names used by other packages for them in " "dependencies. The majority of packages fall into this category." msgstr "" -"<literal>Normal packages</literal> 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." +"<literal>Paquetes normales</literal> es el número de nombres 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." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:131 -#, fuzzy msgid "" "<literal>Pure virtual packages</literal> is the number of packages that " "exist only as a virtual package name; that is, packages only \"provide\" the " @@ -1205,46 +1426,43 @@ msgid "" "package; several packages provide \"mail-transport-agent\", but there is no " "package named \"mail-transport-agent\"." msgstr "" -"<literal>Pure virtual packages</literal> 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\"." +"<literal>Paquetes virtuales puros</literal> es el número de paquetes que " +"existen sólo como nombre de un paquete virtual, esto es, paquetes que sólo " +"«proporcionan» el nombre del paquete virtual, y no hay ningún paquete más que " +"use 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»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:139 -#, fuzzy msgid "" "<literal>Single virtual packages</literal> is the number of packages with " "only one package providing a particular virtual package. For example, in the " "Debian GNU/Linux system, \"X11-text-viewer\" is a virtual package, but only " "one package, xless, provides \"X11-text-viewer\"." msgstr "" -"<literal>Single virtual packages</literal> 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\"." +"<literal>Paquetes virtuales únicos</literal> es el número de paquetes con un " +"único paquete que proporciona un paquete virtual en concreto. 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»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:145 -#, fuzzy msgid "" "<literal>Mixed virtual packages</literal> is the number of packages that " "either provide a particular virtual package or have the virtual package name " "as the package name. For instance, in the Debian GNU/Linux system, \"debconf" "\" is both an actual package, and provided by the debconf-tiny package." msgstr "" -"<literal>Mixed virtual packages</literal> es el número de paquetes que o " +"<literal>Paquetes virtuales mixtos</literal> 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." +"como paquete virtual y como paquete normal. Por ejemplo, en un sistema " +"Debian GNU/Linux debconf es a la vez un paquete normal, y lo proporciona el " +"paquete debconf-tiny." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:152 -#, fuzzy msgid "" "<literal>Missing</literal> is the number of package names that were " "referenced in a dependency but were not provided by any package. Missing " @@ -1252,16 +1470,15 @@ msgid "" "package (real or virtual) has been dropped from the distribution. Usually " "they are referenced from Conflicts or Breaks statements." msgstr "" -"<literal>Missing</literal> 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." +"<literal>No encontrados</literal> es el número de nombres de paquetes " +"mencionados como dependencia pero que ningún paquete los proporciona. Estos " +"paquetes pueden ser una prueba de que no se tiene acceso a toda la " +"distribución, o de la eliminación de algún paquete (real o virtual) dentro " +"de la distribución. Normalmente se hace referencia a ellos desde los campos " +"«Conflicts» o «Breaks» de la descripción de los paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:159 -#, fuzzy msgid "" "<literal>Total distinct</literal> versions is the number of package versions " "found in the cache; this value is therefore at least equal to the number of " @@ -1269,49 +1486,45 @@ msgid "" "\"unstable\", for instance), is being accessed, this value can be " "considerably larger than the number of total package names." msgstr "" -"<literal>Total distinct versions</literal> 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 " +"<literal>Total de versiones distintas</literal> es el número de versiones de " +"paquetes encontradas en la caché, por lo tanto el número es al menos igual " +"al número total de paquetes. Si se encuentra en la caché más de una " +"distribución («estable» e «inestable», por ejemplo) al mismo tiempo, este " "valor puede ser considerablemente mayor que el número total de paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para><itemizedlist><listitem><para> #: apt-cache.8.xml:166 -#, fuzzy msgid "" "<literal>Total dependencies</literal> is the number of dependency " "relationships claimed by all of the packages in the cache." msgstr "" -"<literal>Total dependencies</literal> es el número total de relaciones de " -"dependencia necesitadas por todos los paquetes de la caché." +"<literal>Total de dependencias</literal> es el número total de relaciones de " +"dependencia de todos los paquetes de la caché." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:173 -#, fuzzy msgid "showsrc <replaceable>pkg(s)</replaceable>" msgstr "showsrc <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:174 -#, fuzzy msgid "" "<literal>showsrc</literal> displays all the source package records that " "match the given package names. All versions are shown, as well as all " "records that declare the name to be a Binary." msgstr "" "<literal>showsrc</literal> 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." +"que coinciden con los nombres de los paquetes proporcionados. Se muestran " +"todas las versiones, así como todos los campos cuyo nombre manifiesta que " +"son binarios." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:179 apt-config.8.xml:84 -#, fuzzy msgid "dump" msgstr "dump" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:180 -#, fuzzy msgid "" "<literal>dump</literal> shows a short listing of every package in the cache. " "It is primarily for debugging." @@ -1321,30 +1534,26 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:184 -#, fuzzy msgid "dumpavail" msgstr "dumpavail" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:185 -#, fuzzy msgid "" "<literal>dumpavail</literal> prints out an available list to stdout. This is " "suitable for use with &dpkg; and is used by the &dselect; method." msgstr "" -"<literal>dumpavail</literal> 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;." +"<literal>dumpavail</literal> muestra por la salida estándar una lista de los " +"paquetes disponibles. Esta lista es apropiada para su uso con &dpkg; y, " +"además, la usa el método &dselect;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:189 -#, fuzzy msgid "unmet" msgstr "unmet" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:190 -#, fuzzy msgid "" "<literal>unmet</literal> displays a summary of all unmet dependencies in the " "package cache." @@ -1354,29 +1563,25 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:194 -#, fuzzy msgid "show <replaceable>pkg(s)</replaceable>" msgstr "show <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:195 -#, fuzzy msgid "" "<literal>show</literal> performs a function similar to <command>dpkg --print-" "avail</command>; it displays the package records for the named packages." msgstr "" "<literal>show</literal> realiza una función similar a <command>dpkg --print-" -"avail</command>, muestra los datos de los paquetes listados." +"avail</command>, muestra los campos del paquete para los paquetes nombrados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:200 -#, fuzzy msgid "search <replaceable>regex [ regex ... ]</replaceable>" -msgstr "search <replaceable>regex [regex ...]</replaceable>" +msgstr "search <replaceable>exp-regular [exp-regular ...]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:201 -#, fuzzy msgid "" "<literal>search</literal> performs a full text search on all available " "package lists for the POSIX regex pattern given, see " @@ -1389,66 +1594,60 @@ msgid "" "<option>--names-only</option> is given then the long description is not " "searched, only the package name is." msgstr "" -"<literal>search</literal> 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</option> el resultado es el igual al que produce " -"<literal>show</literal> para cada paquete en concreto, pero si se " -"proporciona el argumento <option>--names-only</option> entonces sólo se " -"busca en el nombre de los paquetes." +"<literal>search</literal> realiza una búsqueda de la expresión regular POSIX " +"proporcionada en todo el texto de todos los paquetes disponibles, véase " +"<citerefentry><refentrytitle><command>regex</command></refentrytitle> " +"<manvolnum>7</manvolnum></citerefentry>. 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 éste, incluyendo nombres de paquetes " +"virtuales. Si se proporciona el argumento <option>--full</option> el " +"resultado es igual al que produce <literal>show</literal> para cada paquete, " +"pero si se proporciona el argumento <option>--names-only</option> entonces " +"sólo se busca en el nombre de los paquetes, no en la descripción larga." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:214 -#, fuzzy msgid "" "Separate arguments can be used to specify multiple search patterns that are " "and'ed together." msgstr "" -"Se pueden especificar argumentos separados para buscar una cadena de " -"caracteres que los contenga todos al mismo tiempo." +"Se pueden usar argumentos separados para especificar varios patrones de " +"búsqueda que se juntarán mediante una «Y lógica»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:218 -#, fuzzy msgid "depends <replaceable>pkg(s)</replaceable>" msgstr "depends <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:219 -#, fuzzy msgid "" "<literal>depends</literal> shows a listing of each dependency a package has " "and all the possible other packages that can fulfill that dependency." msgstr "" "<literal>depends</literal> muestra una lista de todas la dependencias de un " -"paquete y de todos los paquetes que la pueden satisfacer." +"paquete y de todos los demás paquetes que la pueden satisfacer." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:223 -#, fuzzy msgid "rdepends <replaceable>pkg(s)</replaceable>" -msgstr "depends <replaceable>paquete(s)</replaceable>" +msgstr "rdepends <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:224 -#, fuzzy msgid "" "<literal>rdepends</literal> shows a listing of each reverse dependency a " "package has." msgstr "" -"<literal>rdepends</literal> muestrade las dependencias inversas de un " -"paquete." +"<literal>rdepends</literal> muestra las dependencias inversas de un paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:228 -#, fuzzy msgid "pkgnames <replaceable>[ prefix ]</replaceable>" msgstr "pkgnames <replaceable>[ prefijo ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:229 -#, fuzzy msgid "" "This command prints the name of each package APT knows. The optional " "argument is a prefix match to filter the name list. The output is suitable " @@ -1456,11 +1655,11 @@ msgid "" "extremely quickly. This command is best used with the <option>--generate</" "option> option." msgstr "" -"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>--" +"Esta orden muestra el nombre de todos los paquetes que APT conoce. El " +"argumento opcional es un prefijo para filtrar la lista de nombres. La salida " +"es apropiada para su uso junto con la función de completado automático " +"mediante tabulador en un intérprete de órdenes y se genera de forma " +"extremadamente rápida. El mejor uso de la orden es con la opción <option>--" "generate</option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -1470,16 +1669,17 @@ msgid "" "download, installable or installed, e.g. virtual packages are also listed in " "the generated list." msgstr "" +"Tenga en cuenta que un paquete que conoce APT puede no estar necesariamente " +"disponible para descargar, instalar o instalado, por ejemplo: los paquetes " +"virtuales también aparecen en la lista generada." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:239 -#, fuzzy msgid "dotty <replaceable>pkg(s)</replaceable>" msgstr "dotty <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:240 -#, fuzzy msgid "" "<literal>dotty</literal> takes a list of packages on the command line and " "generates output suitable for use by dotty from the <ulink url=\"http://www." @@ -1491,39 +1691,38 @@ msgid "" "GivenOnly</literal> option." msgstr "" "<literal>dotty</literal> 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</ulink>. 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</literal>." +"genera una salida apropiada para su uso con dotty, del paquete <ulink url=" +"\"http://www.research.att.com/sw/tools/graphviz/\">GraphViz</ulink>. El " +"resultado será un conjunto de nodos y uniones representando las relaciones " +"entre los paquetes. De forma predeterminada, los paquetes proporcionados " +"mostrarán todas sus dependencias, lo que puede producir un grafo muy grande. " +"Para limitar la salida sólo a los paquetes listados en la línea de órdenes, " +"active la opción <literal>APT::Cache::GivenOnly</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:249 -#, fuzzy msgid "" "The resulting nodes will have several shapes; normal packages are boxes, " "pure provides are triangles, mixed provides are diamonds, missing packages " "are hexagons. Orange boxes mean recursion was stopped [leaf packages], blue " "lines are pre-depends, green lines are conflicts." msgstr "" -"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, " +"Los nodos resultantes tendrán varias formas: los paquetes normales son " +"cajas, los paquetes virtuales puros son triángulos, los paquetes virtuales " +"mixtos son diamantes y los paquetes no encontrados son hexágonos. Las cajas " +"naranjas simbolizan que el recorrido se detuvo en paquetes que ningún otro " +"declara como dependencia, las líneas azules son pre-dependencias y las " "líneas verdes son conflictos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:254 -#, fuzzy msgid "Caution, dotty cannot graph larger sets of packages." -msgstr "Tenga cuidado, dotty no puede dibujar una gran cantidad de paquetes." +msgstr "Tenga cuidado, dotty no puede dibujar grandes conjuntos de paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:257 -#, fuzzy msgid "xvcg <replaceable>pkg(s)</replaceable>" -msgstr "show <replaceable>paquete(s)</replaceable>" +msgstr "xvcg <replaceable>paquete(s)</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:258 @@ -1531,36 +1730,35 @@ msgid "" "The same as <literal>dotty</literal>, only for xvcg from the <ulink url=" "\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">VCG tool</ulink>." msgstr "" +"Lo mismo que <literal>dotty</literal>, sólo para xvcg de la <ulink url=" +"\"http://rw4.cs.uni-sb.de/users/sander/html/gsvcg1.html\">herramienta VCG</" +"ulink>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:262 -#, fuzzy msgid "policy <replaceable>[ pkg(s) ]</replaceable>" msgstr "policy <replaceable>[ paquete(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:263 -#, fuzzy msgid "" "<literal>policy</literal> is meant to help debug issues relating to the " "preferences file. With no arguments it will print out the priorities of each " "source. Otherwise it prints out detailed information about the priority " "selection of the named package." msgstr "" -"<literal>policy</literal> 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." +"<literal>policy</literal> está pensado para ayudar a depurar asuntos " +"relacionados con el fichero de preferencias. Sin argumentos mostrará las " +"prioridades de cada fuente. De forma alternativa, muestra una información " +"detallada acerca de la prioridad de selección del paquete nombrado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:269 -#, fuzzy msgid "madison <replaceable>/[ pkg(s) ]</replaceable>" msgstr "madison <replaceable>[ paquete(s) ]</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:270 -#, fuzzy msgid "" "<literal>apt-cache</literal>'s <literal>madison</literal> command attempts " "to mimic the output format and a subset of the functionality of the Debian " @@ -1572,7 +1770,7 @@ msgid "" msgstr "" "La orden <literal>madison</literal> de <literal>apt-cache</literal> intenta " "imitar el formato de salida y parte de la funcionalidad de la herramienta " -"para el manejo del archivo de Debian, <literal>madison</literal>. Muestra " +"para la gestión del archivo de Debian, <literal>madison</literal>. Muestra " "las versiones disponibles de un determinado paquete en un formato tabular. A " "diferencia del <literal>madison</literal> original, sólo puede mostrar " "información para la arquitectura para la que APT obtuvo las listas de " @@ -1580,52 +1778,45 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 -#, fuzzy msgid "options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:285 -#, fuzzy msgid "<option>-p</option>" msgstr "<option>-p</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:285 -#, fuzzy msgid "<option>--pkg-cache</option>" msgstr "<option>--pkg-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:286 -#, fuzzy msgid "" "Select the file to store the package cache. The package cache is the primary " "cache used by all operations. Configuration Item: <literal>Dir::Cache::" "pkgcache</literal>." msgstr "" -"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 " +"Define el fichero donde 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</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 -#, fuzzy msgid "<option>-s</option>" msgstr "<option>-s</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:291 -#, fuzzy msgid "<option>--src-cache</option>" msgstr "<option>--src-cache</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:292 -#, fuzzy msgid "" "Select the file to store the source cache. The source is used only by " "<literal>gencaches</literal> and it stores a parsed version of the package " @@ -1633,101 +1824,88 @@ msgid "" "cache is used to avoid reparsing all of the package files. Configuration " "Item: <literal>Dir::Cache::srcpkgcache</literal>." msgstr "" -"Selecciona el fichero para guardar la caché de fuente. Sólo " -"<literal>gencaches</literal> 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</literal>." +"Escoge el fichero para guardar la caché fuente. Sólo <literal>gencaches</" +"literal> usa esta caché y guarda una versión analizada de la información de " +"los paquetes de las fuentes remotas. Cuando se genera 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</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 -#, fuzzy +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 -#, fuzzy +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:300 -#, fuzzy msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quietness up to a maximum of 2. You can also use " "<option>-q=#</option> to set the quietness level, overriding the " "configuration file. Configuration Item: <literal>quiet</literal>." msgstr "" -"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=#</option> para " -"ajustar el nivel de silenciosidad, ignorando el fichero de configuración. " -"Opción de configuración: <literal>quiet</literal>." +"Produce una salida adecuada para su almacenamiento, omitiendo los " +"indicadores de progreso. Más «q» producirán una salida más silenciosa, hasta " +"un máximo de dos. También se puede usar <option>-q=#</option> para definir " +"el nivel de silencio, ignorando el fichero de configuración. Opción de " +"configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:306 -#, fuzzy msgid "<option>-i</option>" msgstr "<option>-i</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:306 -#, fuzzy msgid "<option>--important</option>" msgstr "<option>--important</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:307 -#, fuzzy msgid "" "Print only important dependencies; for use with unmet and depends. Causes " "only Depends and Pre-Depends relations to be printed. Configuration Item: " "<literal>APT::Cache::Important</literal>." msgstr "" -"Muestra sólo las dependencias importantes, se usa junto con <literal>unmet</" -"literal>. Hace que sólo se muestren las dependencias y predependencias. " -"Opción de configuración: <literal>APT::Cache::Important</literal>." +"Muestra sólo las dependencias importantes, se usa junto con unmet y depends. " +"Hace que sólo se muestren las dependencias y pre-dependencias. Opción de " +"configuración: <literal>APT::Cache::Important</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:312 apt-cdrom.8.xml:121 apt-get.8.xml:333 -#, fuzzy msgid "<option>-f</option>" msgstr "<option>-f</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:312 -#, fuzzy msgid "<option>--full</option>" msgstr "<option>--full</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:313 -#, fuzzy msgid "" "Print full package records when searching. Configuration Item: " "<literal>APT::Cache::ShowFull</literal>." msgstr "" -"Muestra todos los campos de información cuando se busque. Opción de " -"configuración: <literal>APT::Cache::ShowFull</literal>." +"Muestra todos los campos de información cuando se realiza una búsqueda. " +"Opción de configuración: <literal>APT::Cache::ShowFull</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 -#, fuzzy +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:317 -#, fuzzy msgid "<option>--all-versions</option>" msgstr "<option>--all-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:318 -#, fuzzy msgid "" "Print full records for all available versions. This is the default; to turn " "it off, use <option>--no-all-versions</option>. If <option>--no-all-" @@ -1736,53 +1914,47 @@ msgid "" "applicable to the <literal>show</literal> command. Configuration Item: " "<literal>APT::Cache::AllVersions</literal>." msgstr "" -"Muestra la descripción completa de todos las versiones disponibles. Es el " +"Muestra los campos completos de todas las versiones disponibles. Es el " "comportamiento predeterminado, para desactivarlo use <option>--no-all-" "versions</option>. Si se especifica <option>--no-all-versions</option>, 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</literal>. Opción de " +"se muestra la versión candidata (la que se escogería para instalar). Esta " +"opción sólo se aplica a la orden <literal>show</literal>. Opción de " "configuración: <literal>APT::Cache::AllVersions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:326 -#, fuzzy msgid "<option>-g</option>" msgstr "<option>-g</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:326 -#, fuzzy msgid "<option>--generate</option>" msgstr "<option>--generate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:327 -#, fuzzy msgid "" "Perform automatic package cache regeneration, rather than use the cache as " "it is. This is the default; to turn it off, use <option>--no-generate</" "option>. Configuration Item: <literal>APT::Cache::Generate</literal>." msgstr "" -"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 " +"Realiza una regeneración completa de la caché de paquetes, en vez de usarla " +"tal y como está. Esta es la opción predeterminada, para desactivarla use " "<option>--no-generate</option>. Opción de configuración: <literal>APT::" "Cache::Generate</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:332 -#, fuzzy msgid "<option>--names-only</option>" msgstr "<option>--names-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:332 apt-cdrom.8.xml:139 -#, fuzzy msgid "<option>-n</option>" msgstr "<option>-n</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:333 -#, fuzzy msgid "" "Only search on the package names, not the long descriptions. Configuration " "Item: <literal>APT::Cache::NamesOnly</literal>." @@ -1792,147 +1964,99 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:337 -#, fuzzy msgid "<option>--all-names</option>" msgstr "<option>--all-names</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:338 -#, fuzzy msgid "" "Make <literal>pkgnames</literal> print all names, including virtual packages " "and missing dependencies. Configuration Item: <literal>APT::Cache::" "AllNames</literal>." msgstr "" "Hace que <literal>pkgnames</literal> muestre todos los nombres, incluyendo " -"los paquetes virtuales y las dependencias insatisfechas. Opción de " +"los paquetes virtuales y las dependencias no encontradas. Opción de " "configuración: <literal>APT::Cache::AllNames</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:343 -#, fuzzy msgid "<option>--recurse</option>" msgstr "<option>--recurse</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:344 -#, fuzzy msgid "" "Make <literal>depends</literal> and <literal>rdepends</literal> recursive so " "that all packages mentioned are printed once. Configuration Item: " "<literal>APT::Cache::RecurseDepends</literal>." msgstr "" -"Hace <literal>depends</literal> y <literal>rdepends</literal> recursivos de " -"modo que todos los paquetes mencionados se muestran sólo una vez. Opción de " -"configuración <literal>APT::Cache::RecurseDepends</literal>." +"Hace que <literal>depends</literal> y <literal>rdepends</literal> sean " +"recursivos de modo que todos los paquetes mencionados se muestran sólo una " +"vez. Opción de configuración <literal>APT::Cache::RecurseDepends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:349 -#, fuzzy msgid "<option>--installed</option>" msgstr "<option>--installed</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cache.8.xml:351 -#, fuzzy msgid "" "Limit the output of <literal>depends</literal> and <literal>rdepends</" "literal> to packages which are currently installed. Configuration Item: " "<literal>APT::Cache::Installed</literal>." msgstr "" "Limita la salida de <literal>depends</literal> y <literal>rdepends</literal> " -"a paquetes instalados. Opción de configuración: <literal>APT::Cache::" -"Installed</literal>." +"a paquetes actualmente instalados. Opción de configuración: <literal>APT::" +"Cache::Installed</literal>." #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 -#, fuzzy msgid "&apt-commonoptions;" -msgstr "" -"&apt-commonoptions;\n" -" \n" -" " +msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 -#, fuzzy +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "Ficheros" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:363 msgid "&file-sourceslist; &file-statelists;" -msgstr "" +msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 -#, fuzzy msgid "See Also" -msgstr "" -"#-#-#-#-# apt-cdrom.es.8.sgml:144 apt-cache.es.8.sgml:144 apt-get.es.8." -"sgml:144 #-#-#-#-#\n" -"Véase también\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:577 apt-cdrom.es.8.sgml:1141 apt-cache.es.8." -"sgml:577 apt-cache.es.8.sgml:1141 apt-get.es.8.sgml:577 apt-get.es.8." -"sgml:1141 #-#-#-#-#\n" -"Vea además\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:577 apt-cdrom.es.8.sgml:1141 apt-cache.es.8." -"sgml:577 apt-cache.es.8.sgml:1141 apt-get.es.8.sgml:577 apt-get.es.8." -"sgml:1141 #-#-#-#-#\n" -"Vea además\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:144 apt-cache.es.8.sgml:144 apt-get.es.8." -"sgml:144 #-#-#-#-#\n" -"Véase también\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:577 apt-cdrom.es.8.sgml:1141 apt-cache.es.8." -"sgml:577 apt-cache.es.8.sgml:1141 apt-get.es.8.sgml:577 apt-get.es.8." -"sgml:1141 #-#-#-#-#\n" -"Vea además\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:577 apt-cdrom.es.8.sgml:1141 apt-cache.es.8." -"sgml:577 apt-cache.es.8.sgml:1141 apt-get.es.8.sgml:577 apt-get.es.8." -"sgml:1141 #-#-#-#-#\n" -"Vea además\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:144 apt-cache.es.8.sgml:144 apt-get.es.8." -"sgml:144 #-#-#-#-#\n" -"Véase también\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:577 apt-cdrom.es.8.sgml:1141 apt-cache.es.8." -"sgml:577 apt-cache.es.8.sgml:1141 apt-get.es.8.sgml:577 apt-get.es.8." -"sgml:1141 #-#-#-#-#\n" -"Vea además\n" -"#-#-#-#-# apt-cdrom.es.8.sgml:577 apt-cdrom.es.8.sgml:1141 apt-cache.es.8." -"sgml:577 apt-cache.es.8.sgml:1141 apt-get.es.8.sgml:577 apt-get.es.8." -"sgml:1141 #-#-#-#-#\n" -"Vea además" +msgstr "Véase también" #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:369 -#, fuzzy msgid "&apt-conf;, &sources-list;, &apt-get;" msgstr "&apt-conf;, &sources-list;, &apt-get;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 -#, fuzzy msgid "Diagnostics" msgstr "Diagnósticos" #. type: Content of: <refentry><refsect1><para> #: apt-cache.8.xml:374 -#, fuzzy msgid "" "<command>apt-cache</command> returns zero on normal operation, decimal 100 " "on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-cache</command> devuelve cero si no hay ningún error, y el " +"valor 100 en caso de error." #. type: Content of: <refentry><refentryinfo> #: apt-cdrom.8.xml:13 @@ -1940,22 +2064,21 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " "February 2004</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>14 " +"de Febrero de 2004</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-cdrom.8.xml:21 apt-cdrom.8.xml:28 -#, fuzzy msgid "apt-cdrom" msgstr "apt-cdrom" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-cdrom.8.xml:29 -#, fuzzy msgid "APT CDROM management utility" -msgstr "utilidad APT para administración del CDROM" +msgstr "Herramienta de APT para la gestión de discos ópticos" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-cdrom.8.xml:35 -#, fuzzy msgid "" "<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " "<arg><option>-d=<replaceable>cdrom mount point</replaceable></option></arg> " @@ -1963,330 +2086,298 @@ msgid "" "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group> " "<arg>add</arg> <arg>ident</arg> </group>" msgstr "" -"<cmdsynopsis sepchar=\" \">\n" -"<command>apt-cdrom</command>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom " -"punto_de_montaje</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " -"configuración</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" -"replaceable></option></arg>" +"<command>apt-cdrom</command> <arg><option>-hvrmfan</option></arg> " +"<arg><option>-d=<replaceable>punto-de-montaje</replaceable></option></arg> " +"<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></option></" +"arg> <arg><option>-c=<replaceable>fichero</replaceable></option></arg> " +"<group> <arg>add</arg> <arg>ident</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:48 -#, fuzzy msgid "" "<command>apt-cdrom</command> is used to add a new CDROM to APTs list of " "available sources. <command>apt-cdrom</command> takes care of determining " "the structure of the disc as well as correcting for several possible mis-" "burns and verifying the index files." msgstr "" -"<command>apt-cdrom</command> se usa para añadir un CDROM nuevo a la lista de " -"recursos disponibles de APT. <command>apt-cdrom</command> determina la " -"estructura del disco, corrige varios errores de grabación posibles y " -"verifica los ficheros con los índices." +"<command>apt-cdrom</command> se usa para añadir un disco óptico a la lista " +"de fuentes disponibles de APT. <command>apt-cdrom</command> examina la " +"estructura del disco, corrige los posibles errores de grabación y verifica " +"los ficheros de índice." #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:55 -#, fuzzy msgid "" "It is necessary to use <command>apt-cdrom</command> to add CDs to the APT " "system, it cannot be done by hand. Furthermore each disk in a multi-cd set " "must be inserted and scanned separately to account for possible mis-burns." msgstr "" -"Es necesario usar <command>apt-cdrom</command> 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." +"Es necesario usar <command>apt-cdrom</command> para añadir los discos al " +"sistema APT, no se puede hacer manualmente. Además, debe insertar y analizar " +"cada disco de un conjunto de discos por separado, para poder detectar los " +"posibles errores de grabación." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt-cdrom.8.xml:65 -#, fuzzy msgid "add" msgstr "add" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 #, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." msgstr "" -"<literal>add</literal> 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/</filename> se mostrará un " -"mensaje descriptivo." +"<literal>add</literal> añade un disco nuevo a la lista de fuentes. " +"Desmontará el dispositivo del disco y pedirá que se inserte un disco para " +"iniciar el análisis y copiado de los ficheros de índice. Si el disco no " +"contiene un directorio <filename>disk</filename> apropiado, se le pedirá un " +"título descriptivo." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:74 -#, fuzzy msgid "" "APT uses a CDROM ID to track which disc is currently in the drive and " "maintains a database of these IDs in <filename>&statedir;/cdroms.list</" "filename>" msgstr "" -"APT usa un identificador de CDROM para reconocer que disco está actualmente " +"APT usa un identificador de CDROM para reconocer qué disco está actualmente " "en la unidad lectora y mantiene una lista de estos identificadores en " "<filename>&statedir;/cdroms.list</filename>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt-cdrom.8.xml:81 -#, fuzzy msgid "ident" msgstr "ident" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:82 -#, fuzzy msgid "" "A debugging tool to report the identity of the current disc as well as the " "stored file name" msgstr "" -"Una herramienta de depuración para informar de identidad del disco actual " -"así como del nombre guardado." +"Una herramienta de depuración para informar de la identidad del disco actual " +"así como del nombre del fichero guardado." #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:61 -#, fuzzy msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present. <placeholder type=\"variablelist" "\" id=\"0\"/>" msgstr "" -"A menos que se de una de las opciones <option>-h</option>, o <option>--help</" -"option> una de las siguientes órdenes deben de estar presentes." +"Se debe proporcionar alguna de las siguientes órdenes, a menos que se " +"proporcione una de las opciones <option>-h</option> o <option>--help</" +"option>. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> #: apt-cdrom.8.xml:91 apt-key.8.xml:139 -#, fuzzy msgid "Options" msgstr "Opciones" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 -#, fuzzy +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:95 -#, fuzzy msgid "<option>--cdrom</option>" msgstr "<option>--cdrom</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:96 -#, fuzzy msgid "" "Mount point; specify the location to mount the cdrom. This mount point must " "be listed in <filename>/etc/fstab</filename> and properly configured. " "Configuration Item: <literal>Acquire::cdrom::mount</literal>." msgstr "" -"Punto de montaje. Especifica el lugar donde se debe montar el cdrom. Este " -"punto de montaje debe estar listado en <filename>/etc/fstab</filename> y " -"configurado correctamente. Opción de Configuración: <literal>Acquire::cdrom::" +"Punto de montaje. Define el lugar donde se debe montar el disco óptico. El " +"punto de montaje debe aparecer en <filename>/etc/fstab</filename> y estar " +"correctamente configurado. Opción de configuración: <literal>Acquire::cdrom::" "mount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:104 -#, fuzzy msgid "<option>-r</option>" msgstr "<option>-r</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:104 -#, fuzzy msgid "<option>--rename</option>" msgstr "<option>--rename</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:105 -#, fuzzy msgid "" "Rename a disc; change the label of a disk or override the disks given label. " "This option will cause <command>apt-cdrom</command> to prompt for a new " "label. Configuration Item: <literal>APT::CDROM::Rename</literal>." msgstr "" -"Renombrar un disco. Cambia la etiqueta de un disco. Esta opción hará que " -"<command>apt-cdrom</command> pregunte una nueva etiqueta. Opción de " -"Configuración: <literal>APT::CDROM::Rename</literal>." +"Renombra un disco. Cambia la etiqueta de un disco o invalida la etiqueta del " +"disco. Esta opción hará que <command>apt-cdrom</command> solicite una " +"etiqueta nueva. Opción de configuración: <literal>APT::CDROM::Rename</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:113 apt-get.8.xml:347 -#, fuzzy msgid "<option>-m</option>" msgstr "<option>-m</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:113 -#, fuzzy msgid "<option>--no-mount</option>" msgstr "<option>--no-mount</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:114 -#, fuzzy msgid "" "No mounting; prevent <command>apt-cdrom</command> from mounting and " "unmounting the mount point. Configuration Item: <literal>APT::CDROM::" "NoMount</literal>." msgstr "" "No montar. Evita que <command>apt-cdrom</command> monte y desmonte el punto " -"de montaje. Opción de Configuración: <literal>APT::CDROM::NoMount</literal>." +"de montaje. Opción de configuración: <literal>APT::CDROM::NoMount</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:121 -#, fuzzy msgid "<option>--fast</option>" msgstr "<option>--fast</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:122 -#, fuzzy msgid "" "Fast Copy; Assume the package files are valid and do not check every " "package. This option should be used only if <command>apt-cdrom</command> has " "been run on this disc before and did not detect any errors. Configuration " "Item: <literal>APT::CDROM::Fast</literal>." msgstr "" -"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</" -"command> comprobó el disco con anterioridad y no detectó ningún error. " -"Opción de Configuración: <literal>APT::CDROM::Fast</literal>." +"Crea una copia rápida. Asume que los ficheros de paquete son válidos y no " +"comprueba cada paquete. Esta opción sólo se debe usar si <command>apt-cdrom</" +"command> comprobó el disco anteriormente y no detectó ningún error. Opción " +"de configuración: <literal>APT::CDROM::Fast</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:131 -#, fuzzy msgid "<option>--thorough</option>" msgstr "<option>--thorough</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:132 -#, fuzzy msgid "" "Thorough Package Scan; This option may be needed with some old Debian " "1.1/1.2 discs that have Package files in strange places. It takes much " "longer to scan the CD but will pick them all up." msgstr "" "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." +"algunos discos viejos de Debian 1.1/1.2, que tienen los ficheros de paquete " +"en lugares extraños. El análisis del disco óptico lleva mucho más tiempo, " +"pero encontrará todo el contenido." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:140 apt-get.8.xml:378 -#, fuzzy msgid "<option>--just-print</option>" msgstr "<option>--just-print</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:141 apt-get.8.xml:380 -#, fuzzy msgid "<option>--recon</option>" msgstr "<option>--recon</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cdrom.8.xml:142 apt-get.8.xml:381 -#, fuzzy msgid "<option>--no-act</option>" msgstr "<option>--no-act</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:143 -#, fuzzy msgid "" "No Changes; Do not change the &sources-list; file and do not write index " "files. Everything is still checked however. Configuration Item: " "<literal>APT::CDROM::NoAct</literal>." msgstr "" -"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</literal>." +"Sin cambios. No cambia el fichero &sources-list; y no escribe los ficheros " +"de índice. Aun así, se revisará todo. Opción de configuración: <literal>APT::" +"CDROM::NoAct</literal>." #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:156 -#, fuzzy msgid "&apt-conf;, &apt-get;, &sources-list;" msgstr "&apt-conf;, &apt-get;, &sources-list;" #. type: Content of: <refentry><refsect1><para> #: apt-cdrom.8.xml:161 -#, fuzzy msgid "" "<command>apt-cdrom</command> returns zero on normal operation, decimal 100 " "on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-cdrom</command> devuelve cero si no hay ningún error y el valor " +"100 en caso de error." #. type: Content of: <refentry><refnamediv><refname> #: apt-config.8.xml:22 apt-config.8.xml:29 -#, fuzzy msgid "apt-config" -msgstr "apt-cdrom" +msgstr "apt-config" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-config.8.xml:30 -#, fuzzy msgid "APT Configuration Query program" -msgstr "Programa para la consulta de configuración de APT" +msgstr "Programa para consultar la configuración de APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-config.8.xml:36 -#, fuzzy msgid "" "<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" "o=<replaceable>config string</replaceable></option></arg> <arg><option>-" "c=<replaceable>file</replaceable></option></arg> <group choice=\"req\"> " "<arg>shell</arg> <arg>dump</arg> </group>" msgstr "" -"<cmdsynopsis sepchar=\" \">\n" -"<command>apt-get</command>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvs</option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " -"configuración</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" -"replaceable></option></arg>" +"<command>apt-config</command> <arg><option>-hv</option></arg> <arg><option>-" +"o=<replaceable>cadena-de-configuración</replaceable></option></arg> " +"<arg><option>-c=<replaceable>fichero</replaceable></option></arg> <group " +"choice=\"req\"> <arg>shell</arg> <arg>dump</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:48 -#, fuzzy msgid "" "<command>apt-config</command> is an internal program used by various " "portions of the APT suite to provide consistent configurability. It accesses " "the main configuration file <filename>/etc/apt/apt.conf</filename> in a " "manner that is easy to use by scripted applications." msgstr "" -"<command>apt-config</command> 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</filename> de forma que sea fácil de usar por " -"scripts." +"<command>apt-config</command> es un programa interno que usan varios " +"programas del conjunto de herramientas de APT para ofrecer un método de " +"configuración sólido. Este programa accede al fichero principal de " +"configuración <filename>/etc/apt/apt.conf</filename> de forma que resulta " +"sencillo de usar por aplicaciones con scripts." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 -#, fuzzy +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." msgstr "" -"A menos que se de una de las opciones <option>-h</option>, o <option>--help</" -"option> una de las siguientes órdenes deben de estar presentes." +"Se debe proporcionar alguna de las siguientes órdenes, a menos que se " +"proporcione una de las opciones <option>-h</option> o <option>--help</" +"option>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-config.8.xml:58 -#, fuzzy msgid "shell" msgstr "shell" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:60 -#, fuzzy msgid "" "shell is used to access the configuration information from a shell script. " "It is given pairs of arguments, the first being a shell variable and the " @@ -2294,103 +2385,95 @@ msgid "" "shell assignments commands for each present value. In a shell script it " "should be used like:" msgstr "" -"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:" +"Se usa para acceder a la información de la configuración mediante un script. " +"Se proporcionan parejas de argumentos, el primero es una variable del " +"intérprete de órdenes y el segundo el valor de la configuración a consultar. " +"Como salida muestra una serie de listas de órdenes asignadas al intérprete " +"de órdenes para cada valor presente. Ésto se debería usar de la siguiente " +"manera en un script:" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><informalexample><programlisting> #: apt-config.8.xml:68 -#, fuzzy, no-wrap +#, no-wrap msgid "" "OPTS=\"-f\"\n" "RES=`apt-config shell OPTS MyApp::options`\n" "eval $RES\n" msgstr "" -"<programlisting>\n" "OPTS=\"-f\"\n" -"RES=`apt-config shell OPTS MyApp::Options`\n" +"RES=`apt-config shell OPTS MiAplicación::opciones`\n" "eval $RES\n" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:73 -#, fuzzy msgid "" "This will set the shell environment variable $OPTS to the value of MyApp::" "options with a default of <option>-f</option>." msgstr "" -"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</option>." +"Esto define la variable de entorno del intérprete de órdenes $OPTS con el " +"valor de MyApp::Opciones, y con <option>-f</option> por omisión." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:77 -#, fuzzy msgid "" "The configuration item may be postfixed with a /[fdbi]. f returns file " "names, d returns directories, b returns true or false and i returns an " "integer. Each of the returns is normalized and verified internally." msgstr "" -"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." +"La opción de configuración se puede corregir posteriormente con un «/[fdbi]». " +"El parámetro «f» devuelve nombres de fichero, «d» devuelve los directorios, «b» " +"devuelve verdadero o falso, e «i» devuelve un número entero. Cada uno de los " +"valores devueltos se normaliza y se verifica internamente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-config.8.xml:86 -#, fuzzy msgid "Just show the contents of the configuration space." msgstr "Sólo muestra el contenido del espacio de configuración." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 -#, fuzzy msgid "&apt-conf;" -msgstr "apt-cdrom" +msgstr "&apt-conf;" #. type: Content of: <refentry><refsect1><para> #: apt-config.8.xml:109 -#, fuzzy msgid "" "<command>apt-config</command> returns zero on normal operation, decimal 100 " "on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-config</command> devuelve cero si no hay ningún error, y el " +"valor 100 en caso de error." #. type: Content of: <refentry><refnamediv><refname> #: apt-extracttemplates.1.xml:22 apt-extracttemplates.1.xml:29 msgid "apt-extracttemplates" -msgstr "" +msgstr "apt-extracttemplates" #. type: Content of: <refentry><refmeta><manvolnum> #: apt-extracttemplates.1.xml:23 apt-ftparchive.1.xml:23 apt-sortpkgs.1.xml:23 msgid "1" -msgstr "" +msgstr "1" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-extracttemplates.1.xml:30 msgid "Utility to extract DebConf config and templates from Debian packages" msgstr "" +"Herramienta para extraer la configuración de DebConf y las plantillas de los " +"paquetes de Debian" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-extracttemplates.1.xml:36 -#, fuzzy msgid "" "<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " "<arg><option>-t=<replaceable>temporary directory</replaceable></option></" "arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>file</replaceable></" "arg>" msgstr "" -"<cmdsynopsis sepchar=\" \">\n" -"<command>apt-cache</command>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvsn</option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " -"configuración</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" -"replaceable></option></arg>" +"<command>apt-extracttemplates</command> <arg><option>-hv</option></arg> " +"<arg><option>-t=<replaceable>directorio-temporal</replaceable></option></" +"arg> <arg choice=\"plain\" rep=\"repeat\"><replaceable>fichero</" +"replaceable></arg>" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:44 @@ -2401,11 +2484,16 @@ msgid "" "config scripts and templates, one line of output will be generated in the " "format:" msgstr "" +"<command>apt-extracttemplates</command> tomará uno o más ficheros de " +"paquetes de Debian como entrada para escribir (a un directorio temporal) " +"todos los scripts de configuración asociados y los ficheros de plantilla. " +"Para cada paquete proporcionado que contenga scripts de configuración y " +"plantillas, se generará una salida de una línea con el formato:" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:49 msgid "package version template-file config-script" -msgstr "" +msgstr "paquete versión fichero-de-plantilla script-de-configuración" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:50 @@ -2415,39 +2503,41 @@ msgid "" "literal>) directory, with filenames of the form <filename>package.template." "XXXX</filename> and <filename>package.config.XXXX</filename>" msgstr "" +"El fichero de plantilla y el script de configuración se escribirán en el " +"directorio temporal definido mediante la opción «-t» o «--" +"tempdir» (<literal>APT::ExtractTemplates::TempDir</literal>), los nombres de " +"los ficheros tendrán la forma <filename>paquete.template.XXXX</filename> y " +"<filename>paquete.config.XXXX</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 -#, fuzzy +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "<option>-t</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-extracttemplates.1.xml:60 -#, fuzzy msgid "<option>--tempdir</option>" -msgstr "<option>--compile</option>" +msgstr "<option>--tempdir</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-extracttemplates.1.xml:62 -#, fuzzy msgid "" "Temporary directory in which to write extracted debconf template files and " "config scripts. Configuration Item: <literal>APT::ExtractTemplates::" "TempDir</literal>" msgstr "" -"Sólo busca en los nombres de paquetes, no en las descripciones largas. " -"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." +"El directorio temporal en el que se escribirán los ficheros de plantillas " +"debconf y los scripts de configuración extraídos. Opción de configuración: " +"<literal>APT::ExtractTemplates::TempDir</literal>" #. type: Content of: <refentry><refsect1><para> #: apt-extracttemplates.1.xml:79 -#, fuzzy msgid "" "<command>apt-extracttemplates</command> returns zero on normal operation, " "decimal 100 on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-extracttemplates</command> devuelve cero si no hay ningún " +"error, y el valor 100 en caso de error." #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -2456,24 +2546,47 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " "August 2009</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>17 " +"de Agosto de 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-ftparchive.1.xml:22 apt-ftparchive.1.xml:29 -#, fuzzy msgid "apt-ftparchive" -msgstr "apt-cache" +msgstr "apt-ftparchive" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-ftparchive.1.xml:30 msgid "Utility to generate index files" -msgstr "" +msgstr "Herramienta para generar ficheros de índice" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o <replaceable>config</" +#| "replaceable>=<replaceable>string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2489,18 +2602,41 @@ msgid "" "\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg choice=" "\"plain\"><replaceable>config-file</replaceable></arg></arg> </group>" msgstr "" +"<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +"<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +"<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>-o <replaceable>configuración</" +"replaceable>=<replaceable>cadena</replaceable></option></arg> <arg><option>-" +"c=<replaceable>fichero</replaceable></option></arg> <group choice=\"req\"> " +"<arg>packages<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</" +"replaceable></arg><arg><replaceable>alternativo</" +"replaceable><arg><replaceable>prefijo-de-la-ruta</replaceable></arg></arg></" +"arg> <arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>ruta</" +"replaceable></arg><arg><replaceable>alternativo</" +"replaceable><arg><replaceable>prefijo-de-la-ruta</replaceable></arg></arg></" +"arg> <arg>contents <arg choice=\"plain\"><replaceable>ruta</replaceable></" +"arg></arg> <arg>release <arg choice=\"plain\"><replaceable>ruta</" +"replaceable></arg></arg> <arg>generate <arg choice=\"plain" +"\"><replaceable>fichero-de-configuración</replaceable></arg> <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>sección</replaceable></arg></arg> " +"<arg>clean <arg choice=\"plain\"><replaceable>fichero-de-configuración</" +"replaceable></arg></arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " "files should be generated on the origin site based on the content of that " "site." msgstr "" +"<command>apt-ftparchive</command> es la herramienta de la línea de órdenes " +"que genera los ficheros de índice que APT utiliza para acceder a la fuente " +"de la distribución. Los ficheros de índice se deberían generar en el sitio " +"de origen basado en el contenido de ese sitio." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2508,9 +2644,14 @@ msgid "" "<literal>contents</literal>, and an elaborate means to 'script' the " "generation process for a complete archive." msgstr "" +"<command>apt-ftparchive</command> es un superconjunto del programa &dpkg-" +"scanpackages;, e incorpora su funcionalidad al completo mediante la orden " +"<literal>packages</literal>. También contiene un generador de contenidos de " +"fichero, <literal>contents</literal>, y un modo elaborado para realizar un " +"«script» para el proceso de generación de un archivo completo." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2518,57 +2659,75 @@ msgid "" "automatically performs file-change checks and builds the desired compressed " "output files." msgstr "" +"Internamente, <command>apt-ftparchive</command> puede hacer uso de bases de " +"datos binarias para almacenar los contenidos de un fichero «.deb» y no " +"depender de ningún programa externo como &gzip;. Cuando se realiza una " +"generación completa, automáticamente realiza comprobaciones de cambios en " +"los ficheros y genera los ficheros de salida comprimidos deseados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" -msgstr "" +msgstr "packages" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " "emitting a package record to stdout for each. This command is approximately " "equivalent to &dpkg-scanpackages;." msgstr "" +"La orden «packages» genera un fichero de paquete a partir de un directorio. " +"Busca recursivamente ficheros «.deb» en el directorio proporcionado, " +"generando un registro de paquete en la salida estándar para cada uno. Esta " +"orden es casi un equivalente de &dpkg-scanpackages;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" +"La opción <option>--db</option> se puede usar para especificar una base de " +"datos binaria para la caché (registro de paquetes)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 -#, fuzzy +#: apt-ftparchive.1.xml:86 msgid "sources" -msgstr "source" +msgstr "sources" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " "for .dsc files, emitting a source record to stdout for each. This command is " "approximately equivalent to &dpkg-scansources;." msgstr "" +"La orden <literal>sources</literal> genera un fichero de índice de fuentes a " +"partir de un directorio. Toma el directorio proporcionado y busca en él " +"recursivamente ficheros «.dsc», generando un registro de fuente en la salida " +"estándar para cada uno. Esta orden es casi un equivalente de &dpkg-" +"scansources;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " "change the source override file that will be used." msgstr "" +"Si se define un fichero alternativo, se buscará un fichero de fuentes " +"alternativo con la extensión «.src». Puede usar la opción --source-override " +"para cambiar el fichero de fuentes alternativo que se usará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" -msgstr "" +msgstr "contents" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2577,14 +2736,21 @@ msgid "" "written to the output. If multiple packages own the same file then each " "package is separated by a comma in the output." msgstr "" +"La orden <literal>contents</literal> genera un fichero de contenidos a " +"partir de un directorio. Toma el directorio proporcionado y busca en él " +"recursivamente ficheros «.deb», lee la lista de ficheros para cada uno, los " +"ordena y muestra en la salida estándar la lista de ficheros que coinciden " +"con los paquetes. Los directorios no se muestran por la salida estándar. Si " +"varios paquetes tienen el mismo fichero, entonces cada paquete se separará " +"por una coma en la salida." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" -msgstr "" +msgstr "release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2592,9 +2758,14 @@ msgid "" "md5sum.txt files. It then writes to stdout a Release file containing an MD5 " "digest and SHA1 digest for each file." msgstr "" +"La orden <literal>release</literal> genera un fichero «Release» a partir de " +"un directorio. Toma el directorio proporcionado y busca en él recursivamente " +"los ficheros «Packages», «Packages.gz», «Packages.bz2», «Sources», «Sources.gz», " +"«Sources.bz2», «Release» y «md5sum.txt». Muestra en la salida estándar un " +"fichero «Release» que contiene un resumen MD5 y SHA1 para cada fichero." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2604,14 +2775,22 @@ msgid "" "literal>, <literal>Date</literal>, <literal>Architectures</literal>, " "<literal>Components</literal>, <literal>Description</literal>." msgstr "" +"Los valores para los campos de metadatos adicionales en el fichero «Release» " +"se toman de las variables correspondientes en <literal>APT::FTPArchive::" +"Release</literal>, por ejemplo <literal>APT::FTPArchive::Release::Origin</" +"literal>. Los campos permitidos son: <literal>Origin</literal>, " +"<literal>Label</literal>, <literal>Suite</literal>, <literal>Version</" +"literal>, <literal>Codename</literal>, <literal>Date</literal>, " +"<literal>Architectures</literal>, <literal>Components</literal>, " +"<literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" -msgstr "" +msgstr "generate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2619,27 +2798,35 @@ msgid "" "are built from which directories, as well as providing a simple means of " "maintaining the required settings." msgstr "" +"La orden <literal>generate</literal> se diseñó para ejecutarse desde un " +"script de cron y genera los índices de acuerdo a lo proporcionado en el " +"fichero de configuración. El lenguaje de configuración proporciona una forma " +"flexible de definir qué ficheros de índice se generarán a partir de qué " +"directorios, así como proporcionar una forma sencilla de mantener la " +"configuración necesaria." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 -#, fuzzy +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" +"La orden <literal>clean</literal> ordena las bases de datos que usa el " +"fichero de configuración proporcionado, eliminando los registros que no son " +"necesarios." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" -msgstr "" +msgstr "La configuración de «generate»" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2648,210 +2835,251 @@ msgid "" "configuration is parsed in sectional manner, but &apt-conf; is parsed in a " "tree manner. This only effects how the scope tag is handled." msgstr "" +"La orden <literal>generate</literal> usa un fichero de configuración para " +"describir los ficheros que se generarán. Sigue el típico formato de " +"configuración de ISC visto en las herramientas de ISC como bind 8 y dhcpd. " +"&apt-conf; contiene una descripción de la sintaxis. Tenga en cuenta que la " +"configuración de «generate» se analiza por sección, pero &apt-conf; se " +"analiza por árbol. Esto sólo afecta a cómo se maneja el ámbito de la " +"etiqueta." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" +"La configuración de «generate» tiene cuatro secciones diferentes, que se " +"describen a continuación." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 -#, fuzzy +#: apt-ftparchive.1.xml:158 msgid "Dir Section" -msgstr "Descripción" +msgstr "Sección Dir" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " "directories are prepended certain relative paths defined in later sections " "to produce a complete an absolute path." msgstr "" +"La sección <literal>Dir</literal> define los directorios estándar necesarios " +"para ubicar los ficheros necesarios durante el proceso de generación. A " +"estos directorios se les añaden ciertas rutas relativas definidas en " +"secciones posteriores para producir una ruta absoluta." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 -#, fuzzy +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" -msgstr "Arquitectura" +msgstr "Sección ArchiveDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " "nodes." msgstr "" +"Define la raíz del archivo FTP; en una configuración estándar de Debian éste " +"es el directorio que contiene el <filename>ls-LR</filename> y los nodos " +"«dist»." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" -msgstr "" +msgstr "Sección OverrideDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." -msgstr "" +msgstr "Define la ubicación de los ficheros alternativos." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 -#, fuzzy +#: apt-ftparchive.1.xml:177 msgid "CacheDir" -msgstr "check" +msgstr "Sección CacheDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" -msgstr "" +msgstr "Define la ubicación de los ficheros de la caché." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 -#, fuzzy +#: apt-ftparchive.1.xml:182 msgid "FileListDir" -msgstr "Ficheros" +msgstr "Sección FileListDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" +"Define la ubicación de los ficheros del listado de ficheros, si se usa " +"posteriormente el valor <literal>FileList</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" -msgstr "" +msgstr "Sección Default" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " "override these defaults with a per-section setting." msgstr "" +"La sección <literal>Default</literal> define los valores predeterminados, y " +"los ajustes que controlan la operación del generador. Otras secciones pueden " +"sobrescribir estos valores predeterminados con un valor de la sección." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" -msgstr "" +msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " "compression), 'gzip' and 'bzip2'. The default for all compression schemes is " "'. gzip'." msgstr "" +"Define los esquemas de compresión predeterminados para usar en los ficheros " +"de índice de «Package». Es una cadena que contiene una lista separada por " +"espacios de al menos uno de los siguientes valores: «.» (sin compresión), " +"«gzip» y «bzip2». El valor predeterminado para todos los esquemas de " +"compresión es «. gzip»." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" -msgstr "" +msgstr "Packages::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" +"Define la lista predeterminada de extensiones de fichero que son ficheros de " +"paquete. El valor predeterminado es «.deb»." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" -msgstr "" +msgstr "Sources::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" +"Esta opción es similar a <literal>Packages::Compress</literal> excepto que " +"controla la compresión para los ficheros «Sources»." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" -msgstr "" +msgstr "Sources::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" +"Define la lista predeterminada de las extensiones de fichero que son " +"ficheros de fuentes. El valor predeterminado es «.dsc»." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" -msgstr "" +msgstr "Contents::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" +"Esta opción es similar a <literal>Packages::Compress</literal> excepto que " +"controla la compresión para los ficheros «Contents»." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" -msgstr "" +msgstr "DeLinkLimit" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" "Links</literal> setting." msgstr "" +"Define el número de kilobytes a desenlazar (y reemplazar con enlaces duros) " +"por ejecución. Se usa junto al valor <literal>External-Links</literal> de " +"cada sección." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 -#, fuzzy +#: apt-ftparchive.1.xml:235 msgid "FileMode" -msgstr "Ficheros" +msgstr "FileMode" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" +"Define el modo de todos los ficheros de índice creados. El valor " +"predeterminado es 0644. Todos los ficheros de índice se ajustan a este modo " +"sin tener en cuenta la máscara de usuario («umask»)." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" -msgstr "" +msgstr "Sección TreeDefault" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " "$(SECTION) and $(ARCH) replaced with their respective values." msgstr "" +"Define los valores predeterminados de las secciones <literal>Tree</literal>. " +"Todas estas variables son variables de sustitución y reemplazan las cadenas " +"$(DIST), $(SECTION) y $(ARCH) con sus valores respectivos." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" -msgstr "" +msgstr "MaxContentsChange" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " "be rebuilt." msgstr "" +"Define el número de kilobytes de los ficheros de contenido que se generan " +"cada día. Los ficheros de contenido están en una cola «round-robin», de modo " +"que durante varios días todos se regenerarán." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" -msgstr "" +msgstr "ContentsAge" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2860,144 +3088,177 @@ msgid "" "is allowed in hopes that new .debs will be installed, requiring a new file " "anyhow. The default is 10, the units are in days." msgstr "" +"Controla el número de días en los que se permite comprobar un fichero de " +"contenido sin cambios. Si este límite caduca, el tiempo de modificación " +"(mtime) del fichero de contenido se actualiza. Este caso puede aparecer si " +"un fichero de paquete cambia de forma que no resulte en un fichero de " +"contenido nuevo (por ejemplo, una edición alternativa). Se permite la " +"retención con la esperanza de que se instalen nuevos «.deb», lo cual precisa " +"un fichero nuevo de todos modos. El valor predeterminado es diez, las " +"unidades usadas son días." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 -#, fuzzy +#: apt-ftparchive.1.xml:269 msgid "Directory" -msgstr "Run-Directory" +msgstr "Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" +"Define la raíz del directorio «.deb». El valor predeterminado es <filename>" +"$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 -#, fuzzy +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" -msgstr "Run-Directory" +msgstr "SrcDirectory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" +"Define la raíz del directorio de los paquetes de fuentes. El valor " +"predeterminado es <filename>$(DIST)/$(SECTION)/source/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" -msgstr "" +msgstr "Packages" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" +"Define el fichero «Packages» de salida. El valor predeterminado es <filename>" +"$(DIST)/$(SECTION)/binary-$(ARCH)/Packages</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 -#, fuzzy +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" -msgstr "Source-Symlinks" +msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 +#, fuzzy +#| msgid "" +#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" +#| "source/Sources</filename>" msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" +"Define el fichero «Packages» de salida. El valor predeterminado es <filename>" +"$(DIST)/$(SECTION)/source/Sources</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" -msgstr "" +msgstr "InternalPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" "filename>" msgstr "" +"Define el prefijo de la ruta que hace que un enlace simbólico se considere " +"un enlace interno en lugar de un enlace externo. El valor predeterminado es " +"<filename>$(DIST)/$(SECTION)/</filename>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" -msgstr "" +msgstr "Contents" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " "single Contents file (such as the default) then <command>apt-ftparchive</" "command> will integrate those package files together automatically." msgstr "" +"Define el fichero «Contents» de salida. El valor predeterminado es <filename>" +"$(DIST)/Contents-$(ARCH)</filename>. Si este valor causa que varios ficheros " +"«Packages» se relacionen en un único fichero «Contents» (el comportamiento " +"predeterminado), <command>apt-ftparchive</command> integrará automáticamente " +"esos ficheros de paquete juntos." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" -msgstr "" +msgstr "Contents::Header" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." -msgstr "" +msgstr "Define el fichero de cabecera a añadir al fichero «Contents» de salida." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 -#, fuzzy +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" -msgstr "check" +msgstr "BinCacheDB" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" +"Define la base de datos binaria de la caché para usar en esta sección. " +"Varias secciones pueden compartir la misma base de datos." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 -#, fuzzy +#: apt-ftparchive.1.xml:320 msgid "FileList" -msgstr "Ficheros" +msgstr "FileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " "Relative files names are prefixed with the archive directory." msgstr "" +"Define que <command>apt-ftparchive</command> debería leer la lista de " +"ficheros del fichero proporcionado en lugar de explorar recursivamente el " +"árbol de directorios. A los nombres de los ficheros relativos se les añade " +"como prefijo el directorio del archivo." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 -#, fuzzy +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" -msgstr "source" +msgstr "SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " "Relative files names are prefixed with the archive directory. This is used " "when processing source indexes." msgstr "" +"Define que <command>apt-ftparchive</command> debería leer la lista de " +"ficheros del fichero proporcionado en lugar de explorar recursivamente el " +"árbol de directorio. A los nombres de los ficheros relativos se les añade " +"como prefijo el directorio del archivo. Sólo se usa cuando se procesan " +"índices de fuentes." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" -msgstr "" +msgstr "Sección Tree" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3005,122 +3266,154 @@ msgid "" "pathing used is defined by the <literal>Directory</literal> substitution " "variable." msgstr "" +"La sección <literal>Tree</literal> define un árbol de un archivo de paquetes " +"Debian estándar que consiste en un directorio base, varias secciones en ese " +"directorio base y finalmente varias arquitecturas en cada sección. La ruta " +"exacta usada se define en la variable de sustitución <literal>Directory</" +"literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " "path is prefixed by <literal>ArchiveDir</literal>). Typically this is a " "setting such as <filename>dists/woody</filename>." msgstr "" +"La sección <literal>Tree</literal> toma un ámbito de una etiqueta que define " +"la variable <literal>$(DIST)</literal> y la raíz del árbol (a la ruta se le " +"añade el prefijo <literal>ArchiveDir</literal>). Normalmente esto es un " +"valor como <filename>dists/woody</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " "variables." msgstr "" +"Todos los valores definidos en la sección <literal>TreeDefault</literal> se " +"pueden usar en la sección <literal>Tree</literal>, así como tres nuevas " +"variables." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 -#, no-wrap +#: apt-ftparchive.1.xml:355 +#, fuzzy, no-wrap +#| msgid "" +#| "for i in Sections do \n" +#| " for j in Architectures do\n" +#| " Generate for DIST=scope SECTION=i ARCH=j\n" msgid "" "for i in Sections do \n" " for j in Architectures do\n" " Generate for DIST=scope SECTION=i ARCH=j\n" " " msgstr "" +"for i in Secciones do \n" +" for j in Arquitecturas do\n" +" Generar con DIST=scope SECTION=i ARCH=j\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 +#, fuzzy +#| msgid "" +#| "When processing a <literal>Tree</literal> section <command>apt-" +#| "ftparchive</command> performs an operation similar to:" msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" "\" id=\"0\"/>" msgstr "" +"Cuando se procesa una sección <literal>Tree</literal> <command>apt-" +"ftparchive</command> realiza una operación similar a la siguiente:" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 -#, fuzzy +#: apt-ftparchive.1.xml:361 msgid "Sections" -msgstr "Opciones" +msgstr "Secciones" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" "free</literal>" msgstr "" +"Es una lista de secciones separadas por espacios que aparecen bajo la " +"distribución, generalmente es similar a <literal>main contrib non-free</" +"literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 -#, fuzzy +#: apt-ftparchive.1.xml:368 msgid "Architectures" -msgstr "Arquitectura" +msgstr "Arquitecturas" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " "this tree has a source archive." msgstr "" +"Es una lista de todas las arquitecturas separadas por espacios que aparecen " +"bajo la sección de búsqueda. La arquitectura especial «source» se usa para " +"indicar que este árbol tiene un fichero de fuentes." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" -msgstr "" +msgstr "BinOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" +"Define el fichero binario alternativo. Éste contiene la información sobre la " +"sección, la prioridad y la dirección del mantenedor." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" -msgstr "" +msgstr "SrcOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" +"Define el fichero de fuentes alternativo. Éste contiene la información sobre " +"la sección." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" -msgstr "" +msgstr "ExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." -msgstr "" +msgstr "Define el fichero binario alternativo adicional." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" -msgstr "" +msgstr "SrcExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." -msgstr "" +msgstr "Define el fichero de fuentes alternativo adicional." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 -#, fuzzy +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" -msgstr "Run-Directory" +msgstr "Sección BinDirectory" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3128,66 +3421,73 @@ msgid "" "section with no substitution variables or <literal>Section</" "literal><literal>Architecture</literal> settings." msgstr "" +"La sección <literal>bindirectory</literal> define un directorio binario sin " +"ningún tipo de estructura especial. El ámbito de la etiqueta define la " +"ubicación del directorio binario, la configuración es similar a la sección " +"<literal>Tree</literal> sin sustituir las variables o la configuración de " +"<literal>Section</literal><literal>Architecture</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." -msgstr "" +msgstr "Define el fichero «Packages» de salida." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" +"Define el fichero «Sources» de salida. Es necesario al menos un fichero " +"<literal>Packages</literal> o <literal>Sources</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" -msgstr "" +msgstr "Define el fichero «Contents» de salida. (Opcional)" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." -msgstr "" +msgstr "Define el fichero binario alternativo." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." -msgstr "" +msgstr "Define el fichero de fuentes alternativo." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." -msgstr "" +msgstr "Define la base de datos de la caché." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" -msgstr "" +msgstr "PathPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." -msgstr "" +msgstr "Añade una ruta a todas las rutas de salida." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" -msgstr "" +msgstr "FileList, SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." -msgstr "" +msgstr "Define el fichero de la lista de ficheros." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" -msgstr "" +msgstr "El fichero binario alternativo" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3195,21 +3495,26 @@ msgid "" "section to force that package to and the final field is the maintainer " "permutation field." msgstr "" +"El fichero binario alternativo es totalmente compatible con &dpkg-" +"scanpackages;. Contiene cuatro campos separados por espacios. El primero es " +"el nombre del paquete, el segundo la prioridad asignada el paquete, el " +"tercero es la sección a la que se fuerza el paquete y el último es el campo " +"de permutación del mantenedor." #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" -msgstr "" +msgstr "antigua [// antigua-n]* => nueva" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" -msgstr "" +msgstr "nueva" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3218,66 +3523,78 @@ msgid "" "for the maintainer field. The second form unconditionally substitutes the " "maintainer field." msgstr "" +"La forma general del campo del mantenedor es: <placeholder type=" +"\"literallayout\" id=\"0\"/> o simplemente <placeholder type=\"literallayout" +"\" id=\"1\"/> La primera forma permite una lista separada por barras dobles " +"de las direcciones de correo electrónico antiguas a definir. Si se encuentra " +"cualquier de ellas «nueva» se sustituye por el campo del mantenedor. La " +"segunda forma sustituye de forma incondicional el campo del mantenedor." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" -msgstr "" +msgstr "El fichero de fuentes alternativo" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " "package name, the second is the section to assign it." msgstr "" +"El fichero de fuentes alternativo es totalmente compatible con &dpkg-" +"scansources;. Contiene dos campos separados por espacios. El primero es el " +"nombre del paquete fuente, el segundo es la sección a la que se asignará." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" -msgstr "" +msgstr "El fichero alternativo adicional" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " "tag and the remainder of the line is the new value." msgstr "" +"El fichero alternativo adicional permite añadir o reemplazar en la salida " +"cualquier etiqueta arbitraria. Tiene tres columnas, la primera es el " +"paquete, la segunda es la etiqueta y el resto de la línea es el nuevo valor." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 -#, fuzzy +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" -msgstr "<option>-d</option>" +msgstr "<option>--md5</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " "<literal>APT::FTPArchive::MD5</literal>" msgstr "" +"Genera una suma de control MD5. Está activado de forma predeterminada, " +"cuando se desactiva los ficheros de índices generados no tendrán los campos " +"MD5Sum cuando sea posible. Opción de configuración: <literal>APT::" +"FTPArchive::MD5</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 -#, fuzzy +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" -msgstr "<option>-d</option>" +msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 -#, fuzzy +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" -"Sólo busca en los nombres de paquetes, no en las descripciones largas. " -"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." +"Usa una base de datos binaria para la caché. Ésto no afecta a la orden " +"«generate». Opción de configuración: <literal>APT::FTPArchive::DB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 -#, fuzzy +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3285,39 +3602,36 @@ msgid "" "file. Configuration Item: <literal>quiet</literal>." msgstr "" "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=#</option> para " -"ajustar el nivel de silenciosidad, ignorando el fichero de configuración. " -"Opción de configuración: <literal>quiet</literal>." +"los indicadores de progreso. Más letras «q» producen una salida más " +"silenciosa, hasta un máximo de dos letras. Además, es posible usar <option>-" +"q=#</option> para ajustar el nivel de silencio, ignorando el fichero de " +"configuración. Opción de configuración: <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 -#, fuzzy +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" -msgstr "<option>-d</option>" +msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 -#, fuzzy +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " "and can be turned off with <option>--no-delink</option>. Configuration " "Item: <literal>APT::FTPArchive::DeLinkAct</literal>." msgstr "" -"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</option>. Opción de configuración: <literal>APT::" -"Cache::Generate</literal>." +"Realiza el desenlazado. Esta opción activa el desenlazado de los ficheros si " +"se usa la opción <literal>External-Links</literal>. Esta activa de forma " +"predeterminada y se puede desactivar mediante <option>--no-delink</option>. " +"Opción de configuración: <literal>APT::FTPArchive::DeLinkAct</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 -#, fuzzy +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" -msgstr "<option>--recon</option>" +msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3325,47 +3639,81 @@ msgid "" "option also allows the creation of any Contents files. The default is on. " "Configuration Item: <literal>APT::FTPArchive::Contents</literal>." msgstr "" +"Realiza la generación de «contents». Cuando se usa esta opción y los índices " +"de los paquetes se están generando con una base de datos de la caché, el " +"listado de los ficheros se extraerá también y se almacenará en la base de " +"datos para su uso posterior. Cuando se usa la orden «generate» esta opción " +"también permite la creación de cualquier fichero «Contents». Esta activa de " +"forma predeterminada. Opción de configuración: <literal>APT::FTPArchive::" +"Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 -#, fuzzy +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" -msgstr "<option>--force-yes</option>" +msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" "literal>." msgstr "" +"Selecciona el fichero de fuentes alternativo a usar con la orden " +"<literal>sources</literal>. Opción de configuración: <literal>APT::" +"FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 -#, fuzzy +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" -msgstr "<option>--recon</option>" +msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 -#, fuzzy +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" -"Sólo busca en los nombres de paquetes, no en las descripciones largas. " -"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." +"Define los permisos de las bases de datos de la caché como sólo lectura. " +"Opción de configuración: <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 #, fuzzy -msgid "<option>APT::FTPArchive::AlwaysStat</option>" -msgstr "<option>--all-versions</option>" +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Si la orden es <literal>install</literal> o <literal>remove</literal>, esta " +"opción se ejecutará como <literal>autoremove</literal>, eliminando los " +"paquetes que son dependencia de otro, pero que estén en desuso. Opción de " +"configuración: <literal>APT::Get::AutomaticRemove</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +#, fuzzy +#| msgid "<option>APT::FTPArchive::LongDescription</option>" +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3377,13 +3725,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 -#, fuzzy +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" -msgstr "<option>--all-versions</option>" +msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3391,36 +3738,42 @@ msgid "" "that it is currently not possible to create these files with <command>apt-" "ftparchive</command>." msgstr "" +"De forma predeterminada esta opción de configuración se define como " +"«<literal>true</literal>» y sólo se debería definir como «<literal>false</" +"literal>» si el archivo de paquetes generado con &apt-ftparchive; también " +"proporciona ficheros <filename>Translation</filename>. Tenga en cuenta que " +"actualmente no es posible crear esos ficheros con <command>apt-ftparchive</" +"command>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 -#, fuzzy msgid "Examples" msgstr "Ejemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" -msgstr "" +msgstr "<command>apt-ftparchive</command> packages <replaceable>directorio</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" +"Para crear un fichero «Packages» comprimido para un directorio que contenga " +"paquetes binarios («.deb»): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 -#, fuzzy +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-ftparchive</command> devuelve cero si no hay ningún error, y el " +"valor 100 en caso de error." #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -3429,20 +3782,19 @@ msgid "" "&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " "November 2008</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; &apt-email; &apt-product; <date>08 " +"de Noviembre de 2008</date>" #. type: <heading></heading> #: apt-get.8.xml:22 apt-get.8.xml:29 guide.sgml:96 -#, fuzzy msgid "apt-get" -msgstr "apt" +msgstr "apt-get" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-get.8.xml:30 -#, fuzzy msgid "APT package handling utility -- command-line interface" msgstr "" -"utilidad de manejo de paquetes APT -- interfaz en\n" -" línea de ordenes." +"Herramienta de gestión de paquetes APT -- interfaz para la línea de órdenes" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 @@ -3479,30 +3831,61 @@ msgid "" "choice='req'> <arg choice='plain'>-h</arg> <arg choice='plain'>--help</arg> " "</group> </arg> </group>" msgstr "" +"<command>apt-get</command> <arg><option>-sqdyfmubV</option></arg> <arg> " +"<option>-o= <replaceable>cadena-de-configuración</replaceable> </option> </" +"arg> <arg> <option>-c= <replaceable>fichero-de-configuración</replaceable> </" +"option> </arg> <arg> <option>-t=</option> <group choice='req'> <arg " +"choice='plain'> <replaceable>nombre-de-la-versión-objetivo</replaceable> </" +"arg> <arg choice='plain'> <replaceable>expresión-del-número-de-la-versión-" +"objetivo</replaceable> </arg> <arg choice='plain'> <replaceable>nombre-en-" +"código-de-la-versión-objetivo</replaceable> </arg> </group> </arg> <group " +"choice=\"req\"> <arg choice='plain'>update</arg> <arg " +"choice='plain'>upgrade</arg> <arg choice='plain'>dselect-upgrade</arg> <arg " +"choice='plain'>dist-upgrade</arg> <arg choice='plain'>install <arg choice=" +"\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable> <arg> <group " +"choice='req'> <arg choice='plain'> =<replaceable>versión-del-paquete</" +"replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-de-la-versión-" +"objetivo</replaceable> </arg> <arg choice='plain'> /<replaceable>nombre-en-" +"código-de-la-versión-objetivo</replaceable> </arg> </group> </arg> </arg> </" +"arg> <arg choice='plain'>remove <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>paquete</replaceable></arg></arg> <arg choice='plain'>purge " +"<arg choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></" +"arg></arg> <arg choice='plain'>source <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>paquete</replaceable> <arg> <group choice='req'> <arg " +"choice='plain'> =<replaceable>versión-del-paquete</replaceable> </arg> <arg " +"choice='plain'> /<replaceable>nombre-de-la-versión-objetivo</replaceable> </" +"arg> <arg choice='plain'> /<replaceable>nombre-en-código-de-la-versión-" +"objetivo</replaceable> </arg> </group> </arg> </arg> </arg> <arg " +"choice='plain'>build-dep <arg choice=\"plain\" rep=\"repeat" +"\"><replaceable>paquete</replaceable></arg></arg> <arg choice='plain'>check</" +"arg> <arg choice='plain'>clean</arg> <arg choice='plain'>autoclean</arg> " +"<arg choice='plain'>autoremove</arg> <arg choice='plain'> <group " +"choice='req'> <arg choice='plain'>-v</arg> <arg choice='plain'>--version</" +"arg> </group> </arg> <arg choice='plain'> <group choice='req'> <arg " +"choice='plain'>-h</arg> <arg choice='plain'>--help</arg> </group> </arg> </" +"group>" #. type: Content of: <refentry><refsect1><para> #: apt-get.8.xml:126 -#, fuzzy msgid "" "<command>apt-get</command> is the command-line tool for handling packages, " "and may be considered the user's \"back-end\" to other tools using the APT " "library. Several \"front-end\" interfaces exist, such as &dselect;, " "&aptitude;, &synaptic;, &gnome-apt; and &wajig;." msgstr "" -"<command>apt-get</command> 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." +"<command>apt-get</command> es la herramienta para la gestión de paquetes " +"desde la línea de órdenes, y se puede considerar el sistema de «bajo nivel» " +"de otras herramientas de usuario que usan la biblioteca de APT. Existen " +"varias interfaces de «alto nivel», tales como &dselect;, &aptitude;, " +"&synaptic;, &gnome-apt; y &wajig;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:135 apt-key.8.xml:124 -#, fuzzy msgid "update" msgstr "update" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:136 -#, fuzzy msgid "" "<literal>update</literal> is used to resynchronize the package index files " "from their sources. The indexes of available packages are fetched from the " @@ -3515,26 +3898,23 @@ msgid "" "as the size of the package files cannot be known in advance." msgstr "" "<literal>update</literal> 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</filename>. Por " +"desde sus fuentes. Los índices de paquetes disponibles se obtienen de los " +"lugares especificados en <filename>/etc/apt/sources.list</filename>. Por " "ejemplo, cuando se usa un archivo de Debian, esta orden descarga y analiza " "los ficheros <filename>Packages.gz</filename>, de tal forma que la " -"información acerca de nuevos paquetes pasa a estar disponible. Siempre se " -"debe realizar un <literal>update</literal> antes de un <literal>upgrade</" -"literal> o un <literal>dist-upgrade</literal>. 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." +"información acerca de los nuevos paquetes pasa a estar disponible. Siempre " +"se debe realizar un <literal>update</literal> antes de un <literal>upgrade</" +"literal> o un <literal>dist-upgrade</literal>. Tenga en cuenta que el " +"indicador de progreso será incorrecto, ya que se desconoce de antemano el " +"tamaño de los archivos de paquete." #. type: <tag></tag> #: apt-get.8.xml:147 guide.sgml:121 -#, fuzzy msgid "upgrade" msgstr "upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:148 -#, fuzzy msgid "" "<literal>upgrade</literal> is used to install the newest versions of all " "packages currently installed on the system from the sources enumerated in " @@ -3550,23 +3930,21 @@ msgstr "" "<literal>upgrade</literal> 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</filename>. Los paquetes " -"instalados con una nueva versión disponible son descargados y actualizados, " +"instalados con una nueva versión disponible se descargan y actualizan, y " "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</literal> antes para que <command>apt-get</command> sepa " -"cuales son las versiones disponibles de los paquetes." +"paquetes nuevos. Las nuevas versiones de programas instalados que no se " +"puedan actualizar sin cambiar el estado de instalación de otros paquetes no " +"se instalarán, manteniéndose la versión actual. Debe realizar un " +"<literal>update</literal> antes para que <command>apt-get</command> sepa que " +"hay nuevas versiones disponibles." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:160 -#, fuzzy msgid "dselect-upgrade" msgstr "dselect-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:161 -#, fuzzy msgid "" "<literal>dselect-upgrade</literal> is used in conjunction with the " "traditional Debian packaging front-end, &dselect;. <literal>dselect-upgrade</" @@ -3575,22 +3953,20 @@ msgid "" "realize that state (for instance, the removal of old and the installation of " "new packages)." msgstr "" -"<literal>dselect-upgrade</literal> se usa junto con el tradicional " -"administrador de paquetes de Debian GNU/Linux, &dselect;. <literal>dselect-" -"upgrade</literal> recoge los cambios hechos al campo de <literal>Status</" -"literal> de los paquetes disponibles por &dselect;, y realiza las acciones " +"<literal>dselect-upgrade</literal> se usa junto al tradicional administrador " +"de paquetes de Debian, &dselect;. <literal>dselect-upgrade</literal> " +"registra los cambios que haya hecho &dselect; al campo <literal>Status</" +"literal> (estado) de los paquetes disponibles y realiza las acciones " "necesarias para que los cambios se lleven a cabo (por ejemplo, borrar " "paquetes antiguos e instalar las nuevas versiones)." #. type: <tag></tag> #: apt-get.8.xml:170 guide.sgml:140 -#, fuzzy msgid "dist-upgrade" msgstr "dist-upgrade" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:171 -#, fuzzy msgid "" "<literal>dist-upgrade</literal> in addition to performing the function of " "<literal>upgrade</literal>, also intelligently handles changing dependencies " @@ -3603,24 +3979,22 @@ msgid "" "for a mechanism for overriding the general settings for individual packages." msgstr "" "<literal>dist-upgrade</literal>, además de realizar las acciones de " -"<literal>upgrade</literal>, maneja inteligentemente los cambios de " -"dependencias debidos a nuevas versiones de paquetes, <command>apt-get</" -"command> tiene un sofisticado sistema de resolución de conflictos, si es " +"<literal>upgrade</literal>, trata inteligentemente los cambios de " +"dependencias debidos a las nuevas versiones de paquetes. <command>apt-get</" +"command> tiene un sistema «inteligente» de resolución de conflictos, y si es " "necesario tratará de actualizar los paquetes más importantes a costa de los " "menos importantes. El fichero <filename>/etc/apt/sources.list</filename> " -"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." +"contiene la lista de sitios desde los que descargar los ficheros de " +"paquetes. También puede consultar &apt-preferences; si quiere invalidar este " +"comportamiento para paquetes individuales." #. type: <tag></tag> #: apt-get.8.xml:183 guide.sgml:131 -#, fuzzy msgid "install" msgstr "install" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:185 -#, fuzzy msgid "" "<literal>install</literal> is followed by one or more packages desired for " "installation or upgrading. Each package is a package name, not a fully " @@ -3634,23 +4008,21 @@ msgid "" "a package to install. These latter features may be used to override " "decisions made by apt-get's conflict resolution system." msgstr "" -"<literal>install</literal> 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</literal>). 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</filename> 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." +"<literal>install</literal> instala o actualiza los paquetes que siguen a la " +"palabra «install». Cada paquete es un nombre de paquete, y no el nombre " +"completo del fichero del paquete (por ejemplo, en un sistema Debian GNU/" +"Linux, el argumento sería libc6, no <literal>libc6_1.9.6-2.deb</literal>). " +"Se obtendrán e instalarán todos los paquetes necesarios por los paquetes " +"especificados para la instalación. El fichero <filename>/etc/apt/sources." +"list</filename> se usa para ubicar los paquetes. Si antepone un guión al " +"nombre del paquete (sin ningún espacio) el paquete se desinstalará en vez de " +"instalar. De forma similar, el signo de suma se puede usar para especificar " +"que un paquete se debe instalar. Estas últimas características se pueden " +"usar para invalidar las decisiones tomadas por el sistema de resolución de " +"conflictos de apt-get." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:203 -#, fuzzy msgid "" "A specific version of a package can be selected for installation by " "following the package name with an equals and the version of the package to " @@ -3659,22 +4031,22 @@ msgid "" "package name with a slash and the version of the distribution or the Archive " "name (stable, testing, unstable)." msgstr "" -"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)." +"Puede seleccionar una versión especifica de un paquete poniendo a " +"continuación del nombre del paquete un símbolo igual («=») seguido de la " +"versión deseada. Esto provocará que se localice y seleccione esa versión " +"para su instalación. Alternativamente se puede seleccionar una distribución " +"específica poniendo a continuación del nombre del paquete una barra («/») " +"seguida de la versión de la distribución o su nombre en el archivo de Debian " +"(stable, testing, unstable)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:210 -#, fuzzy msgid "" "Both of the version selection mechanisms can downgrade packages and must be " "used with care." msgstr "" "Cualquiera de estos dos métodos de selección puede instalar una versión " -"anterior de los paquetes y debe ser usada con cuidado." +"anterior de los paquetes y se debe usar con cuidado." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:213 @@ -3687,20 +4059,25 @@ msgid "" "you wish to upgrade, and if a newer version is available, it (and its " "dependencies, as described above) will be downloaded and installed." msgstr "" +"Esto también es el objetivo a usar si quiere actualizar uno o más paquetes " +"instalados sin actualizar todos los paquetes del sistema. A diferencia del " +"objetivo de «upgrade», que instala la versión más nueva de todos los paquetes " +"instalados, «install» instalará la versión más nueva sólo de los paquetes " +"especificados. Simplemente proporcione el nombre de los paquetes que quiere " +"actualizar, y si una versión más nueva está disponible ésta (y sus " +"dependencias, como se describió anteriormente) se descargarán e instalarán." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:224 -#, fuzzy msgid "" "Finally, the &apt-preferences; mechanism allows you to create an alternative " "installation policy for individual packages." msgstr "" -"Finalmente, &apt-preferences; permite modificar las normas de selección para " +"Por último, &apt-preferences; permite modificar las normas de selección para " "paquetes individuales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:228 -#, fuzzy msgid "" "If no package matches the given expression and the expression contains one " "of '.', '?' or '*' then it is assumed to be a POSIX regular expression, and " @@ -3710,24 +4087,22 @@ msgid "" "expression with a '^' or '$' character, or create a more specific regular " "expression." msgstr "" -"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 " +"Si ningún paquete coincide con la expresión proporcionada 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 se aplica 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." +"manera que «lo.*» es válido para «how-lo» y para «lowest». Si este no es el " +"comportamiento deseado, debe anclar la expresión regular con un «^» o un «$», " +"o bien crear una expresión regular más específica." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:237 -#, fuzzy msgid "remove" msgstr "remove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:238 -#, fuzzy msgid "" "<literal>remove</literal> is identical to <literal>install</literal> except " "that packages are removed instead of installed. Note the removing a package " @@ -3736,39 +4111,35 @@ msgid "" "installed instead of removed." msgstr "" "<literal>remove</literal> se comporta del mismo modo que <literal>install</" -"literal> 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." +"literal> con la diferencia de que elimina los paquetes en vez de " +"instalarlos. Tenga en cuenta que al eliminar un paquete sus ficheros de " +"configuración se quedan en el sistema. Si un signo de suma 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." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:245 msgid "purge" -msgstr "" +msgstr "purge" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:246 -#, fuzzy msgid "" "<literal>purge</literal> is identical to <literal>remove</literal> except " "that packages are removed and purged (any configuration files are deleted " "too)." msgstr "" -"<literal>remove</literal> se comporta del mismo modo que <literal>install</" -"literal> 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." +"<literal>purge</literal> es idéntico a <literal>remove</literal>, con la " +"diferencia de que los paquetes se eliminarán y purgarán (se eliminará " +"también cualquier fichero de configuración)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:250 -#, fuzzy msgid "source" msgstr "source" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:251 -#, fuzzy msgid "" "<literal>source</literal> causes <command>apt-get</command> to fetch source " "packages. APT will examine the available packages to decide which source " @@ -3778,17 +4149,13 @@ msgid "" "literal>, the <option>-t</option> option or per package with the " "<literal>pkg/release</literal> syntax, if possible." msgstr "" -"<literal>source</literal> hace que <command>apt-get</command> 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</literal> 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á." +"<literal>source</literal> hace que <command>apt-get</command> descargue los " +"paquetes fuente. APT examinará los paquetes disponibles para decidir qué " +"paquete fuente descargará. Entonces descargará la versión más reciente del " +"paquete fuente en el directorio actual respetando la versión predeterminada, " +"que se define en la opción <literal>APT::Default-Release</literal>, la " +"opción <option>-t</option> o según el paquete con la sintaxis <literal>pkg/" +"release</literal>, si es posible." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:259 @@ -3799,6 +4166,12 @@ msgid "" "from. If you don't do this you will properly get another (newer, older or " "none) source version than the one you have installed or could install." msgstr "" +"Los paquetes fuente se registran de forma separada a los paquetes binarios " +"mediante líneas del tipo <literal>deb-src</literal> en el fichero &sources-" +"list;. Esto significa que tendrá que añadir una línea como esa para cada " +"repositorio del que quiera conseguir las fuentes. Si no hace esto obtendrá " +"una versión de fuentes distinta (más nueva, vieja o ninguna) de la que tiene " +"instalada o de la que podría instalar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:266 @@ -3808,10 +4181,13 @@ msgid "" "<option>--download-only</option> is specified then the source package will " "not be unpacked." msgstr "" +"Si se especifica la opción <option>--compile</option> el paquete se " +"compilará en un binario «.deb» usando <command>dpkg-buildpackage</command>, " +"si se especifica <option>--download-only</option> el paquete fuente no se " +"desempaquetará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:271 -#, fuzzy msgid "" "A specific source version can be retrieved by postfixing the source name " "with an equals and then the version to fetch, similar to the mechanism used " @@ -3819,62 +4195,54 @@ msgid "" "name and version, implicitly enabling the <literal>APT::Get::Only-Source</" "literal> option." msgstr "" -"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. " +"Puede obtener una versión especifica de un paquete fuente insertando un " +"signo igual («=») seguido de la versión a descargar después del nombre del " +"paquete, de forma similar al método 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</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:277 -#, fuzzy msgid "" "Note that source packages are not tracked like binary packages, they exist " "only in the current directory and are similar to downloading source tar " "balls." msgstr "" -"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." +"Tenga en cuenta que los paquetes fuentes no se tratan como los binarios, " +"sólo existen en el directorio actual y es parecido a descargar los paquetes " +"tar comprimidos con las fuentes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:282 -#, fuzzy msgid "build-dep" msgstr "build-dep" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:283 -#, fuzzy msgid "" "<literal>build-dep</literal> causes apt-get to install/remove packages in an " "attempt to satisfy the build dependencies for a source package." msgstr "" "<literal>build-dep</literal> 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." +"fuente." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:287 -#, fuzzy msgid "check" msgstr "check" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:288 -#, fuzzy msgid "" "<literal>check</literal> is a diagnostic tool; it updates the package cache " "and checks for broken dependencies." msgstr "" -"<literal>check</literal> 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." +"<literal>check</literal> es una herramienta de diagnóstico, actualiza la " +"caché de paquetes y revisa la existencia de dependencias rotas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:293 -#, fuzzy msgid "" "<literal>clean</literal> clears out the local repository of retrieved " "package files. It removes everything but the lock file from " @@ -3885,22 +4253,20 @@ msgid "" "disk space." msgstr "" "<literal>clean</literal> borra totalmente el repositorio local que contiene " -"los ficheros .deb descargados. Borra todo excepto el fichero de bloqueo de " -"los directorios <filename>&cachedir;/archives/</filename> y " +"los ficheros de los paquetes descargados. Borra todo excepto el fichero de " +"bloqueo de los directorios <filename>&cachedir;/archives/</filename> y " "<filename>&cachedir;/archives/partial/</filename>. Cuando APT se usa como un " "método de &dselect;, <literal>clean</literal> se ejecuta automáticamente. Si " -"usted no usa dselect es probable que desee ejecutar <literal>apt-get clean</" +"no usa dselect es probable que desee ejecutar <literal>apt-get clean</" "literal> de vez en cuando para liberar algo de espacio en disco." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:302 -#, fuzzy msgid "autoclean" msgstr "autoclean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:303 -#, fuzzy msgid "" "Like <literal>clean</literal>, <literal>autoclean</literal> clears out the " "local repository of retrieved package files. The difference is that it only " @@ -3912,72 +4278,76 @@ msgid "" msgstr "" "Al igual que <literal>clean</literal>, <literal>autoclean</literal> 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</literal> está desactivada impedirá que se " -"borren paquetes instalados." +"borrará aquellos paquetes que ya no se pueden descargar, o que son " +"claramente inservibles. Esto permite mantener el almacén durante largos " +"periodos de tiempo sin que aumente su tamaño descontroladamente. Si la " +"opción de configuración <literal>APT::Clean-Installed</literal> está " +"desactivada impedirá que se borren los paquetes instalados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:312 -#, fuzzy msgid "autoremove" -msgstr "remove" +msgstr "autoremove" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:313 -#, fuzzy msgid "" "<literal>autoremove</literal> is used to remove packages that were " "automatically installed to satisfy dependencies for some package and that " "are no more needed." msgstr "" -"<literal>build-dep</literal> 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." +"<literal>autoremove</literal> se usa para desinstalar paquetes que se " +"instalaron automáticamente para satisfacer las dependencias de algún " +"paquete, pero que ya no son necesarios." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:323 apt-get.8.xml:429 -#, fuzzy msgid "<option>--no-install-recommends</option>" -msgstr "<option>--installed</option>" +msgstr "<option>--no-install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:324 -#, fuzzy msgid "" "Do not consider recommended packages as a dependency for installing. " "Configuration Item: <literal>APT::Install-Recommends</literal>." msgstr "" -"Sólo busca en los nombres de paquetes, no en las descripciones largas. " -"Opción de configuración: <literal>APT::Cache::NamesOnly</literal>." +"No considera los paquetes recomendados como dependencia al instalar. Opción " +"de configuración: <literal>APT::Install-Recommends</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:328 -#, fuzzy msgid "<option>--download-only</option>" msgstr "<option>--download-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:329 -#, fuzzy msgid "" "Download only; package files are only retrieved, not unpacked or installed. " "Configuration Item: <literal>APT::Get::Download-Only</literal>." msgstr "" -"Sólo descarga los ficheros con los paquetes, no los desempaqueta ni los " -"instala. Opción de Configuración: <literal>APT::Get::Download-Only</literal>." +"Sólo descarga los ficheros de los paquetes, no los desempaqueta ni los " +"instala. Opción de configuración: <literal>APT::Get::Download-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:333 -#, fuzzy msgid "<option>--fix-broken</option>" msgstr "<option>--fix-broken</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:334 #, fuzzy +#| msgid "" +#| "Fix; attempt to correct a system with broken dependencies in place. This " +#| "option, when used with install/remove, can omit any packages to permit " +#| "APT to deduce a likely solution. Any Package that are specified must " +#| "completely correct the problem. The option is sometimes necessary when " +#| "running APT for the first time; APT itself does not allow broken package " +#| "dependencies to exist on a system. It is possible that a system's " +#| "dependency structure can be so corrupt as to require manual intervention " +#| "(which usually means using &dselect; or <command>dpkg --remove</command> " +#| "to eliminate some of the offending packages). Use of this option together " +#| "with <option>-m</option> may produce an error in some situations. " +#| "Configuration Item: <literal>APT::Get::Fix-Broken</literal>." msgid "" "Fix; attempt to correct a system with broken dependencies in place. This " "option, when used with install/remove, can omit any packages to permit APT " @@ -3991,34 +4361,31 @@ msgid "" "option> may produce an error in some situations. Configuration Item: " "<literal>APT::Get::Fix-Broken</literal>." msgstr "" -"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 " +"Intenta arreglar un sistema con dependencias actualmente rotas. Si se usa " +"esta opción junto a «install»/«remove» se puede omitir cualquier paquete para " +"permitir a APT deducir una posible solución. Cualquier paquete que se " +"especifique debe corregir totalmente el problema. La opción, a veces, se " +"necesita cuando se ejecuta apt por primera vez, APT no permite que existan " "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</" -"command> para desinstalar alguno de los paquetes que crean el conflicto). El " -"uso de esta opción junto con <option>-m</option> puede producir un error en " -"algunas situaciones. Opción de Configuración: <literal>APT::Get::Fix-Broken</" -"literal>." +"intervención manual (generalmente puede ejecutar &dselect; o <command>dpkg --" +"remove</command> para desinstalar alguno de los paquetes que crean el " +"conflicto). El uso de esta opción junto con <option>-m</option> puede " +"producir un error en algunas situaciones. Opción de configuración: " +"<literal>APT::Get::Fix-Broken</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:347 -#, fuzzy msgid "<option>--ignore-missing</option>" msgstr "<option>--ignore-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:348 -#, fuzzy msgid "<option>--fix-missing</option>" msgstr "<option>--fix-missing</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:349 -#, fuzzy msgid "" "Ignore missing packages; If packages cannot be retrieved or fail the " "integrity check after retrieval (corrupted package files), hold back those " @@ -4029,36 +4396,33 @@ msgid "" "Configuration Item: <literal>APT::Get::Fix-Missing</literal>." msgstr "" "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</option> 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</" -"literal>." +"después de la descarga se encuentren dañados (ficheros de paquete " +"corruptos), estos paquetes se retienen y se continúa con el resto. Usar esta " +"opción junto con <option>-f</option> puede producir un error en algunas " +"situaciones. Si un paquete se selecciona para su instalación " +"(particularmente si se hace mediante la línea de órdenes) y no se puede " +"descargar, se le retendrá silenciosamente. Opción de configuración: " +"<literal>APT::Get::Fix-Missing</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:359 -#, fuzzy msgid "<option>--no-download</option>" msgstr "<option>--no-download</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:360 -#, fuzzy msgid "" "Disables downloading of packages. This is best used with <option>--ignore-" "missing</option> to force APT to use only the .debs it has already " "downloaded. Configuration Item: <literal>APT::Get::Download</literal>." msgstr "" "Deshabilita la descarga de paquetes. Usada junto con <option>--ignore-" -"missing</option> 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: " +"missing</option> ofrece la mejor manera de forzar a APT a usar sólo los " +"ficheros «.deb» descargados con anterioridad. Opción de configuración: " "<literal>APT::Get::Download</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:367 -#, fuzzy msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -4068,38 +4432,35 @@ msgid "" "may decided to do something you did not expect. Configuration Item: " "<literal>quiet</literal>." msgstr "" -"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=#</" -"option> 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</option>, 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</literal>." +"Produce una salida adecuada para su registro, omitiendo los indicadores de " +"progreso. Si se especifican más «q» (hasta un máximo de 2) se conseguirá una " +"salida más silenciosa. También es posible usar <option>-q=#</option> para " +"seleccionar el nivel de silencio, omitiendo el fichero de configuración. " +"Tenga en cuenta que un nivel silencioso de 2 implica <option>-y</option>, " +"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</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:377 -#, fuzzy msgid "<option>--simulate</option>" msgstr "<option>--simulate</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:379 -#, fuzzy msgid "<option>--dry-run</option>" msgstr "<option>--dry-run</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:382 -#, fuzzy msgid "" "No action; perform a simulation of events that would occur but do not " "actually change the system. Configuration Item: <literal>APT::Get::" "Simulate</literal>." msgstr "" -"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::" +"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</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> @@ -4112,17 +4473,23 @@ msgid "" "will be triggered if run as root (root should know what he is doing without " "further warnings by <literal>apt-get</literal>)." msgstr "" +"Si la simulación se ejecuta como usuario desactivará el bloqueo automático " +"(<literal>Debug::NoLocking</literal>). Si la opción <literal>APT::Get::Show-" +"User-Simulation-Note</literal> está activada (activa de forma " +"predeterminada) se mostrará un mensaje indicando que sólo es una simulación. " +"Ni se realizará «NoLocking» ni se mostrará el mensaje si se ejecuta como " +"administrador («root»), ya que debería saber lo qué está haciendo sin más " +"avisos de <literal>apt-get</literal>)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:392 -#, fuzzy msgid "" "Simulate prints out a series of lines each one representing a dpkg " "operation, Configure (Conf), Remove (Remv), Unpack (Inst). Square brackets " "indicate broken packages and empty set of square brackets meaning breaks " "that are of no consequence (rare)." msgstr "" -"La simulación muestra por pantalla una serie de líneas, cada una de las " +"La simulación muestra en la 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 " @@ -4130,25 +4497,21 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:399 -#, fuzzy msgid "<option>-y</option>" msgstr "<option>-y</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:399 -#, fuzzy msgid "<option>--yes</option>" msgstr "<option>--yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:400 -#, fuzzy msgid "<option>--assume-yes</option>" msgstr "<option>--assume-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:401 -#, fuzzy msgid "" "Automatic yes to prompts; assume \"yes\" as answer to all prompts and run " "non-interactively. If an undesirable situation, such as changing a held " @@ -4156,151 +4519,160 @@ msgid "" "essential package occurs then <literal>apt-get</literal> will abort. " "Configuration Item: <literal>APT::Get::Assume-Yes</literal>." msgstr "" -"Asume una respuesta afirmativa a todas las preguntas, de esta forma apt-get " +"Supone 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</literal> 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</" -"literal>." +"<literal>apt-get</literal> terminará sin hacer nada de producirse una " +"situación no deseada, como cambiar un paquete retenido, instalar un paquete " +"sin autenticar o desinstalar un paquete esencial. Opción de configuración: " +"<literal>APT::Get::Assume-Yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:408 -#, fuzzy msgid "<option>-u</option>" msgstr "<option>-u</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:408 -#, fuzzy msgid "<option>--show-upgraded</option>" msgstr "<option>--show-upgraded</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:409 -#, fuzzy msgid "" "Show upgraded packages; Print out a list of all packages that are to be " "upgraded. Configuration Item: <literal>APT::Get::Show-Upgraded</literal>." msgstr "" -"Muestra los paquetes que se van a actualizar. Opción de Configuración: " +"Muestra los paquetes que se van a actualizar. Opción de configuración: " "<literal>APT::Get::Show-Upgraded</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:414 -#, fuzzy msgid "<option>-V</option>" msgstr "<option>-V</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:414 -#, fuzzy msgid "<option>--verbose-versions</option>" msgstr "<option>--verbose-versions</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:415 -#, fuzzy msgid "" "Show full versions for upgraded and installed packages. Configuration Item: " "<literal>APT::Get::Show-Versions</literal>." msgstr "" -"Muestra la versión completa para los paquetes actualizados e instalados. " +"Muestra las versiones completas para los paquetes actualizados e instalados. " "Opción de configuración: <literal>APT::Get::Show-Versions</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:419 -#, fuzzy msgid "<option>-b</option>" msgstr "<option>-b</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:419 -#, fuzzy msgid "<option>--compile</option>" msgstr "<option>--compile</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:420 -#, fuzzy msgid "<option>--build</option>" msgstr "<option>--build</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:421 -#, fuzzy msgid "" "Compile source packages after downloading them. Configuration Item: " "<literal>APT::Get::Compile</literal>." msgstr "" -"Descarga las fuentes y luego las compila. Opción de Configuración: " +"Descarga los paquetes fuente y luego los compila. Opción de configuración: " "<literal>APT::Get::Compile</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:425 -#, fuzzy msgid "<option>--install-recommends</option>" -msgstr "<option>--installed</option>" +msgstr "<option>--install-recommends</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:426 msgid "Also install recommended packages." -msgstr "" +msgstr "También instala los paquetes recomendados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:430 msgid "Do not install recommended packages." -msgstr "" +msgstr "No instala los paquetes recomendados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:433 -#, fuzzy msgid "<option>--ignore-hold</option>" msgstr "<option>--ignore-hold</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:434 -#, fuzzy msgid "" "Ignore package Holds; This causes <command>apt-get</command> to ignore a " "hold placed on a package. This may be useful in conjunction with " "<literal>dist-upgrade</literal> to override a large number of undesired " "holds. Configuration Item: <literal>APT::Ignore-Hold</literal>." msgstr "" -"No respeta los paquetes retenidos. Esto puede ser interesante junto con " -"<literal>dist-upgrade</literal> para no tener en cuenta un gran número de " -"paquetes en hold. Opción de Configuración: <literal>APT::Ignore-Hold</" -"literal>." +"Ignora los paquetes retenidos. Esto hace que <command>apt-get</command> " +"ignore toda retención impuesta a un paquete. Esto puede ser útil junto a " +"<literal>dist-upgrade</literal> para invalidar un gran número de paquetes " +"retenidos de manera no deseada. Opción de configuración: <literal>APT::" +"Ignore-Hold</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:440 -#, fuzzy msgid "<option>--no-upgrade</option>" msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:441 -#, fuzzy msgid "" "Do not upgrade packages; When used in conjunction with <literal>install</" "literal>, <literal>no-upgrade</literal> will prevent packages on the command " "line from being upgraded if they are already installed. Configuration Item: " "<literal>APT::Get::Upgrade</literal>." msgstr "" -"No actualiza los paquetes. Cuando se usa juntamente con <literal>install</" -"literal>, <literal>no-upgrade</literal> 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</literal>." +"No actualiza los paquetes. Cuando se usa junto a <literal>install</literal>, " +"<literal>no-upgrade</literal> evita que se actualicen los paquetes listados " +"en la línea de órdenes si ya están instalados. Opción de configuración: " +"<literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 #, fuzzy -msgid "<option>--force-yes</option>" -msgstr "<option>--force-yes</option>" +#| msgid "<option>--no-upgrade</option>" +msgid "<option>--only-upgrade</option>" +msgstr "<option>--no-upgrade</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 #, fuzzy +#| msgid "" +#| "Do not upgrade packages; When used in conjunction with <literal>install</" +#| "literal>, <literal>no-upgrade</literal> will prevent packages on the " +#| "command line from being upgraded if they are already installed. " +#| "Configuration Item: <literal>APT::Get::Upgrade</literal>." +msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" +"No actualiza los paquetes. Cuando se usa junto a <literal>install</literal>, " +"<literal>no-upgrade</literal> evita que se actualicen los paquetes listados " +"en la línea de órdenes si ya están instalados. Opción de configuración: " +"<literal>APT::Get::Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "<option>--force-yes</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4309,20 +4681,19 @@ msgid "" "<literal>APT::Get::force-yes</literal>." msgstr "" "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</literal> puede destruir su sistema! Opción " -"de Configuración: <literal>APT::Get::force-yes</literal>." +"peligrosa que hará que apt continúe sin preguntar incluso si se va a " +"realizar algo potencialmente peligroso. No se debe usar excepto en " +"situaciones muy especiales. ¡Usar <literal>force-yes</literal> puede " +"destruir su sistema! Opción de configuración: <literal>APT::Get::force-yes</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 -#, fuzzy +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 -#, fuzzy +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4333,62 +4704,64 @@ msgid "" "to decompress any compressed files. Configuration Item: <literal>APT::Get::" "Print-URIs</literal>." msgstr "" -"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</literal> y " +"Muestra las URI de los ficheros a instalar en vez de descargarlos. Cada URI " +"contiene la dirección de dónde se obtendrá el paquete, el fichero de " +"destino, su tamaño y el resumen MD5 esperado. Tenga en cuenta que el nombre " +"de fichero no siempre coincide con el nombre del fichero en el sitio remoto. " +"Esto también funciona con las órdenes <literal>source</literal> y " "<literal>update</literal>. Cuando se usa con la orden <literal>update</" -"literal>, 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</literal>." +"literal> no se incluyen ni el resumen MD5 ni el tamaño, y es tarea del " +"usuario descomprimir cualquier fichero comprimido. Opción de configuración: " +"<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 -#, fuzzy +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 #, fuzzy +#| msgid "" +#| "Use purge instead of remove for anything that would be removed. An " +#| "asterisk (\"*\") will be displayed next to packages which are scheduled " +#| "to be purged. <option>remove --purge</option> is equivalent for " +#| "<option>purge</option> command. Configuration Item: <literal>APT::Get::" +#| "Purge</literal>." msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " "<option>remove --purge</option> is equivalent to the <option>purge</option> " "command. Configuration Item: <literal>APT::Get::Purge</literal>." msgstr "" -"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</literal>." +"Usa «purge» (purgar) en lugar de «remove» para todo aquello que se desinstale. " +"Un asterisco («*») aparecerá a continuación de los paquetes que se vayan a " +"purgar. <option>remove --purge</option> es equivalente a la orden " +"<option>purge</option>. Opción de configuración: <literal>APT::Get::Purge</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 -#, fuzzy +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 -#, fuzzy +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" "Reinstala los paquetes ya instalados, incluso si son la última versión " -"disponible del paquete. Opción de Configuración: <literal>APT::Get::" +"disponible del paquete. Opción de configuración: <literal>APT::Get::" "ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 -#, fuzzy +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 -#, fuzzy +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4397,29 +4770,26 @@ msgid "" "change your source list. Configuration Item: <literal>APT::Get::List-" "Cleanup</literal>." msgstr "" -"Esta opción está activada por omisión, si quiere desactivarla use <literal>--" -"no-list-cleanup</literal>. Cuando está activada <command>apt-get</command> " -"administra automáticamente los contenidos de <filename>&statedir;/lists</" -"filename> 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</" -"literal>." +"Esta opción está activada de forma predeterminada, si quiere desactivarla " +"use <literal>--no-list-cleanup</literal>. Cuando está activada <command>apt-" +"get</command> administrará automáticamente los contenidos de " +"<filename>&statedir;/lists</filename> para asegurarse de que se borran los " +"ficheros obsoletos. La única razón para desactivarla es si realiza " +"frecuentemente cambios en la lista de fuentes. Opción de configuración: " +"<literal>APT::Get::List-Cleanup</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 -#, fuzzy +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 -#, fuzzy +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 -#, fuzzy +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4431,80 +4801,75 @@ msgid "" "option>. Configuration Item: <literal>APT::Default-Release</literal>; see " "also the &apt-preferences; manual page." msgstr "" -"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*'</option> " -"o <option>-t unstable</option>. Opción de configuración: <literal>APT::" -"Default-Release</literal>. Vea además la página del manual de &apt-" -"preferences;." +"Esta opción controla la entrada predeterminada del motor de directrices, " +"creando un anclaje («pin») con una prioridad 990 usando la cadena de " +"caracteres de la distribución especificada. Esto invalida la configuración " +"general de <filename>/etc/apt/preferences</filename>. Aquellos paquetes con " +"un anclaje específico no se verán afectados por el valor de esta opción. " +"Resumiendo, esta opción le da control sobre la distribución de la que se " +"obtienen los paquetes. Algunos ejemplos comunes pueden ser <option>-t " +"'2.1*'</option> o <option>-t unstable</option> o <option>-t sid</option>. " +"Opción de configuración: <literal>APT::Default-Release</literal>. Vea " +"también la página del manual de &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 -#, fuzzy +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 -#, fuzzy +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" "option> will answer yes to any prompt, <option>--trivial-only</option> will " "answer no. Configuration Item: <literal>APT::Get::Trivial-Only</literal>." msgstr "" -"Sólo realiza acciones consideradas triviales. Esta opción está relacionada " -"con <option>--assume-yes</option>, donde <option>--assume-yes</option> " -"responderá afirmativamente a cualquier pregunta, <option>--trivial-only</" -"option> responderá negativamente. Opción de configuración: <literal>APT::" -"Get::Trivial-Only</literal>." +"Sólo realiza acciones consideradas «triviales». Esta opción está relacionada " +"con <option>--assume-yes</option> de modo que dónde <option>--assume-yes</" +"option> responde afirmativamente a cualquier pregunta, <option>--trivial-" +"only</option> responderá negativamente. Opción de configuración: " +"<literal>APT::Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 -#, fuzzy +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 -#, fuzzy +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" -"Si algún paquete va a ser desinstalado apt-get termina inmediatamente. " -"Opción de Configuración: <literal>APT::Get::Remove</literal>" +"Si se va a desinstalar algún paquete, apt-get terminará inmediatamente sin " +"preguntar. Opción de configuración: <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 -#, fuzzy +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" -msgstr "<option>--no-remove</option>" +msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 -#, fuzzy +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " "command, removing the unused dependency packages. Configuration Item: " "<literal>APT::Get::AutomaticRemove</literal>." msgstr "" -"No actualiza los paquetes. Cuando se usa juntamente con <literal>install</" -"literal>, <literal>no-upgrade</literal> 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</literal>." +"Si la orden es <literal>install</literal> o <literal>remove</literal>, esta " +"opción se ejecutará como <literal>autoremove</literal>, eliminando los " +"paquetes que son dependencia de otro, pero que estén en desuso. Opción de " +"configuración: <literal>APT::Get::AutomaticRemove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 -#, fuzzy +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 -#, fuzzy +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4514,53 +4879,48 @@ msgid "" "corresponding source package. Configuration Item: <literal>APT::Get::Only-" "Source</literal>." msgstr "" -"Sólo tiene sentido para la orden <literal>source</literal>. 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</literal> 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</literal>" +"Sólo tiene sentido para las órdenes <literal>source</literal> y " +"<literal>build-dep</literal>. Indica que los nombres de paquetes fuente " +"proporcionados no se deben tratar a través de la tabla de binarios. Esto " +"significa que si se especifica esta opción, estas órdenes sólo aceptarán " +"como argumento nombres de paquetes fuente, en vez de aceptar nombres de " +"paquetes binarios, para luego buscar el nombre del paquete fuente " +"correspondiente. Opción de configuración: <literal>APT::Get::Only-Source</" +"literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 -#, fuzzy +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 -#, fuzzy +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" -msgstr "<option>--diff-only</option>" +msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 -#, fuzzy +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 -#, fuzzy +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" "literal>, and <literal>APT::Get::Tar-Only</literal>." msgstr "" -"Descarga sólo el fichero diff o tar del archivo fuente. Opciones de " -"Configuración: <literal>APT::Get::Diff-Only</literal> y <literal>APT::Get::" -"Tar-Only</literal>" +"Descarga sólo el fichero diff, dsc o tar del archivo de fuentes. Opciones de " +"configuración: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::" +"Dsc-Only</literal> y <literal>APT::Get::Tar-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 -#, fuzzy +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 -#, fuzzy +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4569,102 +4929,95 @@ msgstr "" "arquitectura. Opción de configuración: <literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 -#, fuzzy +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" -msgstr "<option>--all-names</option>" +msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 -#, fuzzy +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" "AllowUnauthenticated</literal>." msgstr "" -"Reinstala los paquetes ya instalados, incluso si son la última versión " -"disponible del paquete. Opción de Configuración: <literal>APT::Get::" -"ReInstall</literal>." +"Ignora si los paquetes no se pueden autenticar, sin generar ningún diálogo " +"sobre ello. Esto es útil para herramientas como pbuilder. Opción de " +"configuración: <literal>APT::Get::AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" +"&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " +"&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 -#, fuzzy +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" "preferences;, the APT Howto." msgstr "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " -"&apt-config;, la guía de usuario de APT en &docdir;, &apt-preferences;, el " -"Cómo de APT." +"&apt-config;, &apt-secure;, la guía de usuario de APT en &guidesdir;, &apt-" +"preferences;, el Cómo de APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 -#, fuzzy +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-get</command> devuelve cero si no hay ningún error, y el valor " +"100 en caso de error." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" -msgstr "" +msgstr "AUTORES ORIGINALES" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" -msgstr "" +msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" -msgstr "" +msgstr "AUTORES ACTUALES" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" -msgstr "" +msgstr "&apt-author.team;" #. type: Content of: <refentry><refnamediv><refname> #: apt-key.8.xml:14 apt-key.8.xml:21 -#, fuzzy msgid "apt-key" -msgstr "apt" +msgstr "apt-key" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-key.8.xml:22 -#, fuzzy msgid "APT key management utility" -msgstr "utilidad APT para administración del CDROM" +msgstr "Herramienta para gestionar las claves de APT" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-key.8.xml:28 #, fuzzy +#| msgid "" +#| "<command>apt-key</command> <arg><replaceable>command</replaceable>/</arg> " +#| "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></" +#| "option></arg>" msgid "" "<command>apt-key</command> <arg><option>--keyring <replaceable>filename</" "replaceable></option></arg> <arg><replaceable>command</replaceable></arg> " "<arg rep=\"repeat\"><option><replaceable>arguments</replaceable></option></" "arg>" msgstr "" -"<cmdsynopsis sepchar=\" \">\n" -"<command>apt-cdrom</command>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom " -"punto_de_montaje</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " -"configuración</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" -"replaceable></option></arg>" +"<command>apt-key</command> <arg><replaceable>orden</replaceable>/</arg> <arg " +"rep=\"repeat\"><option><replaceable>argumentos</replaceable></option></arg>" #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:37 @@ -4673,17 +5026,19 @@ msgid "" "authenticate packages. Packages which have been authenticated using these " "keys will be considered trusted." msgstr "" +"<command>apt-key</command> sirve para gestionar la lista de claves que APT " +"usa para autenticar paquetes. Los paquetes autenticados mediante estas " +"claves se consideran de confianza." #. type: Content of: <refentry><refsect1><title> #: apt-key.8.xml:43 msgid "Commands" -msgstr "" +msgstr "Órdenes" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:45 -#, fuzzy msgid "add <replaceable>filename</replaceable>" -msgstr "add <replaceable>fichero(s)</replaceable>" +msgstr "add <replaceable>nombre-de-fichero</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:49 @@ -4692,65 +5047,67 @@ msgid "" "<replaceable>filename</replaceable>, or standard input if " "<replaceable>filename</replaceable> is <literal>-</literal>." msgstr "" +"Añade una nueva clave a la lista de claves de confianza. Puede introducir la " +"clave mediante un fichero (<replaceable>nombre-de-fichero</replaceable>) o " +"por la entrada estándar si <replaceable>nombre-de-fichero</replaceable> es " +"<literal>-</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:57 -#, fuzzy msgid "del <replaceable>keyid</replaceable>" -msgstr "add <replaceable>fichero(s)</replaceable>" +msgstr "del <replaceable>identificador-de-la-clave</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:61 msgid "Remove a key from the list of trusted keys." -msgstr "" +msgstr "Elimina una clave de la lista de claves de confianza." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:68 -#, fuzzy msgid "export <replaceable>keyid</replaceable>" -msgstr "dotty <replaceable>paquete(s)</replaceable>" +msgstr "export <replaceable>identificador-de-la-clave</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:72 -#, fuzzy msgid "Output the key <replaceable>keyid</replaceable> to standard output." -msgstr "dotty <replaceable>paquete(s)</replaceable>" +msgstr "" +"Devuelve la clave identificada por el <replaceable>identificador-de-la-" +"clave</replaceable> por la salida estándar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:79 msgid "exportall" -msgstr "" +msgstr "exportall" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:83 msgid "Output all trusted keys to standard output." -msgstr "" +msgstr "Devuelve todas las claves de confianza por la salida estándar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:90 msgid "list" -msgstr "" +msgstr "list" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:94 msgid "List trusted keys." -msgstr "" +msgstr "Lista las claves de confianza." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:101 msgid "finger" -msgstr "" +msgstr "finger" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:105 msgid "List fingerprints of trusted keys." -msgstr "" +msgstr "Lista las huellas digitales de las claves de confianza." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:112 -#, fuzzy msgid "adv" -msgstr "add" +msgstr "adv" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:116 @@ -4758,6 +5115,8 @@ msgid "" "Pass advanced options to gpg. With adv --recv-key you can download the " "public key." msgstr "" +"Proporciona opciones avanzadas a gpg. Puede descargar la clave pública con " +"«adv --recv-key»." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:128 @@ -4765,6 +5124,8 @@ msgid "" "Update the local keyring with the keyring of Debian archive keys and removes " "from the keyring the archive keys which are no longer valid." msgstr "" +"Actualiza el registro de claves local con el registro de claves del archivo " +"Debian, y elimina del registro las claves del archivo que ya no son válidas." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:140 @@ -4776,8 +5137,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:142 #, fuzzy +#| msgid "add <replaceable>filename</replaceable>" msgid "--keyring <replaceable>filename</replaceable>" -msgstr "add <replaceable>fichero(s)</replaceable>" +msgstr "add <replaceable>nombre-de-fichero</replaceable>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:143 @@ -4797,41 +5159,40 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:158 -#, fuzzy msgid "<filename>/etc/apt/trustdb.gpg</filename>" -msgstr "<filename>/etc/apt/apt.conf</filename>" +msgstr "<filename>/etc/apt/trustdb.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:159 msgid "Local trust database of archive keys." -msgstr "" +msgstr "Base de datos local de las claves de confianza de archivos Debian" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:162 msgid "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" -msgstr "" +msgstr "<filename>/usr/share/keyrings/debian-archive-keyring.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:163 msgid "Keyring of Debian archive trusted keys." -msgstr "" +msgstr "Registro de las claves de confianza del archivo de Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:166 msgid "" "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:167 msgid "Keyring of Debian archive removed trusted keys." -msgstr "" +msgstr "Registro de las claves de confianza eliminadas del archivo de Debian." #. type: Content of: <refentry><refsect1><para> #: apt-key.8.xml:176 -#, fuzzy msgid "&apt-get;, &apt-secure;" -msgstr "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-get;, &apt-secure;" #. The last update date #. type: Content of: <refentry><refentryinfo> @@ -4840,16 +5201,18 @@ msgid "" "&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 " "August 2009</date>" msgstr "" +"&apt-author.moconnor; &apt-author.team; &apt-email; &apt-product; <date>9 de " +"Agosto de 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt-mark.8.xml:22 apt-mark.8.xml:29 msgid "apt-mark" -msgstr "" +msgstr "apt-mark" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-mark.8.xml:30 msgid "mark/unmark a package as being automatically-installed" -msgstr "" +msgstr "Marca o desmarca un paquete como instalado automáticamente" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-mark.8.xml:36 @@ -4861,6 +5224,12 @@ msgid "" "choice=\"plain\" rep=\"repeat\"><replaceable>package</replaceable></arg> </" "arg> <arg choice=\"plain\">showauto</arg> </group>" msgstr "" +" <command>apt-mark</command> <arg><option>-hv</option></arg> <arg><option>-" +"f=<replaceable>nombre-de-fichero</replaceable></option></arg> <group choice=" +"\"plain\"> <arg choice=\"plain\"> <group choice=\"req\"> <arg choice=\"plain" +"\">markauto</arg> <arg choice=\"plain\">unmarkauto</arg> </group> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>paquete</replaceable></arg> </" +"arg> <arg choice=\"plain\">showauto</arg> </group>" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:53 @@ -4868,6 +5237,8 @@ msgid "" "<command>apt-mark</command> will change whether a package has been marked as " "being automatically installed." msgstr "" +"<command>apt-mark</command> conmuta si un paquete se instaló automáticamente " +"o no." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:57 @@ -4878,11 +5249,17 @@ msgid "" "are no longer depended on by any manually installed packages, they will be " "removed by e.g. <command>apt-get</command> or <command>aptitude</command>." msgstr "" +"Cuando solicita la instalación de un paquete y como resultado de ello se " +"instalan otros paquetes para satisfacer sus dependencias, éstos se marcarán " +"como instalados automáticamente. Una vez que estos paquetes instalados " +"automáticamente ya no son necesarios para ningún paquete instalado " +"manualmente, <command>apt-get</command> o <command>aptitude</command> los " +"eliminará." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:65 msgid "markauto" -msgstr "" +msgstr "markauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:66 @@ -4891,11 +5268,14 @@ msgid "" "installed, which will cause the package to be removed when no more manually " "installed packages depend on this package." msgstr "" +"<literal>markauto</literal> se usa para marcar un paquete como instalado " +"automáticamente, lo que provocará que el paquete se elimine cuando ningún " +"paquete instalado manualmente dependa de este paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:73 msgid "unmarkauto" -msgstr "" +msgstr "unmarkauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:74 @@ -4904,11 +5284,14 @@ msgid "" "installed, which will prevent the package from being automatically removed " "if no other packages depend on it." msgstr "" +"<literal>unmarkauto</literal> se usa para marcar un paquete como instalado " +"manualmente, lo que impedirá la eliminación automática de este paquete si " +"ningún otro depende de él." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:81 msgid "showauto" -msgstr "" +msgstr "showauto" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:82 @@ -4916,12 +5299,16 @@ msgid "" "<literal>showauto</literal> is used to print a list of automatically " "installed packages with each package on a new line." msgstr "" +"<literal>showauto</literal> se usa para mostrar una lista de paquetes " +"instalados automáticamente, un paquete por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 msgid "" "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" msgstr "" +"<option>-f=<filename><replaceable>NOMBRE-DE-FICHERO</replaceable></" +"filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 @@ -4929,6 +5316,8 @@ msgid "" "<option>--file=<filename><replaceable>FILENAME</replaceable></filename></" "option>" msgstr "" +"<option>--file=<filename><replaceable>nombre-de-fichero</replaceable></" +"filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:97 @@ -4938,46 +5327,46 @@ msgid "" "<filename>extended_status</filename> in the directory defined by the " "Configuration Item: <literal>Dir::State</literal>." msgstr "" +"Escribe y lee las estadísticas de los paquetes desde " +"<filename><replaceable>nombre-de-fichero</replaceable></filename> en lugar " +"de la ubicación predeterminada, que es <filename>extended_status</filename> " +"en el directorio definido en la opción de configuración: <literal>Dir::" +"State</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:103 -#, fuzzy msgid "<option>-h</option>" -msgstr "<option>-d</option>" +msgstr "<option>-h</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:104 -#, fuzzy msgid "<option>--help</option>" -msgstr "<option>-p</option>" +msgstr "<option>--help</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:105 msgid "Show a short usage summary." -msgstr "" +msgstr "Muestra un breve resumen de uso." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:111 -#, fuzzy msgid "<option>-v</option>" -msgstr "<option>-d</option>" +msgstr "<option>-v</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:112 -#, fuzzy msgid "<option>--version</option>" -msgstr "<option>--all-versions</option>" +msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:113 msgid "Show the program version." -msgstr "" +msgstr "Muestra la versión del programa." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:124 -#, fuzzy msgid "<filename>/var/lib/apt/extended_states</filename>" -msgstr "<filename>/etc/apt/preferences</filename>" +msgstr "<filename>/var/lib/apt/extended_states</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-mark.8.xml:125 @@ -4986,33 +5375,33 @@ msgid "" "State</literal> sets the path to the <filename>extended_states</filename> " "file." msgstr "" +"Lista del estado de los paquetes instalados automáticamente. Opción de " +"configuración: <literal>Dir::State</literal> define la ruta del fichero " +"<filename>extended_states</filename>." #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:134 -#, fuzzy msgid "&apt-get;,&aptitude;,&apt-conf;" -msgstr "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-get;,&aptitude;,&apt-conf;" #. type: Content of: <refentry><refsect1><para> #: apt-mark.8.xml:138 -#, fuzzy msgid "" "<command>apt-mark</command> returns zero on normal operation, non-zero on " "error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-mark</command> devuelve cero si no hay ningún error, y el valor " +"100 en caso de error." #. type: Content of: <refentry><refnamediv><refname> #: apt-secure.8.xml:14 apt-secure.8.xml:36 -#, fuzzy msgid "apt-secure" -msgstr "apt-cache" +msgstr "apt-secure" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-secure.8.xml:37 msgid "Archive authentication support for APT" -msgstr "" +msgstr "Compatibilidad con la autenticación en el archivo para APT" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:42 @@ -5022,6 +5411,10 @@ msgid "" "packages in the archive can't be modified by people who have no access to " "the Release file signing key." msgstr "" +"Desde la versión 0.6, <command>apt</command> contiene el código que realiza " +"la comprobación de la firma del fichero «Release» para todos los archivos. " +"Esto asegura que los paquetes del archivo no se han modificado por alguien " +"sin acceso a la clave con la que se firmó el fichero «Release»." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:50 @@ -5032,6 +5425,11 @@ msgid "" "currently only warn for unsigned archives, future releases might force all " "sources to be verified before downloading packages from them." msgstr "" +"Si el paquete viene de un archivo sin una firma o con una firma de la que " +"apt no tiene su clave, el paquete se considerará no fiable y su instalación " +"provocará un gran aviso. <command>apt-get</command> actualmente sólo avisa " +"de los archivos sin firmar, las próximas versiones puede que fuercen a " +"verificar todas las fuentes antes de descargar paquetes desde ellas." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:59 @@ -5039,11 +5437,13 @@ msgid "" "The package frontends &apt-get;, &aptitude; and &synaptic; support this new " "authentication feature." msgstr "" +"Las interfaces de gestión de paquetes &apt-get;, &aptitude; y &synaptic; " +"pueden usar esta nueva funcionalidad de autenticación." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:64 msgid "Trusted archives" -msgstr "" +msgstr "Archivos de confianza" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:67 @@ -5055,6 +5455,12 @@ msgid "" "maintainer. It's the archive maintainer responsibility to ensure that the " "archive integrity is correct." msgstr "" +"La cadena de confianza desde un archivo apt a un usuario final se realiza en " +"diferentes pasos. <command>apt-secure</command> es el último paso en esta " +"cadena, confiar en un archivo no significa que los paquetes en los que se " +"confía no haya código malicioso, pero significa que se confía en el " +"mantenedor del archivo. El mantenedor del archivo es el responsable de " +"asegurar que la integridad del archivo es correcta." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:75 @@ -5064,6 +5470,10 @@ msgid "" "<command>debsign</command> (provided in the debsig-verify and devscripts " "packages respectively)." msgstr "" +"apt-secure no revisa las firmas a nivel de paquete. Si necesita herramientas " +"para realizar esto, debería ver <command>debsig-verify</command> y " +"<command>debsign</command> (proporcionados en los paquetes debsig-verify y " +"devscripts respectivamente)." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:82 @@ -5075,6 +5485,13 @@ msgid "" "Maintainer's keys are signed by other maintainers following pre-established " "procedures to ensure the identity of the key holder." msgstr "" +"La cadena de confianza de Debian comienza cuando un mantenedor sube un nuevo " +"paquete o una nueva versión de un paquete al archivo de Debian. Para que la " +"subida sea efectiva, se debe firmar con una clave de un mantenedor del " +"registro de claves de los mantenedores de Debian (disponible en el paquete " +"debian-keyring). Las claves del mantenedor se firman por otros mantenedores " +"siguiendo unos procedimientos pre-establecidos para asegurar la identidad " +"del propietario de la clave." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:92 @@ -5086,6 +5503,13 @@ msgid "" "by the archive key (which is created once a year) and distributed through " "the FTP server. This key is also on the Debian keyring." msgstr "" +"Una vez subido el paquete se comprueba y se incluye en el archivo, se " +"elimina la firma del mantenedor, se genera un resumen MD5 del paquete y se " +"coloca en el fichero «Packages». Se genera el resumen MD5 de todos los " +"ficheros de paquetes y se coloca en el fichero «Release». Entonces se firma " +"el fichero «Release» con la clave del archivo (que se crea una vez al año) y " +"se distribuye mediante un servidor FTP. Esta clave también está en el " +"registro de claves de Debian." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:102 @@ -5096,6 +5520,11 @@ msgid "" "package was checked. Now both the MD5 sum and the signature of the Release " "file are checked." msgstr "" +"Cualquier usuario final puede comprobar la firma del fichero «Release», " +"extraer el resumen MD5 de un paquete y compararlo con el resumen MD5 del " +"paquete que haya descargado. Antes de la versión 0.6, sólo se comprobaba el " +"resumen MD5 del paquete de Debian descargado. Ahora se comprueban el resumen " +"MD5 y la firma del fichero «Release»." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:109 @@ -5103,6 +5532,8 @@ msgid "" "Notice that this is distinct from checking signatures on a per package " "basis. It is designed to prevent two possible attacks:" msgstr "" +"Tenga en cuenta que esto es distinto a comprobar las firmas de cada paquete " +"individualmente. Se diseñó para prevenir dos posible ataques:" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:114 @@ -5113,6 +5544,12 @@ msgid "" "element (router, switch, etc.) or by redirecting traffic to a rogue server " "(through arp or DNS spoofing attacks)." msgstr "" +"<literal>Ataques de red «man in the middle» (persona entre medias)</literal>. " +"Sin la comprobación de las firmas, una persona malvada puede introducirse en " +"el proceso de descarga del paquete y proporcionar programas con contenido " +"malicioso para controlar un elemento de la red (enrutador, switch, etc) o " +"para redirigir el tráfico a un servidor ficticio (mediante ataques de " +"envenenamiento de arp o de DNS)." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:122 @@ -5122,6 +5559,10 @@ msgid "" "propagate malicious software to all users downloading packages from that " "host." msgstr "" +"<literal>Réplica de la red comprometida</literal>. Sin la comprobación de la " +"firma, una persona malvada puede comprometer una réplica y modificar los " +"ficheros de ésta para propagar programas con contenido malicioso a todos los " +"usuarios que descarguen paquetes de dicha réplica." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:129 @@ -5131,12 +5572,15 @@ msgid "" "sign the Release files. In any case, this mechanism can complement a per-" "package signature." msgstr "" +"Sin embargo, esto no protege de un servidor maestro de Debian (que firma los " +"paquetes) comprometido o contra una clave usada para firmar los ficheros " +"«Release» comprometida. En cualquier caso, este mecanismo puede complementar " +"una firma por paquete." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:135 -#, fuzzy msgid "User configuration" -msgstr "especificación de la URI" +msgstr "Configuración de usuario" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:137 @@ -5146,6 +5590,11 @@ msgid "" "this release will automatically provide the default Debian archive signing " "keys used in the Debian package repositories." msgstr "" +"<command>apt-key</command> es el programa que gestiona la lista de claves " +"usadas por apt. Se puede usar para añadir o eliminar claves, aunque la " +"instalación de esta versión proporciona automáticamente las claves " +"predeterminadas del archivo de Debian que se usan en los repositorios de " +"paquetes de Debian." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:144 @@ -5156,11 +5605,16 @@ msgid "" "command> so that apt can download and verify the <filename>Release.gpg</" "filename> files from the archives you have configured." msgstr "" +"Para poder añadir una clave nueva, primero necesita descargarla (debería " +"asegurarse de que está usando un canal de comunicación seguro cuando la " +"consiga), añádala con <command>apt-key</command> y ejecute <command>apt-get " +"update</command> para que apt descargue y compruebe los ficheros " +"<filename>Release.gpg</filename> de los archivos que estén configurados." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:153 msgid "Archive configuration" -msgstr "" +msgstr "Configuración del archivo" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:155 @@ -5168,6 +5622,8 @@ msgid "" "If you want to provide archive signatures in an archive under your " "maintenance you have to:" msgstr "" +"Si quiere proporcionar firmas de archivo en un archivo bajo su control tiene " +"que:" #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:160 @@ -5176,6 +5632,9 @@ msgid "" "already. You can do this by running <command>apt-ftparchive release</" "command> (provided in apt-utils)." msgstr "" +"<emphasis>Crear un fichero «Release»</emphasis>, si no existe. Para ello se " +"ejecuta <command>apt-ftparchive release</command> (proporcionado en apt-" +"utils)." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:165 @@ -5183,6 +5642,8 @@ msgid "" "<emphasis>Sign it</emphasis>. You can do this by running <command>gpg -abs -" "o Release.gpg Release</command>." msgstr "" +"<emphasis>Firmarlo</emphasis>. Para ello se ejecuta <command>gpg -abs -o " +"Release.gpg Release</command>." #. type: Content of: <refentry><refsect1><itemizedlist><listitem><para> #: apt-secure.8.xml:168 @@ -5191,6 +5652,9 @@ msgid "" "know what key they need to import in order to authenticate the files in the " "archive." msgstr "" +"<emphasis>Publicar la huella digital de la clave</emphasis>, de modo que los " +"usuarios conozcan qué clave necesitan importar para autenticar los ficheros " +"del archivo." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:175 @@ -5199,6 +5663,9 @@ msgid "" "removed) the archive maintainer has to follow the first two steps previously " "outlined." msgstr "" +"Cuando los contenidos del archivo cambien (se añadan paquetes nuevos o se " +"eliminen) el mantenedor del archivo tiene que seguir los dos primeros pasos " +"explicados anteriormente." #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:183 @@ -5206,6 +5673,8 @@ msgid "" "&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " "&debsign; &debsig-verify;, &gpg;" msgstr "" +"&apt-conf;, &apt-get;, &sources-list;, &apt-key;, &apt-ftparchive;, " +"&debsign; &debsig-verify;, &gpg;" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:187 @@ -5217,11 +5686,17 @@ msgid "" "\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >Strong " "Distribution HOWTO</ulink> by V. Alex Brennen." msgstr "" +"Para más información puede que quiera revisar el capítulo de la <ulink url=" +"\"http://www.debian.org/doc/manuals/securing-debian-howto/ch7.en.html" +"\">Infraestructura de Seguridad de Debian</ulink> del Manual de Seguridad de " +"Debian (también disponible en el paquete harden-doc) y el <ulink url=" +"\"http://www.cryptnet.net/fdp/crypto/strong_distro.html\" >COMO Fortificar " +"una Distribución</ulink> de V. Alex Brennen." #. type: Content of: <refentry><refsect1><title> #: apt-secure.8.xml:200 msgid "Manpage Authors" -msgstr "" +msgstr "Autores de la página del manual" #. type: Content of: <refentry><refsect1><para> #: apt-secure.8.xml:202 @@ -5229,35 +5704,31 @@ msgid "" "This man-page is based on the work of Javier Fernández-Sanguino Peña, Isaac " "Jones, Colin Walters, Florian Weimer and Michael Vogt." msgstr "" +"Esta página del manual se basa en el trabajo de Javier Fernández-Sanguino " +"Peña, Isaac Jones, Colin Walters, Florian Weimer y Michael Vogt." #. type: Content of: <refentry><refnamediv><refname> #: apt-sortpkgs.1.xml:22 apt-sortpkgs.1.xml:29 msgid "apt-sortpkgs" -msgstr "" +msgstr "apt-sortpkgs" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-sortpkgs.1.xml:30 msgid "Utility to sort package index files" -msgstr "" +msgstr "Herramienta para ordenar los ficheros de índice de paquetes" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-sortpkgs.1.xml:36 -#, fuzzy msgid "" "<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " "<arg><option>-o=<replaceable>config string</replaceable></option></arg> " "<arg><option>-c=<replaceable>file</replaceable></option></arg> <arg choice=" "\"plain\" rep=\"repeat\"><replaceable>file</replaceable></arg>" msgstr "" -"<cmdsynopsis sepchar=\" \">\n" -"<command>apt-cdrom</command>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-hvrmfan</option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-d=<replaceable>cdrom " -"punto_de_montaje</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-o=<replaceable>cadena de " -"configuración</replaceable></option></arg>\n" -"<arg rep=\"norepeat\" choice=\"opt\"><option>-c=<replaceable>fichero</" -"replaceable></option></arg>" +"<command>apt-sortpkgs</command> <arg><option>-hvs</option></arg> " +"<arg><option>-o=<replaceable>cadena-de-configuración</replaceable></option></" +"arg> <arg><option>-c=<replaceable>fichero</replaceable></option></arg> <arg " +"choice=\"plain\" rep=\"repeat\"><replaceable>fichero</replaceable></arg>" #. type: Content of: <refentry><refsect1><para> #: apt-sortpkgs.1.xml:45 @@ -5267,64 +5738,75 @@ msgid "" "name. It will also sort the internal fields of each record according to the " "internal sorting rules." msgstr "" +"<command>apt-sortpkgs</command> toma un fichero de índice (índice de fuentes " +"(«Source») o índice de paquetes («Package»)) y ordena los registros por nombre " +"de paquete. También ordena los campos internos de cada registro de acuerdo a " +"las reglas de ordenación internas." #. type: Content of: <refentry><refsect1><para> #: apt-sortpkgs.1.xml:51 msgid "All output is sent to stdout, the input must be a seekable file." msgstr "" +"Toda la salida se muestra por la salida estándar, la entrada debe ser un " +"fichero ubicable." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-sortpkgs.1.xml:58 -#, fuzzy msgid "<option>--source</option>" -msgstr "<option>--only-source</option>" +msgstr "<option>--source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-sortpkgs.1.xml:60 -#, fuzzy msgid "" "Use Source index field ordering. Configuration Item: <literal>APT::" "SortPkgs::Source</literal>." msgstr "" -"Descarga las fuentes y luego las compila. Opción de Configuración: " -"<literal>APT::Get::Compile</literal>." +"Ordena por el campo de índice Source. Opción de configuración: <literal>APT::" +"SortPkgs::Source</literal>." #. type: Content of: <refentry><refsect1><para> #: apt-sortpkgs.1.xml:74 -#, fuzzy msgid "" "<command>apt-sortpkgs</command> returns zero on normal operation, decimal " "100 on error." msgstr "" -"apt devuelve cero cuando no ocurre ningún error. Si hay algún error devuelve " -"el valor 100." +"<command>apt-sortpkgs</command> devuelve cero si no hay ningún error, y el " +"valor 100 en caso de error." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 +#, fuzzy +#| msgid "" +#| "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +#| "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " +#| "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-" +#| "email; &apt-product; <date>18 September 2009</date>" msgid "" "&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" "firstname> <surname>Burrows</surname> <contrib>Initial documentation of " "Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " "&apt-product; <date>16 January 2010</date>" msgstr "" +"&apt-author.jgunthorpe; &apt-author.team; <author> <firstname>Daniel</" +"firstname> <surname>Burrows</surname> <contrib>Documentación inicial de " +"Debug::*.</contrib> <email>dburrows@debian.org</email> </author> &apt-email; " +"&apt-product; <date>18 de Septiembre de 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt.conf.5.xml:28 apt.conf.5.xml:35 -#, fuzzy msgid "apt.conf" -msgstr "apt-cdrom" +msgstr "apt.conf" #. type: Content of: <refentry><refmeta><manvolnum> #: apt.conf.5.xml:29 apt_preferences.5.xml:22 sources.list.5.xml:23 msgid "5" -msgstr "" +msgstr "5" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt.conf.5.xml:36 -#, fuzzy msgid "Configuration file for APT" -msgstr "Programa para la consulta de configuración de APT" +msgstr "Fichero de configuración de APT" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:40 @@ -5360,12 +5842,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:54 -#, fuzzy msgid "" "the main configuration file specified by <literal>Dir::Etc::main</literal>" msgstr "" -"Fichero de configuración de APT. Opción de Configuración: <literal>Dir::Etc::" -"Main</literal>." #. type: Content of: <refentry><refsect1><orderedlist><listitem><para> #: apt.conf.5.xml:56 @@ -5381,7 +5860,6 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:61 -#, fuzzy msgid "" "The configuration file is organized in a tree with options organized into " "functional groups. Option specification is given with a double colon " @@ -5390,10 +5868,10 @@ msgid "" "their parent groups." msgstr "" "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</" -"literal> es un opción de la función GET del conjunto de herramientas APT. " -"Las opciones no son heredadas de sus grupos padres." +"opciones organizadas en grupos funcionales. Las opciones se proporcionan con " +"dos puntos dobles, por ejemplo <literal>APT::Get::Assume-Yes</literal> es " +"una opción de la herramienta Get, dentro del conjunto de herramientas de " +"APT. Las opciones no se heredan de sus grupos paternos." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:67 @@ -5410,10 +5888,22 @@ msgid "" "alphanumerical characters and the \"/-:._+\" characters. A new scope can be " "opened with curly braces, like:" msgstr "" +"Sintácticamente, el modelo del lenguaje de configuración es similar a las " +"herramientas de ISC como pueden ser «bind» y «dhcp». Las líneas que comienzan " +"con <literal>//</literal> se tratan como comentarios (se ignoran), así como " +"todo el texto que haya entre <literal>/*</literal> y <literal>*/</literal>, " +"igual que en los comentarios de C/C++. Cada línea tiene la forma " +"<literal>APT::Get::Assume-Yes \"true\";</literal>. El punto y coma del final " +"y las comillas son necesarias. El valor debe estar en única línea y no hay " +"posibilidad de concatenar cadenas. No puede incluir comillas internas. El " +"comportamiento de barras inversas «\\» y caracteres de escape dentro de un " +"valor no está definido y no se debería usar. Un nombre de una opción debería " +"incluir caracteres alfanuméricos y los caracteres «/-:._+». Un nuevo ámbito " +"se puede abrir con llaves, como:" #. type: Content of: <refentry><refsect1><informalexample><programlisting> #: apt.conf.5.xml:81 -#, fuzzy, no-wrap +#, no-wrap msgid "" "APT {\n" " Get {\n" @@ -5422,8 +5912,6 @@ msgid "" " };\n" "};\n" msgstr "" -"<programlisting>\n" -" \n" "APT {\n" " Get {\n" " Assume-Yes \"true\";\n" @@ -5433,30 +5921,24 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:89 -#, fuzzy msgid "" "with newlines placed to make it more readable. Lists can be created by " "opening a scope and including a single string enclosed in quotes followed by " "a semicolon. Multiple entries can be included, each separated by a semicolon." msgstr "" -"</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>" +"con nuevas líneas ubicadas para hacerlo más legible. Las listas pueden " +"crearse abriendo un nuevo ámbito e incluyendo una única cadena acotada entre " +"comillas seguida de un punto y coma. Se pueden incluir varias entradas, cada " +"una separada por un punto y coma." #. type: Content of: <refentry><refsect1><informalexample><programlisting> #: apt.conf.5.xml:94 -#, fuzzy, no-wrap +#, no-wrap msgid "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" -msgstr "" -"<programlisting>\n" -" \n" -"DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" +msgstr "DPkg::Pre-Install-Pkgs {\"/usr/sbin/dpkg-preconfigure --apt\";};\n" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:97 -#, fuzzy msgid "" "In general the sample configuration file in <filename>&docdir;examples/apt." "conf</filename> &configureindex; is a good guide for how it should look." @@ -5471,6 +5953,9 @@ msgid "" "The names of the configuration items are not case-sensitive. So in the " "previous example you could use <literal>dpkg::pre-install-pkgs</literal>." msgstr "" +"Los nombres de las opciones de configuración no diferencian mayúsculas de " +"minúsculas. De modo que en el ejemplo anterior se podría haber usado " +"<literal>dpkg::pre-install-pkgs</literal>." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:104 @@ -5481,10 +5966,14 @@ msgid "" "list. If you specify a name you can override the option as every other " "option by reassigning a new value to the option." msgstr "" +"Los nombres de las opciones de configuración son opcionales, si se define " +"una lista como se puede ver en el ejemplo anterior de <literal>DPkg::Pre-" +"Install-Pkgs</literal>. Si no se define un nombre, simplemente se añadirá " +"una nueva opción a la lista. Si se define un nombre, se puede redefinir la " +"opción como cualquier otra opción reasignando un nuevo valor a la opción." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:109 -#, fuzzy msgid "" "Two specials are allowed, <literal>#include</literal> (which is deprecated " "and not supported by alternative implementations) and <literal>#clear</" @@ -5494,11 +5983,14 @@ msgid "" "The specified element and all its descendants are erased. (Note that these " "lines also need to end with a semicolon.)" msgstr "" -"Se permiten dos valores especiales, <literal>#include</literal> y " -"<literal>#clear</literal>. <literal>#include</literal> 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</literal> se usa " -"para suprimir la lista de nombres." +"Se permiten dos valores especiales, <literal>#include</literal> (ya obsoleto " +"y no es compatible en implementaciones alternativas) y <literal>#clear</" +"literal>. <literal>#include</literal> incluirá el fichero proporcionado, a " +"menos que el final del nombre del fichero acabe en una barra, en este caso " +"se incluirá el directorio entero. <literal>#clear</literal> se usa para " +"borrar parte del árbol de configuración. El elemento especificado y sus " +"descendientes se eliminarán. (Tenga en cuenta que estas líneas también " +"necesitan acabar con punto y coma)." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:117 @@ -5509,10 +6001,14 @@ msgid "" "overridden by addressing a new value to it - lists and scopes can't be " "overridden, only cleared." msgstr "" +"La orden #clear ofrece la única manera de borrar una lista o un ámbito " +"completo. Reabrir un ámbito o el estilo de dos puntos dobles («::») descrito " +"a continuación <emphasis>no</emphasis> redefinirá las entradas escritas " +"anteriormente. Sólo las opciones se pueden redefinir asignándolas un nuevo " +"valor, las listas y los ámbitos no se pueden redefinir, sólo eliminar." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:122 -#, fuzzy msgid "" "All of the APT tools take a -o option which allows an arbitrary " "configuration directive to be specified on the command line. The syntax is a " @@ -5521,12 +6017,13 @@ msgid "" "appended too by adding a trailing :: to the list name. (As you might " "suspect: The scope syntax can't be used on the command line.)" msgstr "" -"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</literal> 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." +"Todas las herramientas de APT permiten la opción -o como una directriz " +"arbitraria de configuración que se define en la línea de órdenes. La " +"sintaxis es un nombre de opción completo (por ejemplo, <literal>APT::Get::" +"Assume-Yes</literal>) seguido por signos de igualdad y el nuevo valor de la " +"opción. También puede añadir listas añadiendo dos puntos dobles («::») al " +"final del nombre de la lista. (Como ya podía imaginar, no puede usar la " +"sintaxis de los ámbitos en la línea de órdenes)." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:129 @@ -5544,45 +6041,54 @@ msgid "" "correct such statements now as long as APT doesn't complain explicit about " "them." msgstr "" +"Tenga en cuenta que puede usar los dos puntos dobles («::») sólo para añadir " +"un elemento por línea a una lista, y que no debería usarlo en combinación " +"con la sintaxis de los ámbitos. (La sintaxis de los ámbitos inserta de forma " +"implícita los dos puntos dobles «::»). Usando ambas sintaxis juntas causará " +"un error en el que algunos usuarios caen: Una opción con el inusual nombre " +"de «<literal>::</literal>» que actúa como cualquier otra opción con un " +"nombre. Esto introduce muchos problemas; por ejemplo, un usuario que " +"escribiese varias líneas con esta sintaxis <emphasis>incorrecta</emphasis>, " +"con la esperanza de añadir a una lista conseguiría lo opuesto ya que sólo se " +"usará la última asignación de esta opción «<literal>::</literal>». Las " +"próximas versiones de APT devolverán errores y dejarán de funcionar si " +"encuentran este fallo, así que corrija estas declaraciones ahora mientras " +"APT no se queja explícitamente de ellos." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:141 -#, fuzzy msgid "The APT Group" msgstr "El grupo APT" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:142 -#, fuzzy msgid "" "This group of options controls general APT behavior as well as holding the " "options for all of the tools." msgstr "" -"Este grupo de opciones controlan la conducta general de APT así como el " -"mantenimiento de las opciones para todas las utilidades." +"Este grupo de opciones controla el comportamiento general de APT así como " +"mantiene las opciones para todas las herramientas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:146 -#, fuzzy msgid "Architecture" msgstr "Arquitectura" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:147 -#, fuzzy msgid "" "System Architecture; sets the architecture to use when fetching files and " "parsing package lists. The internal default is the architecture apt was " "compiled for." msgstr "" -"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." +"La arquitectura del sistema, define la arquitectura a usar al obtener los " +"ficheros y analizar las listas de paquetes. El valor predeterminado es la " +"arquitectura para la que apt se compiló." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:152 msgid "Default-Release" -msgstr "" +msgstr "Default-Release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:153 @@ -5592,52 +6098,82 @@ msgid "" "'testing', 'unstable', 'lenny', 'squeeze', '4.0', '5.0*'. See also &apt-" "preferences;." msgstr "" +"La versión predeterminada de la que se instalarán los paquetes, si hay más " +"de una versión disponible. Contiene el nombre de la versión, ya sea el " +"nombre en código o el número de la versión. Por ejemplo: «stable», «testing», " +"«unstable», «lenny», «squeeze», «4.0», «5.0*». Vea también &apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:157 -#, fuzzy msgid "Ignore-Hold" msgstr "Ignore-Hold" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:158 -#, fuzzy msgid "" "Ignore Held packages; This global option causes the problem resolver to " "ignore held packages in its decision making." msgstr "" -"Ignorar paquetes retenidos: Esta opción global causa que el solucionador de " -"problemas ignore paquetes retenidos cuando tome decisiones." +"Ignora paquetes retenidos, esta opción global causa que el solucionador de " +"problemas ignore los paquetes retenidos en la toma de decisiones." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:162 -#, fuzzy msgid "Clean-Installed" msgstr "Clean-Installed" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:163 -#, fuzzy msgid "" "Defaults to on. When turned on the autoclean feature will remove any " "packages which can no longer be downloaded from the cache. If turned off " "then packages that are locally installed are also excluded from cleaning - " "but note that APT provides no direct means to reinstall them." msgstr "" -"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 " +"Activo de forma predeterminada. Cuando se activa la función «autoclean», ésta " +"eliminará cualquier paquete del almacén que ya no se pueda descargar. 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." +"excluidos de la limpieza - tenga en cuenta que APT no proporciona ningún " +"mecanismo directo para reinstalarlos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:169 -#, fuzzy msgid "Immediate-Configure" msgstr "Immediate-Configure" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:170 +#, fuzzy +#| msgid "" +#| "Defaults to on which will cause APT to install essential and important " +#| "packages as fast as possible in the install/upgrade operation. This is " +#| "done to limit the effect of a failing &dpkg; call: If this option is " +#| "disabled APT does treat an important package in the same way as an extra " +#| "package: Between the unpacking of the important package A and his " +#| "configuration can then be many other unpack or configuration calls, e.g. " +#| "for package B which has no relation to A, but causes the dpkg call to " +#| "fail (e.g. because maintainer script of package B generates an error) " +#| "which results in a system state in which package A is unpacked but " +#| "unconfigured - each package depending on A is now no longer guaranteed to " +#| "work as their dependency on A is not longer satisfied. The immediate " +#| "configuration marker is also applied to all dependencies which can " +#| "generate a problem if the dependencies e.g. form a circle as a dependency " +#| "with the immediate flag is comparable with a Pre-Dependency. So in theory " +#| "it is possible that APT encounters a situation in which it is unable to " +#| "perform immediate configuration, error out and refers to this option so " +#| "the user can deactivate the immediate configuration temporary to be able " +#| "to perform an install/upgrade again. Note the use of the word \"theory\" " +#| "here as this problem was only encountered by now in real world a few " +#| "times in non-stable distribution versions and caused by wrong " +#| "dependencies of the package in question or by a system in an already " +#| "broken state, so you should not blindly disable this option as the " +#| "mentioned scenario above is not the only problem immediate configuration " +#| "can help to prevent in the first place. Before a big operation like " +#| "<literal>dist-upgrade</literal> is run with this option disabled it " +#| "should be tried to explicitly <literal>install</literal> the package APT " +#| "is unable to configure immediately, but please make sure to report your " +#| "problem also to your distribution and to the APT team with the buglink " +#| "below so they can work on improving or correcting the upgrade process." msgid "" "Defaults to on which will cause APT to install essential and important " "packages as fast as possible in the install/upgrade operation. This is done " @@ -5668,16 +6204,45 @@ msgid "" "distribution and to the APT team with the buglink below so they can work on " "improving or correcting the upgrade process." msgstr "" +"Activo de forma predeterminada, hará que APT instale los paquetes esenciales " +"e importantes tan rápido como le sea posible al instalar y/o actualizar. " +"Esto se hace para limitar el efecto de un fallo en la ejecución de &dpkg;. " +"Si esta opción está desactivada, APT trata los paquetes importantes del " +"mismo modo que un paquete adicional: entre desempaquetar un paquete " +"importante A y su configuración puede haber muchos otros desempaquetados y " +"configuraciones. Por ejemplo, el paquete B que no tiene relación con A, pero " +"que hace que la ejecución de dpkg falle (ya sea porque el script del " +"mantenedor del paquete B genera un error) generará un estado del sistema en " +"el que el paquete A está desempaquetado pero no configurado; no se garantiza " +"el funcionamiento de cada paquete que depende de A ya que su dependencia con " +"A no está satisfecha. El marcador de configuración inmediata se aplicará a " +"todas las dependencias que puedan generar un problema si las dependencias, " +"por ejemplo, forman un círculo vicioso como dependencia con la marca de " +"configuración inmediata, lo cual lo califica casi como Pre-Dependencia. Así, " +"en teoría es posible que APT encuentre una situación en la que es incapaz de " +"llevar a cabo una configuración inmediata, devuelva un error y mencione esta " +"opción para que así el usuario puede desactivar la configuración inmediata " +"temporalmente para llevar a cabo una vez más la instalación y/o " +"actualización. Observe el uso de la expresión «en teoría», ya que esta " +"situación sólo se ha visto algunas veces con versiones de distribución no " +"estables, y causadas por dependencias incorrectas del paquete en cuestión o " +"en un sistema ya roto. Por ello, no debería desactivar ciegamente esta " +"opción ya que la situación mencionada anteriormente no es el único problema " +"que la configuración inmediata puede resolver. Antes de llevar a cabo una " +"operación grande como <literal>dist-upgrade</literal> con esta opción " +"desactivada debería intentar un <literal>install</literal> explícito con el " +"paquete que APT es incapaz de configurar inmediatamente, pero asegúrese de " +"informar del fallo a su distribución y al equipo de APT mediante el enlace a " +"informes de fallo para que así puedan mejorar o corregir el proceso de " +"actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:192 -#, fuzzy msgid "Force-LoopBreak" msgstr "Force-LoopBreak" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:193 -#, fuzzy msgid "" "Never Enable this option unless you -really- know what you are doing. It " "permits APT to temporarily remove an essential package to break a Conflicts/" @@ -5686,101 +6251,89 @@ msgid "" "essential packages are not tar, gzip, libc, dpkg, bash or anything that " "those packages depend on." msgstr "" -"Nunca habilite esta opción a menos que usted -realmente- conozca lo que está " +"Nunca active esta opción a menos que usted (realmente) sepa lo que está " "haciendo. Esto permite a APT eliminar temporalmente un paquete esencial para " -"romper conflictos o bucles conflictos/pre-dependencias entre dos paquetes " +"eliminar conflictos o bucles conflicto/pre-dependencia 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." +"Esta opción funcionará si el paquete esencial no es ni tar, ni gzip, ni " +"libc, ni dpkg, ni bash, ni cualquier otro del que dependan estos paquetes." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:201 -#, fuzzy msgid "Cache-Limit" msgstr "Cache-Limit" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:202 -#, fuzzy msgid "" "APT uses a fixed size memory mapped cache file to store the 'available' " "information. This sets the size of that cache (in bytes)." msgstr "" "APT 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é." +"la información «disponible». Esto limita el tamaño de esa caché (en bytes)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:206 -#, fuzzy msgid "Build-Essential" msgstr "Build-Essential" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:207 -#, fuzzy msgid "Defines which package(s) are considered essential build dependencies." msgstr "" -"Define que paquete(s) son considerados dependencias de construcción " -"esenciales." +"Define qué paquete(s) se consideran dependencias de creación esenciales." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:210 -#, fuzzy msgid "Get" msgstr "Get" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:211 -#, fuzzy msgid "" "The Get subsection controls the &apt-get; tool, please see its documentation " "for more information about the options here." msgstr "" -"La subsección Get controla la herramienta &apt-get;, por favor, mire su " +"La subsección Get controla la herramienta &apt-get;, por favor, consulte la " "documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:215 -#, fuzzy msgid "Cache" -msgstr "check" +msgstr "Cache" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:216 -#, fuzzy msgid "" "The Cache subsection controls the &apt-cache; tool, please see its " "documentation for more information about the options here." msgstr "" -"La subsección Cache controla la herramienta &apt-cache;, por favor, mire su " -"documentación para más información sobre esta opción." +"La subsección Cache controla la herramienta &apt-cache;, por favor, consulte " +"la documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:220 -#, fuzzy msgid "CDROM" msgstr "CDROM" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:221 -#, fuzzy msgid "" "The CDROM subsection controls the &apt-cdrom; tool, please see its " "documentation for more information about the options here." msgstr "" -"La subsección CDROM controla la herramienta &apt-cdrom;, por favor, mire la " -"documentación para más información sobre esta opción." +"La subsección CDROM controla la herramienta &apt-cdrom;, por favor, consulte " +"la documentación para más información sobre esta opción." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:227 -#, fuzzy msgid "The Acquire Group" msgstr "El grupo Acquire" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:232 msgid "PDiffs" -msgstr "" +msgstr "PDiffs" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:233 @@ -5788,6 +6341,9 @@ msgid "" "Try to download deltas called <literal>PDiffs</literal> for Packages or " "Sources files instead of downloading whole ones. True by default." msgstr "" +"Intenta descargar deltas llamados <literal>PDiffs</literal> de los ficheros " +"«Packages» o «Sources» en lugar de descargarlos enteros. Es «true» de forma " +"predeterminada" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:236 @@ -5802,13 +6358,11 @@ msgstr "" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:245 -#, fuzzy msgid "Queue-Mode" msgstr "Queue-Mode" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:246 -#, fuzzy msgid "" "Queuing mode; <literal>Queue-Mode</literal> can be one of <literal>host</" "literal> or <literal>access</literal> which determines how APT parallelizes " @@ -5816,53 +6370,48 @@ msgid "" "target host will be opened, <literal>access</literal> means that one " "connection per URI type will be opened." msgstr "" -"Modo de cola; <literal>Queue-Mode</literal> puede ser <literal>host</" -"literal> o <literal>access</literal> que determina como paralelizar las " -"conexiones salientes de APT. <literal>host</literal> significa que se abrirá " -"una conexión por puesto de destino, <literal>access</literal> significa que " -"será abierta una conexión por cada tipo de URI." +"Modo de cola, <literal>Queue-Mode</literal> puede ser <literal>host</" +"literal> o <literal>access</literal>, que determina cómo paralelizará APT " +"las conexiones salientes. <literal>host</literal> significa que se abrirá " +"una conexión por máquina de destino, <literal>access</literal> significa que " +"se abrirá una conexión por cada tipo de URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:253 -#, fuzzy msgid "Retries" msgstr "Retries" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:254 -#, fuzzy msgid "" "Number of retries to perform. If this is non-zero APT will retry failed " "files the given number of times." msgstr "" -"Número de reintentos. Si es distinto de cero APT volverá a intentar obtener " -"los ficheros fallidos el número de veces dado." +"El número de reintentos a realizar. Si es distinto de cero APT volverá a " +"intentar obtener los ficheros fallidos el número de veces proporcionado." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:258 -#, fuzzy msgid "Source-Symlinks" msgstr "Source-Symlinks" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:259 -#, fuzzy msgid "" "Use symlinks for source archives. If set to true then source archives will " "be symlinked when possible instead of copying. True is the default." msgstr "" -"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." +"Usa enlaces simbólicos para los archivos fuente. Si es «true» los archivos " +"fuente se enlazarán cuando sea posible, en vez de copiarse. Es «true» de " +"forma predeterminada." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:263 sources.list.5.xml:139 -#, fuzzy msgid "http" msgstr "http" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:264 -#, fuzzy msgid "" "HTTP URIs; http::Proxy is the default http proxy to use. It is in the " "standard form of <literal>http://[[user][:pass]@]host[:port]/</literal>. Per " @@ -5871,16 +6420,16 @@ msgid "" "meaning to use no proxies. If no one of the above settings is specified, " "<envar>http_proxy</envar> environment variable will be used." msgstr "" -"HTTP URIs; http::Proxy es el proxy http predeterminado a usar. Usa el " -"formato general <literal>http://[[usuario][:clave]@]puesto[:puerto]/</" -"literal>. También se puede especificar un proxy por cada puesto usando la " -"forma <literal>http::Proxy::<puesto></literal> con la palabra especial " -"<literal>DIRECT</literal> queriendo decir que no se use proxy. La variable " -"de entorno <envar>http_proxy</envar> modifica todas las preferencias." +"HTTP URI, http::Proxy es el proxy http predeterminado a usar. Usa el formato " +"estándar <literal>http://[[usuario][:contraseña]@]máquina[:puerto]/</" +"literal>. También se puede especificar un proxy por cada máquina usando la " +"forma <literal>http::Proxy::<máquina></literal> con la palabra " +"especial <literal>DIRECT</literal> que significa que no se use ningún proxy. " +"La variable de entorno <envar>http_proxy</envar> se usará en caso de no " +"definir ninguna de las opciones anteriores." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:272 -#, fuzzy msgid "" "Three settings are provided for cache control with HTTP/1.1 compliant proxy " "caches. <literal>No-Cache</literal> tells the proxy to not use its cached " @@ -5893,31 +6442,30 @@ msgid "" "Note: Squid 2.0.2 does not support any of these options." msgstr "" "Para los proxies que cumplen con HTTP/1.1 se proporcionan tres opciones de " -"configuración. <literal>No-Cache</literal> dice al proxy que no use su caché " -"bajo ninguna circunstancia, <literal>Max-Age</literal> 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</literal> 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." +"configuración para el control de la caché. <literal>No-Cache</literal> dice " +"al proxy que no use sus respuestas almacenadas bajo ninguna circunstancia, " +"<literal>Max-Age</literal> sólo se envía para los ficheros de índice y le " +"pide a la caché que actualice sus objetos si son más antiguos que un " +"determinado número de segundos. Debian actualiza sus ficheros de índices " +"diariamente, por lo que el valor predeterminado es un día. <literal>No-" +"Store</literal> especifica que la caché nunca deberá almacenar la petición, " +"sólo está habilitada para los ficheros de los archivos de paquetes. Puede " +"ser útil para prevenir que un proxy se contamine con ficheros «.deb» muy " +"grandes. Aviso: Squid 2.0.2 no permite usar ninguna de estas opciones." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:282 apt.conf.5.xml:346 -#, fuzzy msgid "" "The option <literal>timeout</literal> sets the timeout timer used by the " "method, this applies to all things including connection timeout and data " "timeout." msgstr "" -"La opción <literal>timeout</literal> establece el tiempo máximo de espera " -"del método, esto se aplica a todo, incluyendo el tiempo de espera para " +"La opción <literal>timeout</literal> define el tiempo máximo de espera usado " +"por el método, esto se aplica a todo, incluyendo el tiempo de espera para " "realizar la conexión y para recibir datos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:285 -#, fuzzy msgid "" "One setting is provided to control the pipeline depth in cases where the " "remote server is not RFC conforming or buggy (such as Squid 2.0.2). " @@ -5927,13 +6475,13 @@ msgid "" "connections - otherwise data corruption will occur. Hosts which require this " "are in violation of RFC 2068." msgstr "" -"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 " +"Se ofrece una opción para controlar la profundidad de la tubería en casos en " +"que el servidor remoto no cumpla con la RFC o tenga fallos (como pasa con " "Squid 2.0.2). <literal>Acquire::http::Pipeline-Depth</literal> 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." +"valor entre 0 y 5, e indica cuántas peticiones sin resolver puede enviar " +"APT. DEBE especificar si la máquina remota no retrasa apropiadamente las " +"conexiones TCP, de otro modo los datos se corromperán. Las máquinas que " +"necesitan esto violan la RFC 2068." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:293 @@ -5944,6 +6492,11 @@ msgid "" "bandwidth (Note that this option implicit deactivates the download from " "multiple servers at the same time.)" msgstr "" +"El ancho de banda usado se puede limitar mediante <literal>Acquire::http::Dl-" +"Limit</literal>, que acepta valores enteros en kilobytes. El valor " +"predeterminado es cero, que desactiva el límite e intenta usar lo máximo " +"posible del ancho de banda. (Tenga en cuenta que esta opción desactiva " +"implícitamente la descarga simultánea desde varios servidores)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:298 @@ -5952,12 +6505,14 @@ msgid "" "User-Agent for the http download method as some proxies allow access for " "clients only if the client uses a known identifier." msgstr "" +"<literal>Acquire::http::User-Agent</literal> se puede usar para definir un " +"«User-Agent» distinto para la descarga http ya que algunos proxys sólo " +"permiten el acceso para clientes que usan un identificador conocido." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:304 -#, fuzzy msgid "https" -msgstr "http" +msgstr "https" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:305 @@ -5968,6 +6523,11 @@ msgid "" "not explicitly set for https. <literal>Pipeline-Depth</literal> option is " "not supported yet." msgstr "" +"HTTPS URI. Las opciones de control de «Cache», «timeout», «AllowRedirect», «Dl-" +"Limit» y del proxy son las mismas que para el método <literal>http</literal> " +"y de forma predeterminada tienen el valor de las opciones de <literal>http</" +"literal> si no están explícitamente definidas para https. La opción " +"<literal>Pipeline-Depth</literal> no se puede usar por ahora." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:311 @@ -5989,16 +6549,30 @@ msgid "" "<literal><host>::SslForceVersion</literal> is corresponding per-host " "option." msgstr "" +"La sub-opción <literal>CaInfo</literal> define el lugar del fichero que " +"contiene la información sobre los certificados de confianza. <literal><" +"host>::CaInfo</literal> corresponde a la opción por máquina. La sub-" +"opción booleana <literal>Verify-Peer</literal> define si se comprobará el " +"certificado del servidor con los certificados de confianza. <literal><" +"host>::Verify-Peer</literal> corresponde a la opción por máquina. La sub-" +"opción <literal>Verify-Host</literal> define si se comprobará el nombre del " +"servidor. <literal><host>::Verify-Host</literal> corresponde a la " +"opción por máquina. <literal>SslCert</literal> define qué certificado usar " +"para la autenticación del cliente. <literal><host>::SslCert</literal> " +"corresponde a la opción por máquina. <literal>SslKey</literal> define qué " +"clave privada usar para la autenticación del cliente. <literal><host>::" +"SslKey</literal> corresponde a la opción por máquina. " +"<literal>SslForceVersion</literal> cambia la versión de SSL a usar. Puede " +"ser «TLSv1» o «SSLv3». <literal><host>::SslForceVersion</literal> " +"corresponde a la opción por máquina." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:329 sources.list.5.xml:150 -#, fuzzy msgid "ftp" msgstr "ftp" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:330 -#, fuzzy msgid "" "FTP URIs; ftp::Proxy is the default ftp proxy to use. It is in the standard " "form of <literal>ftp://[[user][:pass]@]host[:port]/</literal>. Per host " @@ -6015,22 +6589,24 @@ msgid "" "literal> and <literal>$(SITE_PORT)</literal> Each is taken from it's " "respective URI component." msgstr "" -"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]/</literal> y se modifica mediante la variable de entorno " -"<envar>ftp_proxy</envar>. Para usar un proxy ftp es necesario establecer el " -"script <literal>ftp::ProxyLogin</literal> 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>, <literal>$(PROXY_PASS)</literal>, <literal>" -"$(SITE_USER)</literal>, <literal>$(SITE_PASS)</literal>, <literal>$(SITE)</" -"literal>, y <literal>$(SITE_PORT)</literal>. Cada una se toma del componete " -"de la URI correspondiente." +"FTP URI, ftp::Proxy es el proxy ftp predeterminado a usar. Usa el formato " +"estándar <literal>ftp://[[usuario][:contraseña]@]máquina[:puerto]/</" +"literal>. También se puede especificar un proxy por cada máquina usando la " +"forma <literal>ftp::Proxy::<máquina></literal> con la palabra especial " +"<literal>DIRECT</literal>, que significa que no se use ningún proxy. La " +"variable de entorno <envar>ftp_proxy</envar> se usará en caso de no definir " +"ninguna de las opciones anteriores. Para usar un proxy ftp debe configurar " +"el script <literal>ftp::ProxyLogin</literal> en el fichero de configuración. " +"Esta entrada define las órdenes a enviar para decirle al servidor del proxy " +"a qué conectar. Por favor, vea &configureindex; para un ejemplo de cómo " +"usarlo. Las variables de sustitución disponibles son <literal>$(PROXY_USER)</" +"literal> <literal>$(PROXY_PASS)</literal> <literal>$(SITE_USER)</literal> " +"<literal>$(SITE_PASS)</literal> <literal>$(SITE)</literal> y <literal>" +"$(SITE_PORT)</literal>, cada uno tomada de su respectivo componente de la " +"URI." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:349 -#, fuzzy msgid "" "Several settings are provided to control passive mode. Generally it is safe " "to leave passive mode on, it works in nearly every environment. However " @@ -6038,31 +6614,29 @@ msgid "" "instead. This can be done globally, for connections that go through a proxy " "or for a specific host (See the sample config file for examples)." msgstr "" -"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)." +"Puede controlar el modo pasivo a través de varias opciones. Generalmente es " +"seguro dejar activado el modo pasivo, y funciona en casi todos los entornos. " +"Sin embargo algunas situaciones requieren desactivar el modo pasivo y usar " +"el modo puerto de ftp en su lugar. Esto se puede hacer globalmente, para " +"conexiones a través de un proxy o para una máquina en concreto (vea el " +"fichero de configuración de muestra para ver algunos ejemplos)." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:356 -#, fuzzy msgid "" "It is possible to proxy FTP over HTTP by setting the <envar>ftp_proxy</" "envar> environment variable to a http url - see the discussion of the http " "method above for syntax. You cannot set this in the configuration file and " "it is not recommended to use FTP over HTTP due to its low efficiency." msgstr "" -"Es posible usar proxy FTP a través de HTTP estableciendo la variable de " -"entorno <envar>ftp_proxy</envar> 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." +"Es posible usar un proxy FTP a través de HTTP definiendo la variable de " +"entorno <envar>ftp_proxy</envar> con una dirección http. Consulte la " +"discusión anterior del método http para la sintaxis. No puede definir esto " +"en el fichero de configuración y no se recomienda el uso de ftp por encima " +"de http debido a su poca eficiencia." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:361 -#, fuzzy msgid "" "The setting <literal>ForceExtended</literal> controls the use of RFC2428 " "<literal>EPSV</literal> and <literal>EPRT</literal> commands. The default is " @@ -6071,26 +6645,25 @@ msgid "" "that most FTP servers do not support RFC2428." msgstr "" "La opción <literal>ForceExtended</literal> controla el uso de las órdenes de " -"RFC2428 <literal>EPSV</literal> y <literal>EPRT</literal>. 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." +"RFC 2428 <literal>EPSV</literal> y <literal>EPRT</literal>. De forma " +"predeterminada es «false», que significa que sólo se usa si el control de " +"conexión es IPv6. Cambiándolo a «true» fuerza su uso incluso en conexiones " +"IPv4. Tenga en cuenta que la mayoría de los servidores de FTP no son " +"compatibles con la RFC 2428." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:368 sources.list.5.xml:132 -#, fuzzy msgid "cdrom" -msgstr "apt-cdrom" +msgstr "cdrom" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:374 #, no-wrap msgid "/cdrom/::Mount \"foo\";" -msgstr "" +msgstr "/cdrom/::Mount \"algo\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:369 -#, fuzzy msgid "" "CDROM URIs; the only setting for CDROM URIs is the mount point, " "<literal>cdrom::Mount</literal> which must be the mount point for the CDROM " @@ -6101,17 +6674,20 @@ msgid "" "cdrom block. It is important to have the trailing slash. Unmount commands " "can be specified using UMount." msgstr "" -"CDROM URIs; la única opción de configuración para los CDROM es el punto de " -"montaje, <literal>cdrom::Mount</literal> debe ser el punto de montaje de la " -"unidad de CDROM tal y como se especifica en <filename>/etc/fstab</filename>. " -"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" +"CDROM URI, la única opción de configuración para las URI de CDROM es el " +"punto de montaje. <literal>cdrom::Mount</literal> debe ser el punto de " +"montaje de la unidad de CDROM tal y como se especifica en <filename>/etc/" +"fstab</filename>. Es posible proporcionar órdenes «mount» y «unmount» " +"alternativas si el punto de montaje no se puede especificar en el fichero " +"fstab (como con SMB y versiones antiguas de mount). La sintaxis consiste en " +"insertar <placeholder type=\"literallayout\" id=\"0\"/> dentro del bloque de " +"cdrom. Es importante dejar una barra al final. Puede especificar órdenes " +"para desmontar usando UMount." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:379 msgid "gpgv" -msgstr "" +msgstr "gpgv" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:380 @@ -6120,17 +6696,20 @@ msgid "" "parameters to gpgv. <literal>gpgv::Options</literal> Additional options " "passed to gpgv." msgstr "" +"GPGV URI, la única opción para las URI de GPGV es la entrega de parámetros " +"adicionales a gpgv. <literal>gpgv::Options</literal> Parámetros adicionales " +"introducidos a gpgv." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:385 msgid "CompressionTypes" -msgstr "" +msgstr "CompressionTypes" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> #: apt.conf.5.xml:391 #, no-wrap msgid "Acquire::CompressionTypes::<replaceable>FileExtension</replaceable> \"<replaceable>Methodname</replaceable>\";" -msgstr "" +msgstr "Acquire::CompressionTypes::<replaceable>extensión-del-fichero</replaceable> \"<replaceable>nombre-del-método</replaceable>\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:386 @@ -6143,18 +6722,26 @@ msgid "" "the fly or the used method can be changed. The syntax for this is: " "<placeholder type=\"synopsis\" id=\"0\"/>" msgstr "" +"Lista de los tipos de compresión que se pueden usar en los métodos de " +"«acquire». Los ficheros como <filename>Packages</filename> pueden estar " +"disponibles en varios formatos de compresión. De forma predeterminada los " +"métodos de «acquire» pueden descomprimir los ficheros comprimidos en " +"<command>bzip2</command>, <command>lzma</command> y <command>gzip</command>, " +"y con esta opción se pueden añadir más formatos en el momento, o cambiar el " +"método usado. La sintaxis para esto es: <placeholder type=\"synopsis\" id=\"0" +"\"/>" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> #: apt.conf.5.xml:396 #, no-wrap msgid "Acquire::CompressionTypes::Order:: \"gz\";" -msgstr "" +msgstr "Acquire::CompressionTypes::Order:: \"gz\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><synopsis> #: apt.conf.5.xml:399 #, no-wrap msgid "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" -msgstr "" +msgstr "Acquire::CompressionTypes::Order { \"lzma\"; \"gz\"; };" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:392 @@ -6172,12 +6759,26 @@ msgid "" "<placeholder type=\"synopsis\" id=\"1\"/> It is not needed to add " "<literal>bz2</literal> explicit to the list as it will be added automatic." msgstr "" +"El subgrupo <literal>Order</literal> también se puede usar para definir en " +"qué orden el sistema de «acquire» intentará descargar los ficheros " +"comprimidos. El sistema de «acquire» intentará el primero y, en caso de " +"error, procederá con el siguiente tipo de compresión de la lista, por lo que " +"si prefiere un tipo antes que otro sólo tiene que añadirlo a la lista el " +"primero (los tipos predeterminados no se añaden, ya que se añaden durante la " +"ejecución al final de la lista, por ejemplo: <placeholder type=\"synopsis\" " +"id=\"0\"/> se puede usar cuando se prefieran los ficheros comprimidos con " +"<command>gzip</command> antes que con <command>bzip2</command> y " +"<command>lzma</command>. Si se prefieren los comprimidos con <command>lzma</" +"command> antes que con <command>gzip</command> y <command>bzip2</command>, " +"la opción de configuración debería parecerse a esto <placeholder type=" +"\"synopsis\" id=\"1\"/> No es necesario añadir <literal>bz2</literal> a la " +"lista ya que se añadirá de forma automática." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:403 #, no-wrap msgid "Dir::Bin::bzip2 \"/bin/bzip2\";" -msgstr "" +msgstr "Dir::Bin::bzip2 \"/bin/bzip2\";" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:401 @@ -6193,6 +6794,17 @@ msgid "" "will not override the defined list, it will only prefix the list with this " "type." msgstr "" +"Tenga en cuenta que durante la ejecución se comprobará la opción " +"<literal>Dir::Bin::<replaceable>nombre-del-método</replaceable></literal>. " +"Si esta opción existe, el método sólo se usará si este fichero existe. Por " +"ejemplo: para el método bzip2 (incorporado de serie) la opción es " +"<placeholder type=\"literallayout\" id=\"0\"/> También tenga en cuenta que " +"las entradas de la lista definida en la línea de órdenes se añadirán al " +"final de la lista definida en los ficheros de configuración, pero antes que " +"las entradas predeterminadas. Para usar un tipo preferido, en este caso " +"antes que otros definidos en los ficheros de configuración, puede definir la " +"opción directamente (no en el formato de lista). Esto no sobrescribirá la " +"lista definida, sólo añadirá este tipo al principio de la lista." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:408 @@ -6203,14 +6815,29 @@ msgid "" "time false negatives. Future versions will maybe include a way to really " "prefer uncompressed files to support the usage of local mirrors." msgstr "" +"Aunque es posible añadir un tipo de compresión vacío a la lista, la versión " +"actual de APT no lo entiende correctamente y mostrará muchos avisos sobre " +"ficheros no descargados (la mayoría de estos avisos son falsos negativos). " +"Puede que las próximas versiones incluyan una forma de poder usar ficheros " +"sin comprimir de modo que se permita el uso de réplicas locales." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: apt.conf.5.xml:414 msgid "Languages" -msgstr "" +msgstr "Languages" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:415 +#, fuzzy +#| msgid "" +#| "The Languages subsection controls which <filename>Translation</filename> " +#| "files are downloaded and in which order APT tries to display the " +#| "Description-Translations. APT will try to display the first available " +#| "Description for the Language which is listed at first. Languages can be " +#| "defined with their short or long Languagecodes. Note that not all " +#| "archives provide <filename>Translation</filename> files for every " +#| "Language - especially the long Languagecodes are rare, so please inform " +#| "you which ones are available before you set here impossible values." msgid "" "The Languages subsection controls which <filename>Translation</filename> " "files are downloaded and in which order APT tries to display the Description-" @@ -6221,15 +6848,43 @@ msgid "" "long Languagecodes are rare, so please inform you which ones are available " "before you set here impossible values." msgstr "" +"La subsección «Languages» controla qué ficheros <filename>Translation</" +"filename> se descargan y en qué orden APT intentará mostrar las traducciones " +"de la descripción. APT intentará mostrar la primera descripción del idioma " +"que esté primero en la lista. Los idiomas se pueden definir con sus códigos " +"de idioma cortos o largos. Tenga en cuenta que no todos los archivos de " +"paquetes proporcionan ficheros <filename>Translation</filename> para cada " +"idioma (especialmente para los códigos de idioma largos), por lo que debería " +"informarse de cuales están disponibles antes de definir valores imposibles." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para><programlisting> #: apt.conf.5.xml:431 #, no-wrap msgid "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; };" -msgstr "" +msgstr "Acquire::Languages { \"environment\"; \"de\"; \"en\"; \"none\"; \"fr\"; }" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:421 +#, fuzzy +#| msgid "" +#| "The default list includes \"environment\" and \"en\". " +#| "\"<literal>environment</literal>\" has a special meaning here: It will be " +#| "replaced at runtime with the languagecodes extracted from the " +#| "<literal>LC_MESSAGES</literal> enviroment variable. It will also ensure " +#| "that these codes are not included twice in the list. If " +#| "<literal>LC_MESSAGES</literal> is set to \"C\" only the " +#| "<filename>Translation-en</filename> file (if available) will be used. To " +#| "force apt to use no Translation file use the setting <literal>Acquire::" +#| "Languages=none</literal>. \"<literal>none</literal>\" is another special " +#| "meaning code which will stop the search for a fitting " +#| "<filename>Translation</filename> file. This can be used by the system " +#| "administrator to let APT know that it should download also this files " +#| "without actually use them if not the environment specifies this " +#| "languages. So the following example configuration will result in the " +#| "order \"en, de\" in an english and in \"de, en\" in a german " +#| "localization. Note that \"fr\" is downloaded, but not used if APT is not " +#| "used in a french localization, in such an environment the order would be " +#| "\"fr, de, en\". <placeholder type=\"programlisting\" id=\"0\"/>" msgid "" "The default list includes \"environment\" and \"en\". " "\"<literal>environment</literal>\" has a special meaning here: It will be " @@ -6250,26 +6905,40 @@ msgid "" "order would be \"fr, de, en\". <placeholder type=\"programlisting\" id=\"0" "\"/>" msgstr "" +"La lista predeterminada incluye «environment» y «en». «<literal>environment</" +"literal>» tiene un significado especial aquí; se reemplazará durante la " +"ejecución con los códigos de idioma extraídos de la variable de entorno " +"<literal>LC_MESSAGES</literal>. También se asegurará de que estos códigos no " +"se incluyan dos veces en la lista. Si <literal>LC_MESSAGES</literal> está " +"definida con «C» sólo se usará el fichero <filename>Translation-en</filename> " +"(si está disponible). Puede usar la opción <literal>Acquire::Languages=none</" +"literal> para forzar apt a que no use ficheros «Translation» . «<literal>none</" +"literal>» es otro código especial que significa que detendrá la búsqueda de " +"un fichero <filename>Translation</filename> adecuado. El administrador del " +"sistema puede usar esto para permitir que APT sepa que debería descargar " +"estos ficheros sin tener que usarlos si no se definen en «environment». De " +"modo que la siguiente configuración de ejemplo resultará en el orden «en, de» " +"en una localización inglesa y «de, en» en una localización alemana. Tenga en " +"cuenta que «fr» se descargará, pero no se usará si APT no se usa en una " +"localización francesa de modo que la orden en este entorno («environment») " +"sería «fr, de, en». <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:228 -#, fuzzy msgid "" "The <literal>Acquire</literal> group of options controls the download of " "packages and the URI handlers. <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" "El grupo de opciones <literal>Acquire</literal> controla la descarga de " -"paquetes y los manejadores de URI." +"paquetes y los gestores de URI. <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:438 -#, fuzzy msgid "Directories" msgstr "Directorios" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:440 -#, fuzzy msgid "" "The <literal>Dir::State</literal> section has directories that pertain to " "local state information. <literal>lists</literal> is the directory to place " @@ -6279,18 +6948,17 @@ msgid "" "directory to prefix on all sub items if they do not start with <filename>/</" "filename> or <filename>./</filename>." msgstr "" -"La sección <literal>Dir::State</literal> contiene directorios que pertenecen " -"a información del estado local. <literal>lists</literal> es el directorio " -"donde se almacenan las listas de paquetes descargados y <literal>status</" -"literal> es el nombre del fichero de estado de dpkg. <literal>preferences</" -"literal> es el nombre del fichero de preferencias de APT. <literal>Dir::" -"State</literal> contiene el directorio que se usará como prefijo por omisión " -"en todas las opciones restantes en caso de que no empiezen con <filename>/</" -"filename> o <filename>./</filename>." +"La sección <literal>Dir::State</literal> contiene directorios que afectan a " +"la información de estado local. <literal>lists</literal> es el directorio en " +"el que se almacenan las listas de los paquetes descargados y " +"<literal>status</literal> es el nombre del fichero de estado de dpkg. " +"<literal>preferences</literal> es el nombre del fichero de preferencias de " +"APT. <literal>Dir::State</literal> contiene el directorio que se usará como " +"prefijo predeterminado en todos los elementos subordinados en caso de que no " +"empiecen con <filename>/</filename> ó <filename>./</filename>." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:447 -#, fuzzy msgid "" "<literal>Dir::Cache</literal> contains locations pertaining to local cache " "information, such as the two package caches <literal>srcpkgcache</literal> " @@ -6301,18 +6969,18 @@ msgid "" "pkgcache rather than the srcpkgcache. Like <literal>Dir::State</literal> the " "default directory is contained in <literal>Dir::Cache</literal>" msgstr "" -"<literal>Dir::Cache</literal> contiene lugares pertenecientes a información " -"de la caché local, como las dos cachés de paquetes <literal>srcpkgcache</" -"literal> y <literal>pkgcache</literal> o como el lugar donde se guardan los " -"ficheros descargados, <literal>Dir::Cache::archives</literal>. 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</" -"literal> el directorio predeterminado está en <literal>Dir::Cache</literal>" +"<literal>Dir::Cache</literal> contiene las ubicaciones que afectan a la " +"información de la caché local, como los dos cachés de paquetes " +"<literal>srcpkgcache</literal> y <literal>pkgcache</literal>, así como a la " +"ubicación dónde se guardan los ficheros descargados, <literal>Dir::Cache::" +"archives</literal>. La generación de cachés se puede desactivar dejando sus " +"nombres en blanco. Ésto hará que el arranque sea más lento, pero ahorrará " +"espacio. Normalmente se prefiere deshabilitar pkgcache en vez de " +"srcpkgcache. Al igual que con <literal>Dir::State</literal> el directorio " +"predeterminado está en <literal>Dir::Cache</literal>" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:456 -#, fuzzy msgid "" "<literal>Dir::Etc</literal> contains the location of configuration files, " "<literal>sourcelist</literal> gives the location of the sourcelist and " @@ -6320,28 +6988,26 @@ msgid "" "effect, unless it is done from the config file specified by " "<envar>APT_CONFIG</envar>)." msgstr "" -"<literal>Dir::Etc</literal> contiene el lugar de los ficheros de " -"configuración, <literal>sourcelist</literal> contiene el lugar de sourcelist " -"y <literal>main</literal> 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</" -"envar>)." +"<literal>Dir::Etc</literal> contiene la ubicación de los ficheros de " +"configuración, <literal>sourcelist</literal> proporciona la ubicación de " +"sourcelist y <literal>main</literal> 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 definido en " +"<envar>APT_CONFIG</envar>)." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:462 -#, fuzzy msgid "" "The <literal>Dir::Parts</literal> setting reads in all the config fragments " "in lexical order from the directory specified. After this is done then the " "main config file is loaded." msgstr "" -"La opción <literal>Dir::Parts</literal> lee en todos los fragementos de " -"configuración en orden léxico desde el directorio especificado. Después de " -"esto se carga el fichero principal de configuración." +"La opción <literal>Dir::Parts</literal> lee en todos los fragmentos de " +"ficheros de configuración en orden léxico desde el directorio especificado. " +"Al finalizar este proceso carga el fichero de configuración principal." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:466 -#, fuzzy msgid "" "Binary programs are pointed to by <literal>Dir::Bin</literal>. <literal>Dir::" "Bin::Methods</literal> specifies the location of the method handlers and " @@ -6351,11 +7017,11 @@ msgid "" "literal> specify the location of the respective programs." msgstr "" "<literal>Dir::Bin</literal> apunta a los programas binarios. <literal>Dir::" -"Bin::Methods</literal> especifica la localización de los manejadores de los " -"métodos y <literal>gzip</literal>, <literal>dpkg</literal>, <literal>apt-" -"get</literal>, <literal>dpkg-source</literal>, <literal>dpkg-buildpackage</" -"literal> y <literal>apt-cache</literal> especifican la localización de los " -"respectivos programas." +"Bin::Methods</literal> define la ubicación de los gestores de los métodos y " +"<literal>gzip</literal>, <literal>bzip2</literal>, <literal>lzma</literal>, " +"<literal>dpkg</literal>, <literal>apt-get</literal>, <literal>dpkg-source</" +"literal>, <literal>dpkg-buildpackage</literal> y <literal>apt-cache</" +"literal> especifican la ubicación de sus respectivos programas." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:474 @@ -6369,34 +7035,38 @@ msgid "" "status file will be looked up in <filename>/tmp/staging/var/lib/dpkg/status</" "filename>." msgstr "" +"La opción de configuración <literal>RootDir</literal> tiene un significado " +"especial. Si se define, todas las rutas de <literal>Dir::</literal> serán " +"relativas a <literal>RootDir</literal>, <emphasis>incluso las rutas que se " +"especifiquen de forma absoluta</emphasis>. De modo que, por ejemplo, si " +"<literal>RootDir</literal> se define como <filename>/tmp/staging</filename> " +"y <literal>Dir::State::status</literal> se define como <filename>/var/lib/" +"dpkg/status</filename>, entonces el fichero de estado será <filename>/tmp/" +"staging/var/lib/dpkg/status</filename>." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:487 -#, fuzzy msgid "APT in DSelect" msgstr "APT con DSelect" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:489 -#, fuzzy msgid "" "When APT is used as a &dselect; method several configuration directives " "control the default behaviour. These are in the <literal>DSelect</literal> " "section." msgstr "" -"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</literal>." +"Varias directivas de configuración controlan el comportamiento " +"predeterminado cuando APT se usa como método de &dselect;. Éstas se " +"encuentran en la sección <literal>DSelect</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:493 -#, fuzzy msgid "Clean" -msgstr "clean" +msgstr "Clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:494 -#, fuzzy msgid "" "Cache Clean mode; this value may be one of always, prompt, auto, pre-auto " "and never. always and prompt will remove all packages from the cache after " @@ -6405,118 +7075,107 @@ msgid "" "for instance). pre-auto performs this action before downloading new " "packages." msgstr "" -"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 " +"Modo de limpieza del almacén, este valor puede ser «always», «prompt», «auto», " +"«pre-auto» y «never». Los valores «always» y «prompt» borrarán todos los " +"paquetes del almacén después de actualizar, «prompt» (el valor " +"predeterminado) preguntará primero. El valor «auto» borrará sólo aquellos " +"paquetes que ya no se pueden descargar (por ejemplo, los reemplazados por " +"otra versión). El valor «pre-auto» realiza esta última acción antes de " "descargar los paquetes nuevos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:503 -#, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the install phase." msgstr "" -"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." +"Los contenidos de esta variable se introducen a &apt-get; como opciones de " +"la línea de ordenes al ejecutar la fase de instalación." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:507 -#, fuzzy msgid "Updateoptions" -msgstr "Opciones" +msgstr "Updateoptions" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:508 -#, fuzzy msgid "" "The contents of this variable is passed to &apt-get; as command line options " "when it is run for the update phase." msgstr "" -"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." +"Los contenidos de esta variable se introducen a &apt-get; como opciones de " +"la línea de ordenes al ejecutar la fase de actualización." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:512 -#, fuzzy msgid "PromptAfterUpdate" msgstr "PromptAfterUpdate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:513 -#, fuzzy msgid "" "If true the [U]pdate operation in &dselect; will always prompt to continue. " "The default is to prompt only on error." msgstr "" -"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." +"Si es «true», la operación de «[U]pdate» (actualización) en &dselect; " +"preguntará siempre antes de continuar. De forma predeterminada, sólo " +"preguntará en caso de error." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:519 -#, fuzzy msgid "How APT calls dpkg" -msgstr "Como APT llama a dpkg" +msgstr "Cómo invoca APT a dpkg" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:520 -#, fuzzy msgid "" "Several configuration directives control how APT invokes &dpkg;. These are " "in the <literal>DPkg</literal> section." msgstr "" -"Varias directivas de configuración controlan como APT llama a &dpkg;. Se " -"encuentran en la sección <literal>DPkg</literal>." +"Varias directivas de configuración controlan cómo invoca APT a &dpkg;. Éstas " +"se encuentran en la sección <literal>DPkg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:525 -#, fuzzy msgid "" "This is a list of options to pass to dpkg. The options must be specified " "using the list notation and each list item is passed as a single argument to " "&dpkg;." msgstr "" -"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." +"Es una lista de opciones que se introducen a dpkg. Las opciones se deben " +"especificar usando la notación de lista y cada elemento de la lista se " +"introduce a &dpkg; como un sólo argumento." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:530 -#, fuzzy msgid "Pre-Invoke" msgstr "Pre-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:530 -#, fuzzy msgid "Post-Invoke" msgstr "Post-Invoke" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:531 -#, fuzzy msgid "" "This is a list of shell commands to run before/after invoking &dpkg;. Like " "<literal>options</literal> this must be specified in list notation. The " "commands are invoked in order using <filename>/bin/sh</filename>, should any " "fail APT will abort." msgstr "" -"Es una lista de órdenes de shell que se ejecutarán antes de llamar a &dpkg;. " -"Como <literal>Options</literal>, debe de especificarse con notación de " -"lista. Las órdenes se ejecutan en orden usando <filename>/bin/sh</filename>, " -"si alguna falla APT abortará." +"Es una lista de órdenes de la consola que se ejecutarán antes y/o después de " +"invocar a &dpkg;. Como <literal>options</literal>, se debe especificar con " +"notación de lista. Las órdenes se ejecutarán en orden usando <filename>/bin/" +"sh</filename>, y APT finalizará en caso de fallo." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:537 -#, fuzzy msgid "Pre-Install-Pkgs" msgstr "Pre-Install-Pkgs" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:538 -#, fuzzy msgid "" "This is a list of shell commands to run before invoking dpkg. Like " "<literal>options</literal> this must be specified in list notation. The " @@ -6524,15 +7183,15 @@ msgid "" "fail APT will abort. APT will pass to the commands on standard input the " "filenames of all .deb files it is going to install, one per line." msgstr "" -"Lista de órdenes de shell que se ejecutarán antes de llamar a &dpkg;. Como " -"<literal>Options</literal>, debe de especificarse con notación de lista. Las " -"órdenes se ejecutan en orden usando <filename>/bin/sh</filename>, 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." +"Es una lista de órdenes de la consola que se ejecutarán antes de invocar a " +"&dpkg;. Como <literal>options</literal>, se debe especificar con notación de " +"lista. Las órdenes se ejecutan en orden usando <filename>/bin/sh</filename>, " +"y APT finalizará en caso de fallo. APT introducirá las órdenes, por la " +"entrada estándar, de los nombres de fichero de todos los «.deb» que va a " +"instalar, uno por línea." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:544 -#, fuzzy msgid "" "Version 2 of this protocol dumps more information, including the protocol " "version, the APT configuration space and the packages, files and versions " @@ -6541,48 +7200,45 @@ msgid "" "given to <literal>Pre-Install-Pkgs</literal>." msgstr "" "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 , los ficheros y versiones " -"que cambian. La versión 2 se habilita estableciendo <literal>DPkg::Tools::" -"Options::cmd::Version</literal> a 2. <literal>cmd</literal> es una orden " -"dada a <literal>Pre-Install-Pkgs</literal>." +"del protocolo, el espacio de configuración de APT y de los paquetes, los " +"ficheros y las versiones que cambian. La versión 2 se habilita definiendo " +"<literal>DPkg::Tools::Options::cmd::Version</literal> con el valor 2. " +"<literal>cmd</literal> es una orden que se pasa a <literal>Pre-Install-Pkgs</" +"literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:551 -#, fuzzy msgid "Run-Directory" msgstr "Run-Directory" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:552 -#, fuzzy msgid "" "APT chdirs to this directory before invoking dpkg, the default is <filename>/" "</filename>." msgstr "" -"APT hace que éste sea su directorio de trabajo antes de llamar a dpkg, por " -"omisión es <filename>/</filename>." +"APT cambia a este directorio antes de invocar a dpkg, el valor " +"predeterminado es <filename>/</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:556 -#, fuzzy msgid "Build-options" -msgstr "Opciones" +msgstr "Build-options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:557 -#, fuzzy msgid "" "These options are passed to &dpkg-buildpackage; when compiling packages, the " "default is to disable signing and produce all binaries." msgstr "" -"É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." +"Estas opciones se introducen a &dpkg-buildpackage; cuando compila paquetes, " +"el comportamiento predeterminado se limita a deshabilitar el firmado de " +"paquetes y a producir todos los binarios." #. type: Content of: <refentry><refsect1><refsect2><title> #: apt.conf.5.xml:562 msgid "dpkg trigger usage (and related options)" -msgstr "" +msgstr "Uso del disparador de dpkg (y de las opciones relacionadas)" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:563 @@ -6598,6 +7254,17 @@ msgid "" "all frontends will currently stay around half (or more) of the time in the " "100% state while it actually configures all packages." msgstr "" +"APT puede invocar a dpkg de forma que pueda hacer un uso agresivo de los " +"disparadores mediante varias invocaciones a dpkg. Sin más opciones, dpkg " +"usará los disparadores sólo en su propia ejecución. Activar estas opciones " +"puede reducir el tiempo necesario para realizar la instalación o la " +"actualización. Tenga en cuenta que está orientado a que estas opciones se " +"activen de forma predeterminada en un futuro, necesita muchas pruebas pero " +"la forma en que APT invoca a dpkg ha cambiado drásticamente. <emphasis>Estas " +"opciones actualmente son experimentales, y no se deberían usar en entornos " +"de producción.</emphasis> También rompe el informe del progreso ya que todas " +"las interfaces estarán alrededor de la mitad (o más) del tiempo en el 100% " +"mientras se están configurando todos los paquetes." #. type: Content of: <refentry><refsect1><refsect2><para><literallayout> #: apt.conf.5.xml:578 @@ -6608,6 +7275,10 @@ msgid "" "DPkg::ConfigurePending \"true\";\n" "DPkg::TriggersPending \"true\";" msgstr "" +"DPkg::NoTriggers \"true\";\n" +"PackageManager::Configure \"smart\";\n" +"DPkg::ConfigurePending \"true\";\n" +"DPkg::TriggersPending \"true\";" #. type: Content of: <refentry><refsect1><refsect2><para> #: apt.conf.5.xml:572 @@ -6622,11 +7293,21 @@ msgid "" "see e.g. <command>dpkg --audit</command>. A defensive option combination " "would be <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" +"Tenga en cuenta que no se garantiza que APT permitirá usar estas opciones o " +"que estas opciones no causen un (gran) problema en el futuro. Si ha " +"entendido los riesgos y los problemas actuales con estas opciones pero es lo " +"suficientemente valiente para ayudar a probarlas, cree un nuevo fichero de " +"configuración y pruebe una combinación de las opciones. Por favor, informe " +"de cualquier error, problema o mejora que encuentre y asegúrese de apuntar " +"en sus informes qué opciones ha usado. Pedir ayuda a dpkg también puede ser " +"útil por motivos de depuración, véase por ejemplo: <command>dpkg --audit</" +"command>. Una combinación de opciones defensivas sería <placeholder type=" +"\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:584 msgid "DPkg::NoTriggers" -msgstr "" +msgstr "DPkg::NoTriggers" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:585 @@ -6639,11 +7320,20 @@ msgid "" "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." msgstr "" +"Añade a todas las llamadas a dpkg la opción sin disparadores («no triggers»), " +"excepto a la llamada a «ConfigurePending». Consulte &dpkg; si está interesado " +"en saber qué significa esto. De forma breve: dpkg no ejecutará los " +"disparadores cuando está opción esté presente a menos que se ejecute " +"explícitamente en una llamada adicional. Tenga en cuenta que esta opción " +"también existe en versiones antiguas de apt (aunque sin documentar) con un " +"significado diferente. Anteriormente sólo se añadía la opción «--no-triggers» " +"a las llamadas de la configuración para dpkg, ahora apt también añadirá esta " +"opción a las llamadas de desempaquetado y borrado." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:592 msgid "PackageManager::Configure" -msgstr "" +msgstr "PackageManager::Configure" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:593 @@ -6660,11 +7350,23 @@ msgid "" "value will implicitly activate also the next option per default as otherwise " "the system could end in an unconfigured status which could be unbootable!" msgstr "" +"Los valores válidos son «<literal>all</literal>», «<literal>smart</literal>» " +"y «<literal>no</literal>». «<literal>all</literal>» es el valor predeterminado " +"y hace que APT configure todos los paquetes de forma explícita. El valor " +"«<literal>smart</literal>» sólo configura los paquetes que necesiten ser " +"configurados antes de que otro paquete se desempaquete (pre-dependencia) y " +"permite que dpkg configure los restantes con una llamada generada por la " +"siguiente opción. El valor «<literal>no</literal>» no configurará nada y " +"dependerá totalmente de dpkg para la configuración (que fallará si se " +"encuentra una pre-dependencia). Definir esta opción a otro valor distinto a " +"«all» activará implícitamente la siguiente opción de forma predeterminada, ya " +"que de otro modo el sistema podría terminar en un estado mal configurado qué " +"podría derivar en la imposibilidad de arrancar el sistema. " #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:603 msgid "DPkg::ConfigurePending" -msgstr "" +msgstr "DPkg::ConfigurePending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:604 @@ -6676,11 +7378,18 @@ msgid "" "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." msgstr "" +"Si define esta opción, apt ejecutará <command>dpkg --configure --pending</" +"command> para permitir a dpkg manejar todas las configuraciones necesarias y " +"todos los disparadores. Esta opción se activa automáticamente de forma " +"predeterminada si la opción anterior no está definida como <literal>all</" +"literal>, pero desactivarla podría ser útil si se quiere ejecutar APT varias " +"veces seguidas, por ejemplo: en un instalador. En estas situaciones podría " +"desactivar esta opción en todas las ejecuciones menos la última." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:610 msgid "DPkg::TriggersPending" -msgstr "" +msgstr "DPkg::TriggersPending" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:611 @@ -6691,11 +7400,17 @@ msgid "" "for Pre-Dependencies (see debbugs #526774). Note that this will process all " "triggers, not only the triggers needed to configure this package." msgstr "" +"Útil para una configuración <literal>smart</literal> en la que un paquete " +"que tiene disparadores pendientes no se considera como <literal>instalado</" +"literal> y que dpkg lo trata como <literal>desempaquetado</literal>, lo cual " +"rompe el sistema de pre-dependencias (véase debbugs #526774). Tenga en " +"cuenta que esto procesará todos los disparadores, no sólo los disparadores " +"necesarios para configurar este paquete." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:616 msgid "PackageManager::UnpackAll" -msgstr "" +msgstr "PackageManager::UnpackAll" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:617 @@ -6708,11 +7423,19 @@ msgid "" "method is very experimental and needs further improvements before becoming " "really useful." msgstr "" +"Ya que la configuración se puede aplazar para que dpkg la haga al final se " +"puede intentar ordenar las series de desempaquetado por necesidades " +"críticas, por ejemplo, mediante pre-dependencias. De forma predeterminada, " +"es «true» y por tanto se usa el método «antiguo» de ordenación en varios pasos " +"para todo. Mientras ambos métodos estén presentes en versiones anteriores de " +"APT, el método <literal>OrderCritical</literal> no se usará, ya que este " +"método es experimental y necesita más mejoras antes de llegar a ser " +"realmente útil." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> #: apt.conf.5.xml:624 msgid "OrderList::Score::Immediate" -msgstr "" +msgstr "OrderList::Score::Immediate" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para><literallayout> #: apt.conf.5.xml:632 @@ -6725,6 +7448,12 @@ msgid "" "\tPreDepends 50;\n" "};" msgstr "" +"OrderList::Score {\n" +"\tDelete 500;\n" +"\tEssential 200;\n" +"\tImmediate 10;\n" +"\tPreDepends 50;\n" +"};" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:625 @@ -6739,11 +7468,22 @@ msgid "" "change the scoring. The following example shows the settings with there " "default values. <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" +"Los paquetes esenciales (y sus dependencias) se deberían configurar " +"inmediatamente después de desempaquetarlos. Es una buena idea hacerlo lo más " +"pronto posible en el proceso de actualización ya que actualmente estas " +"llamadas de configuración también necesitan <literal>DPkg::TriggersPending</" +"literal>, que ejecutará unos pocos disparadores (que puede que no sean " +"necesarios). Los esenciales tienen, de forma predeterminada, una puntuación " +"alta pero la opción inmediata es relativamente baja (un paquete que tenga " +"pre-dependencias tiene una puntuación más alta). Puede cambiar la puntuación " +"mediante esta opción y las otras del mismo grupo. El siguiente ejemplo " +"muestra la configuración con los valores predeterminados. <placeholder type=" +"\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:645 msgid "Periodic and Archives options" -msgstr "" +msgstr "Las opciones «Periodic» y «Archives»" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:646 @@ -6753,12 +7493,16 @@ msgid "" "<literal>/etc/cron.daily/apt</literal> script. See header of this script for " "the brief documentation of these options." msgstr "" +"Los grupos de opciones <literal>APT::Periodic</literal> y <literal>APT::" +"Archives</literal> configuran el comportamiento de las actualizaciones " +"periódicas de apt, que se hacen mediante el script <literal>/etc/cron.daily/" +"apt</literal>. Consulte la cabecera de este script para una breve " +"documentación de estas opciones." #. type: Content of: <refentry><refsect1><title> #: apt.conf.5.xml:654 -#, fuzzy msgid "Debug options" -msgstr "Opciones" +msgstr "Opciones de depuración" #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:656 @@ -6770,6 +7514,12 @@ msgid "" "literal>. Most of these options are not interesting to a normal user, but a " "few may be:" msgstr "" +"Activar las opciones de la sección <literal>Debug::</literal> provocará que " +"la información de depuración se envíe a la salida estándar del programa que " +"esté utilizando las bibliotecas de <literal>apt</literal>, o activar los " +"modos especiales del programa que son útiles para depurar el comportamiento " +"de <literal>apt</literal>. La mayoría de estas opciones no son interesantes " +"para un usuario normal, aunque unas cuantas sí son:" #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:667 @@ -6778,6 +7528,9 @@ msgid "" "decisions made by <literal>dist-upgrade, upgrade, install, remove, purge</" "literal>." msgstr "" +"<literal>Debug::pkgProblemResolver</literal> activa la salida de las " +"decisiones tomadas por <literal>dist-upgrade, upgrade, install, remove, " +"purge</literal>." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:675 @@ -6786,6 +7539,9 @@ msgid "" "used to run some operations (for instance, <literal>apt-get -s install</" "literal>) as a non-root user." msgstr "" +"<literal>Debug::NoLocking</literal> desactiva todos los cerrojos de los " +"ficheros. Esto se puede usar para ejecutar algunas operaciones (por ejemplo, " +"<literal>apt-get -s install</literal>) como un usuario normal." #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:684 @@ -6793,6 +7549,8 @@ msgid "" "<literal>Debug::pkgDPkgPM</literal> prints out the actual command line each " "time that <literal>apt</literal> invokes &dpkg;." msgstr "" +"<literal>Debug::pkgDPkgPM</literal> muestra la línea de órdenes actual cada " +"vez que <literal>apt</literal> invoca a &dpkg;." #. TODO: provide a #. motivating example, except I haven't a clue why you'd want @@ -6803,62 +7561,67 @@ msgid "" "<literal>Debug::IdentCdrom</literal> disables the inclusion of statfs data " "in CDROM IDs." msgstr "" +"<literal>Debug::IdentCdrom</literal> desactiva la inclusión de los datos de " +"statfs en los identificadores de los CDROM." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:702 msgid "A full list of debugging options to apt follows." msgstr "" +"A continuación, se muestra la lista completa de las opciones de depuración " +"de apt." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:707 -#, fuzzy msgid "<literal>Debug::Acquire::cdrom</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:711 msgid "" "Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" +"Muestra la información relacionada al acceso de las fuentes de " +"<literal>cdrom://</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:718 -#, fuzzy msgid "<literal>Debug::Acquire::ftp</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." msgstr "" +"Muestra la información relacionada con la descarga de paquetes mediante FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:729 -#, fuzzy msgid "<literal>Debug::Acquire::http</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." msgstr "" +"Muestra la información relacionada con la descarga de paquetes mediante HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:740 -#, fuzzy msgid "<literal>Debug::Acquire::https</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::Acquire::https</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:744 msgid "Print information related to downloading packages using HTTPS." msgstr "" +"Muestra la información relacionada con la descarga de paquetes mediante " +"HTTPS." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:751 -#, fuzzy msgid "<literal>Debug::Acquire::gpgv</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::Acquire::gpgv</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:755 @@ -6866,12 +7629,13 @@ msgid "" "Print information related to verifying cryptographic signatures using " "<literal>gpg</literal>." msgstr "" +"Muestra la información relacionada con la comprobación de las firmas " +"criptográficas mediante <literal>gpg</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:762 -#, fuzzy msgid "<literal>Debug::aptcdrom</literal>" -msgstr "La línea <literal>Version:</literal> " +msgstr "<literal>Debug::aptcdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:766 @@ -6879,23 +7643,25 @@ msgid "" "Output information about the process of accessing collections of packages " "stored on CD-ROMs." msgstr "" +"Muestra la información sobre el proceso de acceso a las colecciones de " +"paquetes almacenadas en CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:773 -#, fuzzy msgid "<literal>Debug::BuildDeps</literal>" -msgstr "La línea <literal>Label:</literal> " +msgstr "<literal>Debug::BuildDeps</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:776 msgid "Describes the process of resolving build-dependencies in &apt-get;." msgstr "" +"Describe el proceso de resolución de dependencias de compilación en &apt-" +"get;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:783 -#, fuzzy msgid "<literal>Debug::Hashes</literal>" -msgstr "La línea <literal>Label:</literal> " +msgstr "<literal>Debug::Hashes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:786 @@ -6903,12 +7669,13 @@ msgid "" "Output each cryptographic hash that is generated by the <literal>apt</" "literal> libraries." msgstr "" +"Muestra los «hashes» criptográficos que generan las bibliotecas de " +"<literal>apt</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:793 -#, fuzzy msgid "<literal>Debug::IdentCDROM</literal>" -msgstr "La línea <literal>Label:</literal> " +msgstr "<literal>Debug::IdentCDROM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:796 @@ -6917,12 +7684,14 @@ msgid "" "of used and free blocks on the CD-ROM filesystem, when generating an ID for " "a CD-ROM." msgstr "" +"No incluye la información de <literal>statfs</literal>, el número de bloques " +"libres y usados del sistema de ficheros del CD-ROM, cuando se genera un " +"identificador de un CD-ROM." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:804 -#, fuzzy msgid "<literal>Debug::NoLocking</literal>" -msgstr "La línea <literal>Origin:</literal> " +msgstr "<literal>Debug::NoLocking</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:807 @@ -6930,23 +7699,26 @@ msgid "" "Disable all file locking. For instance, this will allow two instances of " "<quote><literal>apt-get update</literal></quote> to run at the same time." msgstr "" +"Desactiva todos los cerrojos de los ficheros. Por ejemplo, esto permitirá " +"ejecutar dos instancias de <quote><literal>apt-get update</literal></quote> " +"a la vez." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:815 -#, fuzzy msgid "<literal>Debug::pkgAcquire</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::pkgAcquire</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:819 msgid "Log when items are added to or removed from the global download queue." msgstr "" +"Registra los elementos que se añaden o se borran de la cola de descarga " +"global." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:826 -#, fuzzy msgid "<literal>Debug::pkgAcquire::Auth</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::pkgAcquire::Auth</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:829 @@ -6954,12 +7726,14 @@ msgid "" "Output status messages and errors related to verifying checksums and " "cryptographic signatures of downloaded files." msgstr "" +"Muestra los mensajes de estado y los errores relacionados con la " +"comprobación de las sumas de verificación y las firmas criptográficas de los " +"ficheros descargados." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:836 -#, fuzzy msgid "<literal>Debug::pkgAcquire::Diffs</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::pkgAcquire::Diffs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:839 @@ -6967,12 +7741,13 @@ msgid "" "Output information about downloading and applying package index list diffs, " "and errors relating to package index list diffs." msgstr "" +"Muestra la información de la descarga y la aplicación de los diffs de la " +"lista de índices de paquetes, y los errores relacionados con éstos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:847 -#, fuzzy msgid "<literal>Debug::pkgAcquire::RRed</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::pkgAcquire::RRed</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:851 @@ -6980,23 +7755,27 @@ msgid "" "Output information related to patching apt package lists when downloading " "index diffs instead of full indices." msgstr "" +"Muestra la información relacionada con el parcheado de las listas de " +"paquetes de apt cuando se descargan los diffs de los índices en lugar de los " +"índices completos." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:858 -#, fuzzy msgid "<literal>Debug::pkgAcquire::Worker</literal>" -msgstr "La línea <literal>Archive:</literal> " +msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:862 msgid "" "Log all interactions with the sub-processes that actually perform downloads." msgstr "" +"Registra todas las interacciones de los sub-procesos que están realizando " +"descargas." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:869 msgid "<literal>Debug::pkgAutoRemove</literal>" -msgstr "" +msgstr "<literal>Debug::pkgAutoRemove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:873 @@ -7004,11 +7783,13 @@ msgid "" "Log events related to the automatically-installed status of packages and to " "the removal of unused packages." msgstr "" +"Registra los eventos relacionados con el estado «instalado automáticamente» " +"de los paquetes y con la eliminación de los paquetes sin usar." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:880 msgid "<literal>Debug::pkgDepCache::AutoInstall</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDepCache::AutoInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:883 @@ -7019,11 +7800,16 @@ msgid "" "to the full <literal>apt</literal> dependency resolver; see <literal>Debug::" "pkgProblemResolver</literal> for that." msgstr "" +"Genera los mensajes de depuración que describen qué paquetes se están " +"instalando automáticamente para resolver las dependencias. Esto corresponde " +"al paso inicial de instalación automática, por ejemplo: <literal>apt-get " +"install</literal> y no el solucionador completo de dependencias de " +"<literal>apt</literal>. Véase <literal>Debug::pkgProblemResolver</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:894 msgid "<literal>Debug::pkgDepCache::Marker</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDepCache::Marker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:897 @@ -7041,23 +7827,36 @@ msgid "" "there is none or if it is the same version as the installed. " "<literal>section</literal> is the name of the section the package appears in." msgstr "" +"Genera los mensajes de depuración que describen qué paquete se marcará como " +"mantener/instalar/borrar mientras el solucionador de problemas " +"(«ProblemResolver») realiza su trabajo. Cada adición o borrado puede iniciar " +"acciones adicionales; éstas se muestran sangradas con dos espacios bajo la " +"entrada original. El formato de cada línea es <literal>MarkKeep</literal>, " +"<literal>MarkDelete</literal> o <literal>MarkInstall</literal> seguido de " +"<literal>package-name <a.b.c -> d.e.f | x.y.z> (sección)</literal> " +"siendo <literal>a.b.c</literal> la versión actual del paquete, <literal>d.e." +"f</literal> la versión considerada para instalar y <literal>x.y.z</literal> " +"una versión nueva, pero no considerada para la instalación (por una " +"puntuación baja). Las dos últimas se pueden omitir si no hay o si es la " +"misma versión que la instalada. <literal>sección</literal> es el nombre de " +"la sección en la que aparece el paquete." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:916 -#, fuzzy msgid "<literal>Debug::pkgInitConfig</literal>" -msgstr "La línea <literal>Version:</literal> " +msgstr "<literal>Debug::pkgInitConfig</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:919 msgid "Dump the default configuration to standard error on startup." msgstr "" +"Vuelca la configuración predeterminada a la salida estándar durante al " +"iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:926 -#, fuzzy msgid "<literal>Debug::pkgDPkgPM</literal>" -msgstr "La línea <literal>Package:</literal> " +msgstr "<literal>Debug::pkgDPkgPM</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:929 @@ -7065,11 +7864,13 @@ msgid "" "When invoking &dpkg;, output the precise command line with which it is being " "invoked, with arguments separated by a single space character." msgstr "" +"Cuando se invoca a &dpkg; muestra la línea de órdenes exacta con la que se " +"invocó, con los argumentos separados por un espacio." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:937 msgid "<literal>Debug::pkgDPkgProgressReporting</literal>" -msgstr "" +msgstr "<literal>Debug::pkgDPkgProgressReporting</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:940 @@ -7077,12 +7878,13 @@ msgid "" "Output all the data received from &dpkg; on the status file descriptor and " "any errors encountered while parsing it." msgstr "" +"Muestra todos los datos recibidos de &dpkg; en el descriptor del fichero de " +"estado y cualquier error encontrado durante el análisis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:947 -#, fuzzy msgid "<literal>Debug::pkgOrderList</literal>" -msgstr "La línea <literal>Origin:</literal> " +msgstr "<literal>Debug::pkgOrderList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:951 @@ -7090,34 +7892,36 @@ msgid "" "Generate a trace of the algorithm that decides the order in which " "<literal>apt</literal> should pass packages to &dpkg;." msgstr "" +"Genera una traza del algoritmo que decide el orden en el que <literal>apt</" +"literal> debería entregar los paquetes a &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:959 -#, fuzzy msgid "<literal>Debug::pkgPackageManager</literal>" -msgstr "La línea <literal>Package:</literal> " +msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:963 msgid "" "Output status messages tracing the steps performed when invoking &dpkg;." msgstr "" +"Muestra los mensajes de estado siguiendo los pasos realizados al invocar a " +"&dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:970 -#, fuzzy msgid "<literal>Debug::pkgPolicy</literal>" -msgstr "La línea <literal>Label:</literal> " +msgstr "<literal>Debug::pkgPolicy</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:974 msgid "Output the priority of each package list on startup." -msgstr "" +msgstr "Muestra la prioridad de cada lista de paquetes al iniciarse." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:980 msgid "<literal>Debug::pkgProblemResolver</literal>" -msgstr "" +msgstr "<literal>Debug::pkgProblemResolver</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:984 @@ -7125,11 +7929,13 @@ msgid "" "Trace the execution of the dependency resolver (this applies only to what " "happens when a complex dependency problem is encountered)." msgstr "" +"Muestra la ejecución del solucionador de dependencias (esto se aplica sólo a " +"lo que ocurre cuando se encuentra un problema de dependencias complejo)." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:992 msgid "<literal>Debug::pkgProblemResolver::ShowScores</literal>" -msgstr "" +msgstr "<literal>Debug::pkgProblemResolver::ShowScores</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:995 @@ -7138,12 +7944,14 @@ msgid "" "the pkgProblemResolver. The description of the package is the same as " "described in <literal>Debug::pkgDepCache::Marker</literal>" msgstr "" +"Muestra una lista de todos los paquetes instalados con sus puntuaciones " +"calculadas y usadas por pkgProblemResolver. La descripción del paquete es la " +"misma que la descrita en <literal>Debug::pkgDepCache::Marker</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:1003 -#, fuzzy msgid "<literal>Debug::sourceList</literal>" -msgstr "La línea <literal>Version:</literal> " +msgstr "<literal>Debug::sourceList</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:1007 @@ -7151,51 +7959,51 @@ msgid "" "Print information about the vendors read from <filename>/etc/apt/vendors." "list</filename>." msgstr "" +"Muestra la información de los proveedores extraída de <filename>/etc/apt/" +"vendors.list</filename>." #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1030 -#, fuzzy msgid "" "&configureindex; is a configuration file showing example values for all " "possible options." msgstr "" -"&configureindex; contiene un fichero de configuración de ejemplo mostrando " -"los valores predeterminados para todas las opciones posibles." +"&configureindex; es un fichero de configuración de ejemplo que muestra " +"valores de ejemplo para todas las opciones posibles." #. type: Content of: <refentry><refsect1><variablelist> #: apt.conf.5.xml:1037 -#, fuzzy msgid "&file-aptconf;" -msgstr "apt-cdrom" +msgstr "&file-aptconf;" #. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1042 -#, fuzzy msgid "&apt-cache;, &apt-config;, &apt-preferences;." -msgstr "&apt-cache; &apt-conf;" +msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" +"&apt-author.team; &apt-email; &apt-product; <date>4 de Mayo 2009</date>" #. type: Content of: <refentry><refnamediv><refname> #: apt_preferences.5.xml:21 apt_preferences.5.xml:28 -#, fuzzy msgid "apt_preferences" msgstr "apt_preferences" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt_preferences.5.xml:29 -#, fuzzy msgid "Preference control file for APT" msgstr "Fichero de preferencias de APT" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:34 -#, fuzzy msgid "" "The APT preferences file <filename>/etc/apt/preferences</filename> and the " "fragment files in the <filename>/etc/apt/preferences.d/</filename> folder " @@ -7203,11 +8011,12 @@ msgid "" "installation." msgstr "" "El fichero de preferencias de APT <filename>/etc/apt/preferences</filename> " -"se puede usar para controlar las versiones de los paquetes seleccionados." +"y los segmentos de fichero dentro del directorio <filename>/etc/apt/" +"preferences.d/</filename> se pueden usar para controlar las versiones de los " +"paquetes seleccionados para su instalación." #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:39 -#, fuzzy msgid "" "Several versions of a package may be available for installation when the " "&sources-list; file contains references to more than one distribution (for " @@ -7218,17 +8027,17 @@ msgid "" "priorities that APT assigns to package versions by default, thus giving the " "user control over which one is selected for installation." msgstr "" -"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. 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." +"Puede disponer de varias versiones de un mismo paquete cuando el fichero " +"&sources-list; contiene referencias a más de una distribución (por ejemplo, " +"«<literal>stable</literal>» (estable) y «<literal>testing</literal>» (en " +"pruebas)). APT asigna una prioridad a cada versión disponible, y limitado " +"por las dependencias, <command>apt-get</command> selecciona la versión con " +"mayor prioridad. El fichero de preferencias de APT modifica las prioridades " +"asignadas por APT, dando control al usuario sobre qué versión se " +"seleccionará para su instalación." #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:49 -#, fuzzy msgid "" "Several instances of the same version of a package may be available when the " "&sources-list; file contains references to more than one source. In this " @@ -7236,15 +8045,30 @@ msgid "" "the &sources-list; file. The APT preferences file does not affect the " "choice of instance, only the choice of version." msgstr "" -"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." +"Puede que 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." #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -7254,30 +8078,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 -#, fuzzy +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "¿Cómo asigna APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:89 +#, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" -msgstr "" -"<programlisting>\n" -"<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n" +msgstr "<command>apt-get install -t testing <replaceable>paquete</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:92 +#, no-wrap msgid "APT::Default-Release \"stable\";\n" -msgstr "" -"<programlisting>\n" -"APT::Default-Release \"stable\";\n" +msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 -#, fuzzy +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -7291,60 +8109,58 @@ msgid "" "specifically pinned packages. For example, <placeholder type=" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" msgstr "" -"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, >>distribución objetivo<< (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," +"De no existir el fichero de preferencias, o si 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, la >>distribución objetivo<< (n. t. del inglés " +"<emphasis>target release</emphasis>), que recibe una prioridad predefinida " +"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>. Tenga en cuenta " +"que esto tiene preferencia sobre cualquier otra prioridad definida en " +"<filename>/etc/apt/preferencias</filename>, pero que no afecta al anclaje de " +"paquetes específicos. Por ejemplo, <placeholder type=\"programlisting\" id=" +"\"0\"/><placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 -#, fuzzy +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "prioridad 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 -#, fuzzy +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." -msgstr "a la versión instalada (si existe)." +msgstr "a la versión instalada (de existir)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 -#, fuzzy +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "prioridad 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 -#, fuzzy +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" -"a la versión que ni está instalada ni pertenece a la distribución objetivo." +"a las versiones que ni están instaladas ni pertenecen a la distribución " +"objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 -#, fuzzy +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "prioridad 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 -#, fuzzy +#: apt_preferences.5.xml:112 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" -"a las versiones que no están instaladas pero que pertenecen a la " -"distribución objetivo." +"a las versiones que no están instaladas y que pertenecen a la distribución " +"objetivo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 -#, fuzzy +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -7352,22 +8168,21 @@ msgid "" msgstr "" "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:" +"Asignar: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 -#, fuzzy +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " "uninstalled package versions." msgstr "" "Si no se especifica ninguna distribución objetivo APT asigna prioridad 100 a " -"todas las versiones de los paquetes instalados y 500 al resto." +"todas las versiones de los paquetes instalados y 500 a las versiones no " +"instaladas de paquetes." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 -#, fuzzy +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -7376,8 +8191,7 @@ msgstr "" "determinar qué versión del paquete debe instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 -#, fuzzy +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -7385,22 +8199,21 @@ msgid "" "exceeds 1000; such high priorities can only be set in the preferences file. " "Note also that downgrading a package can be risky.)" msgstr "" -"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 " +"Nunca instala una versión anterior de un paquete en lugar de la instalada a " +"menos que la prioridad de la versión disponible supere 1000 («Desactualizar» " +"significa instalar una versión menos reciente de un paquete. Tenga en 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. Observe que instalar una versión anterior del paquete puede " "ser peligroso)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 -#, fuzzy +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." -msgstr "Instalar la versión de mayor prioridad." +msgstr "Instala la versión de mayor prioridad." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 -#, fuzzy +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -7409,20 +8222,18 @@ msgstr "" "(esto es, la que tiene un número de versión mayor)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 -#, fuzzy +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" "literal> option is given, install the uninstalled one." msgstr "" "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</literal> se instala la que no está instalada." +"bien difieren en su meta-información o se ha introducido la opción " +"<literal>--reinstall</literal>, se instalará la que no está instalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 -#, fuzzy +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -7430,15 +8241,14 @@ msgid "" "upgraded when <command>apt-get install <replaceable>some-package</" "replaceable></command> or <command>apt-get upgrade</command> is executed." msgstr "" -"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>." +"Generalmente, la versión instalada del paquete (prioridad 100) no es tan " +"reciente como la disponible a través de las fuentes en «&sources-" +"list;» (prioridad 500 o 990). En este caso, el paquete se actualizará al " +"ejecutar <command>apt-get install <replaceable>paquete</replaceable></" +"command> o <command>apt-get upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 -#, fuzzy +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -7447,13 +8257,12 @@ msgid "" msgstr "" "Rara vez la versión instalada de un paquete es <emphasis>más</emphasis> " "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>." +"instalará la versión anterior del paquete al ejecutar <command>apt-get " +"install <replaceable>paquete</replaceable></command> o <command>apt-get " +"upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 -#, fuzzy +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -7463,23 +8272,21 @@ msgid "" "<emphasis>one</emphasis> of the available versions has a higher priority " "than the installed version." msgstr "" -"A veces la versión instalada de un paquete es más reciente que la versión " +"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</emphasis> de los ejemplares disponibles tiene una prioridad " -"mayor que la versión instalada." +"versión de otra distribución. Este tipo de paquetes se actualizarán al " +"ejecutar <command>apt-get install <replaceable>paquete</replaceable></" +"command> o <command>apt-get upgrade</command> porque al menos <emphasis>uno</" +"emphasis> de los ejemplares disponibles tiene una prioridad mayor que la " +"versión instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 -#, fuzzy +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "El efecto de las preferencias sobre APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 -#, fuzzy +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -7487,13 +8294,12 @@ msgid "" "specific form and a general form." msgstr "" "El fichero de preferencias de APT permite al administrador del sistema " -"controlar las asignaciones de prioridades. El fichero consiste en uno o más " +"controlar la asignación 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." +"registros pueden tener una de estos dos formatos: el específico o el general." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 -#, fuzzy +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -7501,28 +8307,27 @@ msgid "" "<filename>perl</filename> package whose version number begins with " "\"<literal>5.8</literal>\". Multiple packages can be separated by spaces." msgstr "" -"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</filename> cuyo número de versión empiece con " -"\"<literal>5.8</literal>\"." +"El formato «específico» asigna una prioridad («Pin-Priority») a un paquete " +"concreto y afecta a una versión especificada o rango de versiones. Por " +"ejemplo, el siguiente registro asigna una prioridad alta a todas las " +"versiones del paquete <filename>perl</filename> cuyo número de versión " +"empiece con «<literal>5.8</literal>». Puede especificar varios paquetes " +"separados por espacios." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:176 +#, no-wrap msgid "" "Package: perl\n" "Pin: version 5.8*\n" "Pin-Priority: 1001\n" msgstr "" -"<programlisting>\n" "Package: perl\n" "Pin: version 5.8*\n" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 -#, fuzzy +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -7530,40 +8335,37 @@ msgid "" "versions coming from a particular Internet site, as identified by the site's " "fully qualified domain name." msgstr "" -"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</filename>), o a todos las versiones de un " -"paquete que provienen de un sitio concreto en internet, identificado por su " -"nombre de dominio." +"El formato «general» asigna una prioridad a todas las versiones de los " +"paquetes en una distribución (esto es, a todas las versiones de paquetes " +"listados en un fichero <filename>Release</filename> particular), o a todas " +"las versiones de un paquete provenientes de un sitio concreto en Internet, " +"identificado por su nombre de dominio." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 -#, fuzzy +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " "all package versions available from the local site." msgstr "" -"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 " +"Esta entrada con formato general en el fichero de preferencias de APT sólo " +"afecta a grupos de paquetes. Por ejemplo, el siguiente registro asigna una " "prioridad alta a todas las versiones disponibles desde un sitio local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:193 +#, no-wrap msgid "" "Package: *\n" "Pin: origin \"\"\n" "Pin-Priority: 999\n" msgstr "" -"<programlisting>\n" "Package: *\n" "Pin: origin \"\"\n" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 -#, fuzzy +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -7571,16 +8373,15 @@ msgid "" "a <filename>Release</filename> file is not an Internet address but an author " "or vendor name, such as \"Debian\" or \"Ximian\"." msgstr "" -"Un aviso acerca de la palabra clave usada en \"<literal>origin</literal>\": " -"no debe de confundirse con el origen (\"Origin:\") de una distribución tal y " -"como se especifica en el fichero <filename>Release</filename>. Lo que sigue " -"a \"Origin:\" en un fichero <filename>Release</filename> no es una dirección " -"de un sitio de internet, sino el autor o el nombre del proveedor, tales como " -"\"Debian\" o \"Ximian\"." +"Aviso: la palabra clave usada aquí es «<literal>origin</literal>». No se debe " +"confundir con el origen («Origin:») de una distribución tal y como se " +"especifica en el fichero <filename>Release</filename>. Lo que sigue a la " +"etiqueta «Origin:» en un fichero <filename>Release</filename> no es la " +"dirección de un sitio de Internet, sino el autor o el nombre del proveedor, " +"tales como «Debian» o «Ximian»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 -#, fuzzy +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -7588,199 +8389,179 @@ msgid "" msgstr "" "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</literal>\"." +"archivo de paquetes «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:208 +#, no-wrap msgid "" "Package: *\n" "Pin: release a=unstable\n" "Pin-Priority: 50\n" msgstr "" -"<programlisting>\n" "Package: *\n" "Pin: release a=unstable\n" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 -#, fuzzy +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" "\"." msgstr "" -"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</literal>\"." +"El siguiente registro asigna una prioridad alta a todas las versiones de los " +"paquetes pertenecientes a cualquier distribución que tenga como nombre clave " +"«<literal>squeeze</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:217 +#, no-wrap msgid "" "Package: *\n" "Pin: release n=squeeze\n" "Pin-Priority: 900\n" msgstr "" -"<programlisting>\n" "Package: *\n" -"Pin: release a=unstable\n" -"Pin-Priority: 50\n" +"Pin: release n=squeeze\n" +"Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 -#, fuzzy +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " "and whose release Version number is \"<literal>3.0</literal>\"." msgstr "" "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</literal>\" y como número de versión \"<literal>3.0</" -"literal>\"." +"paquetes pertenecientes a cualquier publicación que tenga como nombre de " +"archivo de paquetes «<literal>stable</literal>» y como número de versión " +"«<literal>3.0</literal>»." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:227 +#, no-wrap msgid "" "Package: *\n" "Pin: release a=stable, v=3.0\n" "Pin-Priority: 500\n" msgstr "" -"<programlisting>\n" "Package: *\n" -"Pin: release a=unstable, v=3.0\n" -"Pin-Priority: 50\n" +"Pin: release a=stable, v=3.0\n" +"Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 -#, fuzzy +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "¿Cómo interpreta APT las prioridades?" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 -#, fuzzy +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 -#, fuzzy +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" -"la versión se instala incluso si es una versión anterior a la instalada en " +"La versión se instala incluso si es una versión anterior a la instalada en " "el sistema." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 -#, fuzzy +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 -#, fuzzy +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" -"la versión se instala aunque no venga de la distribución objetivo, a menos " +"La versión se instala aunque no venga de la distribución objetivo, a menos " "que la versión instalada sea más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 -#, fuzzy +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 -#, fuzzy +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" -"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." +"La versión se instala a menos que exista otro ejemplar disponible " +"perteneciente a la distribución objetivo, o bien si la versión instalada es " +"más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 -#, fuzzy +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 -#, fuzzy +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" -"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." +"La versión se instala a menos que exista una versión disponible " +"perteneciente a otra distribución, o si la versión instalada es más reciente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 -#, fuzzy +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 -#, fuzzy +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" -"la versión sólo se instala si no hay ninguna versión del paquete instalado." +"La versión sólo se instala si no hay ninguna versión del paquete instalada." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 -#, fuzzy +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 -#, fuzzy +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" -msgstr "la versión nunca se instala." +msgstr "Evita la instalación de la versión." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 -#, fuzzy +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " "<placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" "Las prioridades (P) asignadas en el fichero de preferencias deben ser " -"números enteros. Se interpretan (en general) del siguiente modo:" +"números enteros positivos o negativos. Se interpretan (en general) del " +"siguiente modo: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 -#, fuzzy +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " "that, if any general-form records match an available package version then " "the first such record determines the priority of the package version." msgstr "" -"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." +"Si cualquier registro con formato específico coincide con una versión " +"disponible de un paquete, el registro determina la prioridad de la versión " +"del paquete. De no ser así, y si cualquier número de registros con formato " +"general coinciden con una versión, el primero determina la prioridad de la " +"versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 -#, fuzzy +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -7789,8 +8570,8 @@ msgstr "" "registros antes mencionados:" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:290 +#, no-wrap msgid "" "Package: perl\n" "Pin: version 5.8*\n" @@ -7804,7 +8585,6 @@ msgid "" "Pin: release unstable\n" "Pin-Priority: 50\n" msgstr "" -"<programlisting>\n" "Package: perl\n" "Pin: version 5.8*\n" "Pin-Priority: 1001\n" @@ -7818,13 +8598,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" -msgstr "" +msgstr "Por ello:" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 -#, fuzzy +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -7833,14 +8612,13 @@ msgid "" "<literal>perl</literal> will be downgraded." msgstr "" "La versión más reciente disponible del paquete <literal>perl</literal> se " -"instala mientras que el número de versión empieze con \"<literal>5.8</" -"literal>\". Si se encuentra disponible <emphasis>cualquier</emphasis> " -"versión 5.8* de <literal>perl</literal> y la versión instalada es 5.9*, " -"entonces se instala la versión5.8*." +"instalará siempre que el número de versión empiece con «<literal>5.8</" +"literal>». De existir <emphasis>cualquier</emphasis> versión 5.8* disponible " +"de <literal>perl</literal>, y si la versión instalada es 5.9*, se instalará " +"la versión 5.8*, desactualizando el paquete." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 -#, fuzzy +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -7851,8 +8629,7 @@ msgstr "" "versiones, incluso sobre los pertenecientes a la distribución objetivo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 -#, fuzzy +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -7860,57 +8637,48 @@ msgid "" "and no version of the package is already installed." msgstr "" "Otras versiones que tengan un origen distinto al sistema local listadas en " -"&sources-list; y que pertenezcan a la distribución <literal>inestable</" -"literal> sólo se instalarán si se seleccionan para instalar y no hay ninguna " -"versión del paquete instalado." +"«&sources-list;» y que pertenezcan a la distribución <literal>unstable</" +"literal> sólo se instalarán si se seleccionan para su instalación y si no " +"hay ninguna versión del paquete ya instalado." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 -#, fuzzy +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" -msgstr "" -"Determinación de la versión del paquete y de las propiedades de la\n" -"distribución" +msgstr "Determinar la versión del paquete y las propiedades de la distribución" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 -#, fuzzy +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " "describe the packages available at that location." msgstr "" -"Los recursos del fichero &sources-list; deben proporcionar los ficheros " -"<filename>Packages</filename> y <filename>Release</filename>. Éstos " +"Los recursos listados en el 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." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 -#, fuzzy +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" -msgstr "La línea <literal>Package:</literal> " +msgstr "La línea <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 -#, fuzzy +#: apt_preferences.5.xml:339 msgid "gives the package name" -msgstr "Indica el nombre del paquete" +msgstr "indica el nombre del paquete." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 -#, fuzzy +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" -msgstr "La línea <literal>Version:</literal> " +msgstr "La línea <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 -#, fuzzy +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" -msgstr "Indica el número de versión del paquete" +msgstr "indica el número de versión del paquete." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 -#, fuzzy +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -7921,24 +8689,22 @@ msgid "" "relevant for setting APT priorities: <placeholder type=\"variablelist\" id=" "\"0\"/>" msgstr "" -"El fichero <filename>Packages</filename> se encuentra normalmente en el " -"directorio <filename>.../dists/<replaceable>nombre-dist</replaceable>/ " +"El fichero <filename>Packages</filename> se suele encontrar 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:" +"i386/Packages</filename>. Este fichero consiste en una serie de registros de " +"varias líneas, uno por cada paquete disponible en ese directorio. Sólo dos " +"líneas en cada registro son relevantes a la hora de definir las prioridades " +"de APT: <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 -#, fuzzy +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" -msgstr "La línea <literal>Archive:</literal> " +msgstr "Las líneas <literal>Archive:</literal> o <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 -#, fuzzy +#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -7947,31 +8713,27 @@ msgid "" "archive. Specifying this value in the APT preferences file would require " "the line:" msgstr "" -"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</filename> están en un archivo de " -"<literal>estable</literal>. Para especificar una preferencia de acuerdo con " -"este parámetro tendrá que poner la siguiente línea en el fichero de " -"preferencias de APT:" +"indican el nombre del archivo al que pertenecen todos los paquetes del árbol " +"de directorios. Por ejemplo, la línea «Archive: stable» o «Suite: stable» " +"especifica que todos los paquetes en el árbol de directorios por debajo del " +"directorio raíz marcado en el fichero <filename>Release</filename> están en " +"un archivo «<literal>stable</literal>» (estable). Para especificar una " +"preferencia de acuerdo con este parámetro tendrá que insertar la siguiente " +"línea en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:370 +#, no-wrap msgid "Pin: release a=stable\n" -msgstr "" -"<programlisting>\n" -"Pin: release a=stable\n" +msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 -#, fuzzy +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" -msgstr "La línea <literal>Component:</literal> " +msgstr "La línea <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 -#, fuzzy +#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -7979,23 +8741,22 @@ msgid "" "filename> file belong to a version named <literal>squeeze</literal>. " "Specifying this value in the APT preferences file would require the line:" msgstr "" -"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</filename> están en un archivo de " -"<literal>estable</literal>. Para especificar una preferencia de acuerdo con " -"este parámetro tendrá que poner la siguiente línea en el fichero de " -"preferencias de APT:" +"indica el nombre de la distribución a la que pertenecen todos los paquetes " +"del árbol de directorios. Por ejemplo, la línea «Codename: squeeze» " +"especifica que todos los paquetes en el árbol de directorios por debajo del " +"directorio padre marcado en el fichero <filename>Release</filename> " +"pertenecen a la versión llamada <literal>squeeze</literal>. Para especificar " +"una preferencia de acuerdo con este parámetro tendrá que poner una de las " +"siguientes líneas en el fichero de preferencias de APT:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" -msgstr "" +msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 -#, fuzzy +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8003,35 +8764,32 @@ msgid "" "literal> distributions because they have not been released yet. Specifying " "this in the APT preferences file would require one of the following lines." msgstr "" -"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</literal> e <literal>inestable</literal> no tienen una " -"versión asignada porque no han sido liberadas. Para especificar una " +"nombra la versión de la publicación. Por ejemplo, los paquetes en el árbol " +"pueden pertenecer a la versión 3.0 de Debian GNU/Linux. Observe que, " +"generalmente, <literal>testing</literal> y <literal>unstable</literal> no " +"tienen una versión asignada porque no se han publicado. 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:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:402 +#, no-wrap msgid "" "Pin: release v=3.0\n" "Pin: release a=stable, v=3.0\n" "Pin: release 3.0\n" msgstr "" -"<programlisting>\n" "Pin: release v=3.0\n" "Pin: release a=stable, v=3.0\n" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 -#, fuzzy +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" -msgstr "La línea <literal>Component:</literal> " +msgstr "La línea <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 -#, fuzzy +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8040,59 +8798,52 @@ msgid "" "licensed under terms listed in the Debian Free Software Guidelines. " "Specifying this component in the APT preferences file would require the line:" msgstr "" -"Indica la licencia asociada a los paquetes en el árbol de directorios " +"indica la licencia asociada a los paquetes en el árbol de directorios " "correspondiente al fichero <filename>Release</filename>. Por ejemplo, la " -"línea <literal>Component: main</literal> especifica que todos los ejemplares " -"son de la sección <literal>main</literal>, ésto asegura que su licencia se " -"ajusta a las DFSG. Para especificar una preferencia de acuerdo con este " +"línea <literal>Component: main</literal> especifica que todos los paquetes " +"en el árbol de directorios pertenecen a la sección <literal>main</literal>, " +"lo cual asegura que su licencia se ajusta a las Directrices sobre software " +"libre de Debian (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:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:421 +#, no-wrap msgid "Pin: release c=main\n" -msgstr "" -"<programlisting>\n" -"Pin: release c=main\n" +msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 -#, fuzzy +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" -msgstr "La línea <literal>Origin:</literal> " +msgstr "La línea <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 -#, fuzzy +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" "literal>. Specifying this origin in the APT preferences file would require " "the line:" msgstr "" -"Indica la procedencia de los paquetes en el árbol de directorios del fichero " -"<filename>Release</filename>. La procedencia más común es <literal>Debian</" -"literal>. Para especificar una preferencia de acuerdo con este parámetro " -"tendrá que poner la siguiente línea en el fichero de preferencias de APT:" +"indica la procedencia de los paquetes en el árbol de directorios del fichero " +"<filename>Release</filename>. La fuente más común es <literal>Debian</" +"literal>. Puede definir esta fuente en el fichero de preferencias de APT " +"mediante la siguiente línea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:434 +#, no-wrap msgid "Pin: release o=Debian\n" -msgstr "" -"<programlisting>\n" -"Pin: release o=Debian\n" +msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 -#, fuzzy +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" -msgstr "La línea <literal>Label:</literal> " +msgstr "La línea <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 -#, fuzzy +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8100,21 +8851,18 @@ msgid "" "the line:" msgstr "" "nombra la etiqueta de los paquetes en los árboles de directorios del fichero " -"<filename>Release</filename>. Normalmente es <literal>Debian</literal>. Para " -"especificar una preferencia de acuerdo con este parámetro tendrá que poner " -"la siguiente línea en el fichero de preferencias de APT:" +"<filename>Release</filename>. Generalmente, es <literal>Debian</literal>. " +"Puede definir esta etiqueta en el fichero de preferencias de APT mediante la " +"siguiente línea:" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:447 +#, no-wrap msgid "Pin: release l=Debian\n" -msgstr "" -"<programlisting>\n" -"Pin: release l=Debian\n" +msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 -#, fuzzy +#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8125,18 +8873,18 @@ msgid "" "nearly all of the lines in a <filename>Release</filename> file are relevant " "for setting APT priorities: <placeholder type=\"variablelist\" id=\"0\"/>" msgstr "" -"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</emphasis> los " -"paquetes por debajo del directorio padre. Al contrario que el fichero " -"<filename>Packages</filename>, casi todas las líneas del fichero " -"<filename>Release</filename> son relevantes para las prioridades de APT:" +"El fichero <filename>Release</filename> se suele encontrar en el directorio " +"<filename>.../dists/<replaceable>nombre-dist</replaceable></filename>, por " +"ejemplo <filename>.../dists/stable/Release</filename> o <filename>.../dists/" +"woody/Release</filename>. El fichero consiste en registros de una sola línea " +"que se aplican a <emphasis>todos</emphasis> los paquetes por debajo del " +"directorio padre. Al contrario que el fichero <filename>Packages</filename>, " +"casi todas las líneas del fichero <filename>Release</filename> son " +"relevantes para las prioridades de APT: <placeholder type=\"variablelist\" " +"id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 -#, fuzzy +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8150,25 +8898,23 @@ msgid "" "<literal>unstable</literal> distribution." msgstr "" "Todos los ficheros <filename>Packages</filename> y <filename>Release</" -"filename> que se obtienen de los recursos de &sources-list; se guardan en el " +"filename> obtenidos de los recursos en «&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</literal>, que puede " -"estar definida en el fichero <filename>apt.conf</filename>. Por ejemplo, el " -"fichero <filename>debian.lcs.mit.edu_debian_dists_unstable_contrib_binary-" +"definido por la variable <literal>Dir::State::Lists</literal>, que se puede " +"definir en el fichero <filename>apt.conf</filename>. 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</literal> para la arquitectura " "<literal>binary-i386</literal> de la sección <literal>contrib</literal> de " -"la distribución <literal>inestable</literal>." +"la distribución «<literal>unstable</literal>» (inestable)." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 -#, fuzzy +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" -msgstr "Líneas opcionales en un registro de preferencias de APT" +msgstr "Líneas opcionales en el registro de preferencias de APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 -#, fuzzy +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8179,8 +8925,7 @@ msgstr "" "Útil para comentarios." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 -#, fuzzy +#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8188,18 +8933,17 @@ msgid "" "literal>." msgstr "" "La línea <literal>Pin-Priority:</literal> 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 ...</literal>." +"asigna una prioridad de un número menor que la última prioridad especificada " +"en una línea que empiece con <literal>Pin-Priority: release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 -#, fuzzy +#: apt_preferences.5.xml:482 msgid "Tracking Stable" -msgstr "Siguiendo la distribución estable" +msgstr "Seguir la distribución «stable» (estable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:490 +#, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" "Explanation: package versions other than those in the stable distro\n" @@ -8211,7 +8955,6 @@ msgid "" "Pin: release o=Debian\n" "Pin-Priority: -10\n" msgstr "" -"<programlisting>\n" "Explanation: Desinstalar o no instalar los ejemplares que no\n" "Explanation: pertenecen a la distribución estable\n" "Package: *\n" @@ -8223,8 +8966,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 -#, fuzzy +#: apt_preferences.5.xml:484 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8233,47 +8975,46 @@ msgid "" "distributions. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "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</literal> y una prioridad más baja al resto " -"de las distribuciones <literal>Debian</literal>." +"prioridad mayor de la que asigna por omisión (500) a todas las versiones de " +"paquete de la distribución <literal>stable</literal> y una prioridad más " +"baja al resto de versiones de paquetes de otras distribuciones " +"<literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 +#, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" "apt-get upgrade\n" "apt-get dist-upgrade\n" msgstr "" -"<programlisting>\n" "apt-get install <replaceable>paquete</replaceable>\n" "apt-get upgrade\n" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 -#, fuzzy +#: apt_preferences.5.xml:502 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " "<literal>stable</literal> version(s). <placeholder type=\"programlisting\" " "id=\"0\"/>" msgstr "" -"Con un fichero &sources-list; apropiado y el fichero de preferencias " +"Con un fichero «&sources-list;» adecuado 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</literal>." +"última versión en <literal>stable</literal>. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:519 +#, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" -msgstr "rdepends <replaceable>paquetes(s)</replaceable>" +msgstr "apt-get install <replaceable>paquete</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 -#, fuzzy +#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8281,18 +9022,18 @@ msgid "" "type=\"programlisting\" id=\"0\"/>" msgstr "" "La siguiente orden hace que APT actualice un paquete a la última versión de " -"la distribución de <literal>pruebas</literal>, el paquete no se actualizará " -"de nuevo amenos que se ejecute de nuevo la orden." +"la distribución <literal>testing</literal>, el paquete no se actualizará de " +"nuevo a menos que se ejecute la orden otra vez. <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 -#, fuzzy +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" -msgstr "Siguiendo la distribución de pruebas o inestable" +msgstr "Seguir la distribución «testing» (en pruebas) o «unstable» (inestable)" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:534 +#, no-wrap msgid "" "Package: *\n" "Pin: release a=testing\n" @@ -8306,7 +9047,6 @@ msgid "" "Pin: release o=Debian\n" "Pin-Priority: -10\n" msgstr "" -"<programlisting>\n" "Package: *\n" "Pin: release a=testing\n" "Pin-Priority: 900\n" @@ -8320,8 +9060,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 -#, fuzzy +#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8331,34 +9070,33 @@ msgid "" "\"programlisting\" id=\"0\"/>" msgstr "" "El siguiente fichero de preferencias de APT provocará que APT asigne mayor " -"prioridad a las versiones de la distribución de <literal>pruebas</literal>, " -"una prioridad menor a los paquetes de la distribución <literal>inestable</" +"prioridad a las versiones de la distribución <literal>testing</literal>, una " +"prioridad menor a los paquetes de la distribución <literal>unstable</" "literal>, y una prioridad prohibitiva a los paquetes de otras distribuciones " -"de <literal>Debian</literal>." +"de <literal>Debian</literal>. <placeholder type=\"programlisting\" id=\"0\"/" +">" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 -#, fuzzy +#: apt_preferences.5.xml:548 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " "<literal>testing</literal> version(s). <placeholder type=\"programlisting\" " "id=\"0\"/>" msgstr "" -"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</" -"literal>." +"Con un fichero &sources-list; adecuado y el fichero de preferencias anterior " +"cualquiera de las siguientes órdenes hará que APT actualice los paquetes a " +"la última versión de la distribución <literal>testing</literal>. " +"<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:568 +#, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" -msgstr "rdepends <replaceable>paquetes(s)</replaceable>" +msgstr "apt-get install <replaceable>paquete</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 -#, fuzzy +#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -8369,21 +9107,21 @@ msgid "" "<placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" "La siguiente orden hace que APT actualice un determinado paquete a la última " -"versión de la distribución <literal>inestable</literal>. Más tarde, " -"<command>apt-get upgrade</command> actualizarán el paquete a la última " -"versión de la distribución de <literal>pruebas</literal> si es más reciente " -"que la versión instalada, de otro modo, se instalará la versión más reciente " -"de la distribución<literal>inestable</literal> si es más reciente que la " -"versión instalada." +"versión de la distribución <literal>unstable</literal>. Más tarde, " +"<command>apt-get upgrade</command> actualizará el paquete a la última " +"versión de la distribución <literal>testing</literal> si es más reciente que " +"la versión instalada. De otro modo, se instalará la versión más reciente de " +"la distribución<literal>unstable</literal> si es más reciente que la versión " +"instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" -msgstr "" +msgstr "Seguir la evolución de una publicación por el nombre" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:589 +#, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" "Explanation: other than those in the distribution codenamed with squeeze or sid\n" @@ -8400,19 +9138,23 @@ msgid "" "Pin: release o=Debian\n" "Pin-Priority: -10\n" msgstr "" -"<programlisting>\n" -"Explanation: Desinstalar o no instalar los ejemplares que no\n" -"Explanation: pertenecen a la distribución estable\n" +"Explanation: Eliminar o no instalar cualquier paquete de Debian cuya versión sea\n" +"Explanation: distinta a aquellos en las distribuciones de nombre squeeze o sid\n" "Package: *\n" -"Pin: release a=stable\n" +"Pin: release n=squeeze\n" "Pin-Priority: 900\n" "\n" +"Explanation: El nombre clave de Debian unstable siempre es sid\n" +"Package: *\n" +"Pin: release a=sid\n" +"Pin-Priority: 800\n" +"\n" "Package: *\n" "Pin: release o=Debian\n" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8425,30 +9167,40 @@ msgid "" "notwithstanding the codename changes you should use the example " "configurations above. <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" +"El siguiente fichero de preferencias de APT provocará que APT asigne una " +"prioridad superior a la predeterminada (500) a todas las versiones de " +"paquetes pertenecientes a un nombre de distribución especificado, y una " +"prioridad prohibitivamente baja a las versiones de paquetes pertenecientes a " +"otras distribuciones de <literal>Debian</literal>, nombres clave y archivos " +"Debian. Tenga en cuenta que con esta preferencia, APT seguirá la migración " +"de una publicación desde el archivo <literal>testing</literal> a " +"<literal>stable</literal> y por último <literal>oldstable</literal>. Si " +"desea seguir, por ejemplo, el progreso en <literal>testing</literal> " +"obviando el nombre de la publicación, debería usar los ejemplos de " +"configuración mencionados anteriormente. <placeholder type=\"programlisting" +"\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 -#, fuzzy +#: apt_preferences.5.xml:606 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " "the release codenamed with <literal>squeeze</literal>. <placeholder type=" "\"programlisting\" id=\"0\"/>" msgstr "" -"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</literal>." +"Con un fichero «&sources-list;» adecuado y el fichero de preferencias " +"mostrado anteriormente, cualquiera de las siguientes órdenes provocará que " +"APT actualice los paquetes a la última versión de la distribución llamada " +"<literal>squeeze</literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 -#, fuzzy, no-wrap +#: apt_preferences.5.xml:626 +#, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" -msgstr "rdepends <replaceable>paquetes(s)</replaceable>" +msgstr "apt-get install <replaceable>paquete</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 -#, fuzzy +#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -8459,55 +9211,49 @@ msgid "" "type=\"programlisting\" id=\"0\"/>" msgstr "" "La siguiente orden hace que APT actualice un determinado paquete a la última " -"versión de la distribución <literal>inestable</literal>. Más tarde, " -"<command>apt-get upgrade</command> actualizarán el paquete a la última " -"versión de la distribución de <literal>pruebas</literal> si es más reciente " -"que la versión instalada, de otro modo, se instalará la versión más reciente " -"de la distribución<literal>inestable</literal> si es más reciente que la " -"versión instalada." +"versión de la distribución <literal>sid</literal>. Más tarde, <command>apt-" +"get upgrade</command> actualizará el paquete a la última versión de la " +"distribución<literal>squeeze</literal> si es más reciente que la versión " +"instalada. De otro modo, se instalará la versión más reciente de la " +"distribución <literal>sid</literal> si es más reciente que la versión " +"instalada. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 -#, fuzzy +#: apt_preferences.5.xml:635 msgid "&file-preferences;" -msgstr "apt_preferences" +msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 -#, fuzzy +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" -msgstr "&apt-conf;, &apt-get;, &sources-list;" +msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. type: Content of: <refentry><refnamediv><refname> #: sources.list.5.xml:22 sources.list.5.xml:29 -#, fuzzy msgid "sources.list" -msgstr "source" +msgstr "sources.list" #. type: Content of: <refentry><refnamediv><refpurpose> #: sources.list.5.xml:30 -#, fuzzy msgid "Package resource list for APT" -msgstr "lista de recursos de paquetes para APT" +msgstr "Lista de los repositorios de paquetes para APT" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:34 -#, fuzzy msgid "" "The package resource list is used to locate archives of the package " "distribution system in use on the system. At this time, this manual page " "documents only the packaging system used by the Debian GNU/Linux system. " "This control file is <filename>/etc/apt/sources.list</filename>." msgstr "" -"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</filename>" +"La lista de los repositorios de paquetes se usa para ubicar los archivos de " +"Debian del sistema de distribución de paquetes en uso en el sistema. A día " +"de hoy, esta página del manual documenta sólo el sistema de paquetes que usa " +"Debian GNU/Linux. Este fichero de control está ubicado en <filename>/etc/apt/" +"sources.list</filename>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:39 -#, fuzzy msgid "" "The source list is designed to support any number of active sources and a " "variety of source media. The file lists one source per line, with the most " @@ -8518,21 +9264,20 @@ msgid "" "Universal Resource Locator, or URL. The rest of the line can be marked as a " "comment by using a #." msgstr "" -"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</literal>. El primer elemento, " -"<literal>tipo</literal>, determina el formato de <literal>argumentos</" -"literal>. <literal>uri</literal> 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 #." +"La lista de los repositorios está diseñada para gestionar cualquier número " +"de fuentes y distintos tipos de procedencias. El fichero lista una fuente " +"por línea, con la fuente de mayor prioridad en la primera línea. El formato " +"de cada línea es: <literal>tipo uri argumentos</literal>. El primer " +"elemento, <literal>tipo</literal>, determina el formato de " +"<literal>argumentos</literal>. <literal>uri</literal> es «Universal Resource " +"Identifier» (Identificador Universal de Recursos), un superconjunto de la " +"más específica y bien conocida «Universal Resource Locator» (URL). Se puede " +"marcar el resto de la línea como comentario usando #." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:50 -#, fuzzy msgid "sources.list.d" -msgstr "source" +msgstr "sources.list.d" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:51 @@ -8544,16 +9289,20 @@ msgid "" "digits (0-9), underscore (_), hyphen (-) and period (.) characters. " "Otherwise they will be silently ignored." msgstr "" +"El directorio <filename>/etc/apt/sources.list.d</filename> ofrece una manera " +"de añadir entradas de «sources.list» en ficheros separados. El formato es " +"idéntico al del fichero normal <filename>sources.list</filename>. Los " +"nombres de los ficheros deben terminar en <filename>.list</filename>, y sólo " +"pueden contener caracteres de letras (a-z y A-Z), dígitos (0-9), guión bajo " +"(_), guión (-) y punto (.). Otros caracteres se ignorarán." #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:60 -#, fuzzy msgid "The deb and deb-src types" -msgstr "Los tipos deb y deb-src" +msgstr "Los tipos «deb» y «deb-src»" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:61 -#, fuzzy msgid "" "The <literal>deb</literal> type describes a typical two-level Debian " "archive, <filename>distribution/component</filename>. Typically, " @@ -8566,19 +9315,18 @@ msgid "" "is required to fetch source indexes." msgstr "" "El tipo <literal>deb</literal> hace referencia a un típico archivo de Debian " -"de dos niveles, <filename>distribución/componente</filename>. Normalmente " -"<literal>distribución</literal> es <literal>stable</literal>, " -"<literal>testing</literal>, o <literal>unstable</literal>, mientras que " -"componente es <literal>main</literal>, <literal>contrib</literal>, " -"<literal>non-free</literal>, o <literal>non-us</literal>. El tipo " -"<literal>deb-src</literal> hace referencia al código fuente de la " -"distribución con la misma sintaxis que el tipo <literal>deb</literal>. Es " -"necesaria una línea <literal>deb-src</literal> para descargar un índice de " -"los paquetes que tienen código fuente disponible." +"de dos niveles, <filename>distribución/componente</filename>. Normalmente, " +"<literal>distribución</literal> es «<literal>stable</literal>» (estable), " +"«<literal>testing</literal>» (en pruebas), o «<literal>unstable</" +"literal>» (inestable), mientras que el componente es <literal>main</literal> " +"(principal), <literal>contrib</literal>, <literal>non-free</literal> (no " +"libre), o <literal>non-us</literal>. El tipo <literal>deb-src</literal> hace " +"referencia al código fuente de la distribución con la misma sintaxis que el " +"tipo <literal>deb</literal>. Debe insertar una línea <literal>deb-src</" +"literal> para obtener los índices de fuentes." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:73 -#, fuzzy msgid "" "The format for a <filename>sources.list</filename> entry using the " "<literal>deb</literal> and <literal>deb-src</literal> types is:" @@ -8588,15 +9336,12 @@ msgstr "" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:76 -#, fuzzy, no-wrap +#, no-wrap msgid "deb uri distribution [component1] [component2] [...]" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb uri distribución [componente1] [componente2] [...]" +msgstr "deb uri distribución [componente1] [componente2] [...]" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:78 -#, fuzzy msgid "" "The URI for the <literal>deb</literal> type must specify the base of the " "Debian distribution, from which APT will find the information it needs. " @@ -8607,18 +9352,17 @@ msgid "" "literal> does not specify an exact path, at least one <literal>component</" "literal> must be present." msgstr "" -"La URI para el tipo <literal>deb</literal> debe de especificar la base de la " -"distribución de Debian, donde APT encontrará la información que necesita. " -"<literal>distribución</literal> puede especificar un ruta exacta, en cuyo " -"caso se deben omitir los componentes y <literal>distribución</literal> 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</literal> " -"no especifica la ruta exacta, al menos uno de los <literal>componentes</" -"literal> debe de estar presente." +"La URI para el tipo <literal>deb</literal> debe especificar la base de la " +"distribución de Debian desde la que APT encontrará la información que " +"necesita. <literal>distribución</literal> puede definir una ruta exacta, en " +"cuyo caso debe omitir los componentes y <literal>distribución</literal> debe " +"finalizar con una barra (/). Esto es útil cuando sólo se quiere una sub-" +"sección del archivo señalado por la URI. Al menos uno de los " +"<literal>componentes</literal> debe estar presente si <literal>distribución</" +"literal> no define una ruta exacta." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:87 -#, fuzzy msgid "" "<literal>distribution</literal> may also contain a variable, <literal>$(ARCH)" "</literal> which expands to the Debian architecture (i386, m68k, " @@ -8628,16 +9372,15 @@ msgid "" "automatically generate a URI with the current architecture otherwise." msgstr "" "<literal>distribución</literal> puede contener una variable, <literal>$(ARCH)" -"</literal>, que se expandirá en la arquitectura de Debian usada en el " -"sistema (i386, m68k, powerpc, ...). Esto permite que <filename>sources.list</" -"filename> 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</literal> generará automáticamente la URI con la " +"</literal>, que se expandirá a la arquitectura de Debian usada en el sistema " +"(i386, m68k, powerpc, ...). Esto permite que los ficheros <filename>sources." +"list</filename> sean independientes de la arquitectura. En general, esta " +"característica sólo es de interés si se especifica una ruta completa, de lo " +"contrario <literal>APT</literal> generará automáticamente la URI con la " "arquitectura actual del sistema." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:95 -#, fuzzy msgid "" "Since only one distribution can be specified per line it may be necessary to " "have multiple lines for the same URI, if a subset of all available " @@ -8650,88 +9393,80 @@ msgid "" "number of simultaneous anonymous users. APT also parallelizes connections to " "different hosts to more effectively deal with sites with low bandwidth." msgstr "" -"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." +"Debido a que sólo se puede especificar una distribución por línea, es " +"posible que se precisen varias líneas para la misma URI si desea tener " +"acceso a más de una distribución o componente de esa ubicación. APT ordenará " +"internamente la lista de direcciones URI después de generar una copia " +"interna, y unirá 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 otra cosa, y entonces restablecer la conexión con el mismo " +"servidor. Esta característica es útil para acceder a sitios FPT muy " +"visitados que limitan el número de accesos simultáneos a usuarios anónimos. " +"APT también realizará conexiones paralelas a diferentes servidores para " +"aprovechar mejor el ancho de banda." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:107 -#, fuzzy msgid "" "It is important to list sources in order of preference, with the most " "preferred source listed first. Typically this will result in sorting by " "speed from fastest to slowest (CD-ROM followed by hosts on a local network, " "followed by distant Internet hosts, for example)." msgstr "" -"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)." +"Es importante listar las fuentes por orden de preferencia, con la fuente " +"preferente al inicio. 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)." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:112 -#, fuzzy msgid "Some examples:" msgstr "Algunos ejemplos:" #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:114 -#, fuzzy, no-wrap +#, no-wrap msgid "" "deb http://http.us.debian.org/debian stable main contrib non-free\n" "deb http://http.us.debian.org/debian dists/stable-updates/\n" " " msgstr "" -"<literallayout class=\"normal\">\n" "deb http://http.us.debian.org/debian stable main contrib non-free\n" "deb http://http.us.debian.org/debian dists/stable-updates/\n" " " #. type: Content of: <refentry><refsect1><title> #: sources.list.5.xml:120 -#, fuzzy msgid "URI specification" -msgstr "especificación de la URI" +msgstr "Especificación de la URI" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:125 -#, fuzzy msgid "file" -msgstr "Ficheros" +msgstr "file" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:127 -#, fuzzy msgid "" "The file scheme allows an arbitrary directory in the file system to be " "considered an archive. This is useful for NFS mounts and local mirrors or " "archives." msgstr "" -"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." +"El esquema «file» permite considerar cualquier directorio en el sistema de " +"ficheros como un archivo de paquetes adicional. Esto es útil para " +"particiones montadas mediante NFS y réplicas o archivos de paquetes locales." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:134 -#, fuzzy msgid "" "The cdrom scheme allows APT to use a local CDROM drive with media swapping. " "Use the &apt-cdrom; program to create cdrom entries in the source list." msgstr "" -"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." +"El esquema «cdrom» permite a APT usar la unidad de CDROM local. Use el " +"programa &apt-cdrom; para añadir entradas de un disco óptico a «sources.list»." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:141 -#, fuzzy msgid "" "The http scheme specifies an HTTP server for the archive. If an environment " "variable <envar>http_proxy</envar> is set with the format http://server:" @@ -8740,16 +9475,15 @@ msgid "" "http://user:pass@server:port/. Note that this is an insecure method of " "authentication." msgstr "" -"Http especifica un servidor HTTP como archivo. Si la variable de entorno " -"<envar>http_proxy</envar> está establecida con el formato http://server:" -"port/, se usará el servidor proxy especificado en <envar>http_proxy</envar>. " -"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." +"El esquema «http» especifica un servidor HTTP como archivo. Si la variable de " +"entorno <envar>http_proxy</envar> está definida con formato «http://servidor:" +"puerto/», se usará el servidor proxy definido en <envar>http_proxy</envar>. " +"Los usuarios de servidores proxy con autenticación HTTP/1.1 deberán usar la " +"cadena de caracteres «http://usuario:contraseña@servidor:puerto/». Tenga en " +"cuenta que este método de autenticación no es seguro." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:152 -#, fuzzy msgid "" "The ftp scheme specifies an FTP server for the archive. APT's FTP behavior " "is highly configurable; for more information see the &apt-conf; manual page. " @@ -8759,48 +9493,42 @@ msgid "" "method. ftp proxies using http specified in the configuration file will be " "ignored." msgstr "" -"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</envar>. 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." +"El esquema «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 de manual de &apt-conf;. Tenga en cuenta que puede especificar un " +"proxy ftp usando la variable de entorno <envar>ftp_proxy</envar>. Es posible " +"especificar un servidor proxy http (los servidores proxy http normalmente " +"comprenden las url de tipo ftp) usando este método y SÓLO este método. Se " +"ignorarán proxies ftp definidos en el fichero de configuración que usen http." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:161 -#, fuzzy msgid "copy" msgstr "copy" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:163 -#, fuzzy msgid "" "The copy scheme is identical to the file scheme except that packages are " "copied into the cache directory instead of used directly at their location. " "This is useful for people using a zip disk to copy files around with APT." msgstr "" -"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." +"El esquema «copy» es idéntico a «file», pero los paquetes se copian al " +"directorio almacén en vez de usarlos directamente en su ubicación original. " +"Esto es útil para gente que use discos zip con APT." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:168 -#, fuzzy msgid "rsh" msgstr "rsh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:168 -#, fuzzy msgid "ssh" msgstr "ssh" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:170 -#, fuzzy msgid "" "The rsh/ssh method invokes rsh/ssh to connect to a remote host as a given " "user and access the files. It is a good idea to do prior arrangements with " @@ -8808,20 +9536,31 @@ msgid "" "<command>find</command> and <command>dd</command> commands to perform the " "file transfers from the remote." msgstr "" -"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</command> y <command>dd</command> para " -"realizar las transferencias." +"El método «rsh/ssh» invoca «rsh/ssh» para establecer conexiones con los " +"servidores remotos como un usuario dado, y acceder a los ficheros. Es " +"aconsejable realizar previamente una configuración de claves RSA o rhosts. " +"El acceso a los ficheros remotos usa las órdenes estándar <command>find</" +"command> y <command>dd</command> para realizar la transferencia de ficheros." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><term> #: sources.list.5.xml:178 +#, fuzzy +#| msgid "more recongnizable URI types" msgid "more recognizable URI types" -msgstr "" +msgstr "Otros tipos de URI reconocidos." #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: sources.list.5.xml:180 +#, fuzzy +#| msgid "" +#| "APT can be extended with more methods shipped in other optional packages " +#| "which should follow the nameing scheme <literal>apt-transport-" +#| "<replaceable>method</replaceable></literal>. The APT team e.g. maintain " +#| "also the <literal>apt-transport-https</literal> package which provides " +#| "access methods for https-URIs with features similiar to the http method, " +#| "but other methods for using e.g. debtorrent are also available, see " +#| "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</" +#| "filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgid "" "APT can be extended with more methods shipped in other optional packages " "which should follow the nameing scheme <literal>apt-transport-" @@ -8832,146 +9571,134 @@ msgid "" "<citerefentry> <refentrytitle><filename>apt-transport-debtorrent</filename></" "refentrytitle> <manvolnum>1</manvolnum></citerefentry>." msgstr "" +"Puede extender APT con más métodos, proporcionados en otros paquetes " +"opcionales que siguen el esquema de nombre <literal>apt-transport-" +"<replaceable>método</replaceable></literal>. El equipo de APT, por ejemplo, " +"es responsable del paquete <literal>apt-transport-https</literal>, que " +"ofrece métodos de acceso para URI https con características similares al " +"método «http». Existen otros métodos disponibles, por ejemplo «debtorrent», " +"consulte <citerefentry> <refentrytitle><filename>apt-transport-debtorrent</" +"filename></refentrytitle> <manvolnum>1</manvolnum></citerefentry>." #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:122 -#, fuzzy msgid "" "The currently recognized URI types are cdrom, file, http, ftp, copy, ssh, " "rsh. <placeholder type=\"variablelist\" id=\"0\"/>" -msgstr "Se reconocen los siguientes tipos de URI: cdrom, file, http, y ftp." +msgstr "" +"Los tipos de URI reconocidos son cdrom, file, http, ftp, copy, ssh y rsh. " +"<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:194 -#, fuzzy msgid "" "Uses the archive stored locally (or NFS mounted) at /home/jason/debian for " "stable/main, stable/contrib, and stable/non-free." msgstr "" -"Usa el archivo local (o montado mediante NFS) en /home/jason/debian para " -"stable/main, stable/contrib, y stable/non-free." +"Usa el archivo local (o montado mediante NFS) en «/home/jason/debian» para " +"«stable/main», «stable/contrib», y «stable/non-free»." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:196 -#, fuzzy, no-wrap +#, no-wrap msgid "deb file:/home/jason/debian stable main contrib non-free" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb file:/home/jason/debian stable main contrib non-free" +msgstr "deb file:/home/jason/debian stable main contrib non-free" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:198 -#, fuzzy msgid "As above, except this uses the unstable (development) distribution." -msgstr "Como arriba, excepto que usa la distribución inestable." +msgstr "" +"Como arriba, excepto que usa la distribución «unstable» (en desarrollo)." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:199 -#, fuzzy, no-wrap +#, no-wrap msgid "deb file:/home/jason/debian unstable main contrib non-free" -msgstr "<literallayout class=\"normal\">deb file:/home/jason/debian unstable main contrib non-free" +msgstr "deb file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:201 -#, fuzzy msgid "Source line for the above" -msgstr "Línea para el código fuente de lo mismo que arriba" +msgstr "Línea para obtener el código fuente desde la ubicación anterior." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:202 -#, fuzzy, no-wrap +#, no-wrap msgid "deb-src file:/home/jason/debian unstable main contrib non-free" -msgstr "<literallayout class=\"normal\">deb-src file:/home/jason/debian unstable main contrib non-free" +msgstr "deb-src file:/home/jason/debian unstable main contrib non-free" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:204 -#, fuzzy msgid "" "Uses HTTP to access the archive at archive.debian.org, and uses only the " "hamm/main area." msgstr "" -"Usa HTTP para acceder al archivo en archive.debian.org, y usa sólo la parte " -"de hamm/main." +"Usa HTTP para acceder al archivo de Debian en «archive.debian.org», y usa " +"sólo la sección «hamm/main»." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:206 -#, fuzzy, no-wrap +#, no-wrap msgid "deb http://archive.debian.org/debian-archive hamm main" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb http://archive.debian.org/debian-archive hamm main" +msgstr "deb http://archive.debian.org/debian-archive hamm main" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:208 -#, fuzzy msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the stable/contrib area." msgstr "" -"Usa FTP para acceder al archivo en ftp.debian.org, debajo del directorio " -"debian, y usa sólo la parte de stable/contrib." +"Usa FTP para acceder al archivo de Debian en «ftp.debian.org», debajo del " +"directorio «debian», y usa sólo la sección «stable/contrib»." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:210 -#, fuzzy, no-wrap +#, no-wrap msgid "deb ftp://ftp.debian.org/debian stable contrib" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian stable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:212 -#, fuzzy msgid "" "Uses FTP to access the archive at ftp.debian.org, under the debian " "directory, and uses only the unstable/contrib area. If this line appears as " "well as the one in the previous example in <filename>sources.list</filename> " "a single FTP session will be used for both resource lines." msgstr "" -"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</filename>, se usará " -"sólo una sesión FTP para ambas." +"Usa FTP para acceder al archivo de Debian en «ftp.debian.org», debajo del " +"directorio «debian», y usa sólo la sección unstable/contrib. Si tanto esta " +"línea como la del ejemplo anterior aparecen en <filename>sources.list</" +"filename>, se usará sólo una sesión FTP para ambas." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:216 -#, fuzzy, no-wrap +#, no-wrap msgid "deb ftp://ftp.debian.org/debian unstable contrib" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb ftp://ftp.debian.org/debian stable contrib" +msgstr "deb ftp://ftp.debian.org/debian unstable contrib" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:218 -#, fuzzy msgid "" "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " "directory." msgstr "" -"Usa HTTP para acceder al archivo en nonus.debian.org, bajo el directorio " -"debian-non-US." +"Usa HTTP para acceder al archivo de Debian en «nonus.debian.org», bajo el " +"directorio debian-non-US." #. type: Content of: <refentry><refsect1><literallayout> #: sources.list.5.xml:220 -#, fuzzy, no-wrap +#, no-wrap msgid "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb http://nonus.debian.org/debian-non-US stable/non-US main\n" -" contrib non-free" +msgstr "deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free" #. type: Content of: <refentry><refsect1><para><literallayout> #: sources.list.5.xml:229 -#, fuzzy, no-wrap +#, no-wrap msgid "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" -msgstr "" -"<literallayout class=\"normal\">\n" -"deb http://ftp.de.debian.org/debian-non-US\n" -" unstable/binary-$(ARCH)/" +msgstr "deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:222 -#, fuzzy msgid "" "Uses HTTP to access the archive at nonus.debian.org, under the debian-non-US " "directory, and uses only files found under <filename>unstable/binary-i386</" @@ -8980,45 +9707,46 @@ msgid "" "only illustrates how to use the substitution variable; non-us is no longer " "structured like this] <placeholder type=\"literallayout\" id=\"0\"/>" msgstr "" -"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 " +"Usa HTTP para acceder al archivo en «nonus.debian.org», bajo el directorio " +"«debian-non-US», y sólo usa ficheros que se encuentren bajo " "<filename>unstable/binary-i386</filename> en máquinas i386, " "<filename>unstable/binary-m68k</filename> 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)" +"las arquitecturas compatibles. (Tenga en cuenta que este ejemplo sólo sirve " +"para ilustrar cómo se usa la variable de sustitución, «non-us» ya tiene esta " +"estructura.) <placeholder type=\"literallayout\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> #: sources.list.5.xml:234 -#, fuzzy msgid "&apt-cache; &apt-conf;" msgstr "&apt-cache; &apt-conf;" #. type: <title></title> #: guide.sgml:4 msgid "APT User's Guide" -msgstr "" +msgstr "Guía de usuario de APT" #. type: <author></author> #: guide.sgml:6 offline.sgml:6 msgid "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>" -msgstr "" +msgstr "<name>Jason Gunthorpe </name><email>jgg@debian.org</email>" #. type: <version></version> #: guide.sgml:7 msgid "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" -msgstr "" +msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: <abstract></abstract> #: guide.sgml:11 msgid "" "This document provides an overview of how to use the the APT package manager." msgstr "" +"Este documento ofrece una introducción sobre cómo usar el gestor de paquetes " +"APT." #. type: <copyrightsummary></copyrightsummary> #: guide.sgml:15 msgid "Copyright © Jason Gunthorpe, 1998." -msgstr "" +msgstr "Copyright © Jason Gunthorpe, 1998." #. type: <p></p> #: guide.sgml:21 offline.sgml:22 @@ -9028,6 +9756,10 @@ msgid "" "published by the Free Software Foundation; either version 2 of the License, " "or (at your option) any later version." msgstr "" +"APT y este documento son software libre. Se garantiza permiso para copiar, " +"distribuir y modificar este documento según los términos de la GNU General " +"Public License publicada por la Free Software Foundation, ya sea en su " +"versión 2 o (a su elección) cualquier versión posterior." #. type: <p></p> #: guide.sgml:24 offline.sgml:25 @@ -9035,11 +9767,13 @@ msgid "" "For more details, on Debian GNU/Linux systems, see the file /usr/share/" "common-licenses/GPL for the full license." msgstr "" +"Para más detalles acerca de sistemas Debian GNU/Linux y la licencia " +"completa, consulte el fichero «/usr/share/common-licenses/GPL»." #. type: <heading></heading> #: guide.sgml:32 msgid "General" -msgstr "" +msgstr "General" #. type: <p></p> #: guide.sgml:38 @@ -9049,11 +9783,15 @@ msgid "" "provide a way to install and remove packages as well as download new " "packages from the Internet." msgstr "" +"El paquete APT contiene a día de hoy dos secciones, el método <prgn>dselect</" +"prgn> y la interfaz de usuario para la línea de órdenes <prgn>apt-get</" +"prgn>. Ambos ofrecen una manera de instalar y desinstalar paquetes, así como " +"descargar paquetes nuevos de Internet." #. type: <heading></heading> #: guide.sgml:39 msgid "Anatomy of the Package System" -msgstr "" +msgstr "Anatomía del sistema de paquetes" #. type: <p></p> #: guide.sgml:44 @@ -9062,6 +9800,9 @@ msgid "" "with each package to help assure that it integrates cleanly and easily into " "the system. The most prominent of its features is the dependency system." msgstr "" +"El sistema de empaquetado de Debian tiene una gran cantidad de información " +"asociada a cada paquete para asegurar una integración sencilla y limpia en " +"el sistema. La característica más importante es el sistema de dependencias." #. type: <p></p> #: guide.sgml:52 @@ -9072,6 +9813,12 @@ msgid "" "things the average user is required to install. Also, it allows for choices " "in mail transport agents, X servers and so on." msgstr "" +"El sistema de dependencias permite el uso de elementos compartidos en el " +"sistema por programas individuales, tales como bibliotecas. Ésto simplifica " +"ubicar porciones poco usadas de programas en distintos paquetes para así " +"reducir el número de cosas que el usuario medio tiene que instalar. También " +"permite elegir el agente de transporte del correo electrónico, el servidor " +"de X y demás." #. type: <p></p> #: guide.sgml:57 @@ -9081,15 +9828,30 @@ msgid "" "package requires another package to be installed at the same time to work " "properly." msgstr "" +"El primer paso para entender el sistema de dependencias es familiarizarse " +"con el concepto de dependencia simple. El significado de una dependencia " +"simple es que un paquete requiere que otro también esté instalado para poder " +"funcionar correctamente." #. type: <p></p> #: guide.sgml:63 +#, fuzzy +#| msgid "" +#| "For instance, mailcrypt is an emacs extension that aids in encrypting " +#| "email with GPG. Without GPGP installed mail-crypt is useless, so " +#| "mailcrypt has a simple dependency on GPG. Also, because it is an emacs " +#| "extension it has a simple dependency on emacs, without emacs it is " +#| "completely useless." msgid "" "For instance, mailcrypt is an emacs extension that aids in encrypting email " "with GPG. Without GPGP installed mailcrypt is useless, so mailcrypt has a " "simple dependency on GPG. Also, because it is an emacs extension it has a " "simple dependency on emacs, without emacs it is completely useless." msgstr "" +"Por ejemplo, mailcrypt es una extensión de emacs que asiste en el cifrado de " +"correo con GPG. Sin GPG, mailcrypt es inservible, y por ello mailcrypt tiene " +"una dependencia simple con GPG. Como también es una extensión de emacs tiene " +"una dependencia simple con emacs, ya que sin él mailcrypt es inservible." #. type: <p></p> #: guide.sgml:73 @@ -9103,6 +9865,15 @@ msgid "" "system so all mail transport agents have a conflicting dependency with all " "other mail transport agents." msgstr "" +"Otra importante dependencia que debe entender es la dependencia de " +"conflicto. Esto se produce cuando se instala un paquete junto con otro de " +"modo que la combinación los hace inservibles, pudiendo causar daños en el " +"sistema. Como ejemplo, suponga un agente de transporte de correo electrónico " +"como sendmail, exim o qmail. Es imposible tener dos agentes de transporte de " +"correo instalados ya que ambos necesitan una conexión con la red para " +"recibir correo. El intento de instalar dos puede dañar gravemente el " +"sistema, y por ello todos los agentes de transporte de correo tienen una " +"dependencia de conflicto con todos los demás." #. type: <p></p> #: guide.sgml:83 @@ -9116,6 +9887,14 @@ msgid "" "depend on mail-transport-agent. This can add a great deal of confusion when " "trying to manually fix packages." msgstr "" +"Para complicarlo todo, cabe la posibilidad de que un paquete pretenda ser " +"otro. En muchos aspectos, exim y sendmail son idénticos; ambos envían correo " +"y entienden una misma interfaz. Por ello, el sistema de paquetes tiene una " +"forma de hacer que ambos declaren ser agentes de transporte de correo («mail-" +"transport-agent»). Así, exim y sendmail declaran que proporcionan un agente " +"de transporte de correo y los paquetes que dependen de tales agentes " +"dependerán de «mail-transport-agent». Esto puede añadir confusión al intentar " +"arreglar paquetes manualmente." #. type: <p></p> #: guide.sgml:88 @@ -9125,6 +9904,10 @@ msgid "" "issues by providing a number of automatic algorithms that help in selecting " "packages for installation." msgstr "" +"Puede que en cualquier momento una dependencia simple se satisfaga por " +"paquetes ya instalados, o que la dependencia no esté satisfecha. APT intenta " +"asistir en la resolución de problemas de dependencias mediante un número de " +"algoritmos automáticos que ayudan en la selección de paquetes a instalar." #. type: <p></p> #: guide.sgml:102 @@ -9134,6 +9917,10 @@ msgid "" "understand .deb files, it works with the package's proper name and can only " "install .deb archives from a <em>Source</em>." msgstr "" +"<prgn>apt-get</prgn> ofrece una forma sencilla de instalar paquetes desde la " +"línea de órdenes. A diferencia de <prgn>dpkg</prgn>, <prgn>apt-get</prgn> no " +"intenta comprender los ficheros «.deb», sino que funciona con el nombre real " +"del paquete y sólo puede instalar ficheros «.deb» desde una <em>fuente</em>." #. type: <p></p> #: guide.sgml:109 @@ -9145,6 +9932,12 @@ msgid "" "packages are available. This is done with <tt>apt-get update</tt>. For " "instance," msgstr "" +"La primera <footnote><p>Si está usando un servidor proxy primero debe " +"definir la variable de entorno http_proxy, consulte sources.list (5).</p></" +"footnote> cosa que debería hacer antes de usar <prgn>apt-get</prgn> es " +"obtener las listas de paquetes desde las <em>fuentes</em> para así conocer " +"los paquetes disponibles. Puede hacer esto mediante <tt>apt-get update</tt>. " +"Por ejemplo," #. type: <example></example> #: guide.sgml:116 @@ -9156,11 +9949,16 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get update\n" +"Des http://ftp.de.debian.org/debian-non-US/ stable/binary-i386/ Packages\n" +"Des http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Leyendo lista de paquetes... Hecho\n" +"Creando árbol de dependencias... Hecho" #. type: <p><taglist> #: guide.sgml:120 msgid "Once updated there are several commands that can be used:" -msgstr "" +msgstr "Puede usar varias órdenes después de actualizar:" #. type: <p></p> #: guide.sgml:131 @@ -9173,6 +9971,14 @@ msgid "" "on new packages or conflict with some other package. <prgn>dselect</prgn> or " "<tt>apt-get install</tt> can be used to force these packages to install." msgstr "" +"«upgrade» intentará actualizar con cuidado todo el sistema. «upgrade» nunca " +"intentará instalar un paquete nuevo o eliminar un paquete existente, y en " +"ningún caso actualizará un paquete que pueda causar un problema de " +"dependencias rotas a otro paquete. «upgrade» mostrará todos los paquetes que " +"no pudo actualizar, lo cual generalmente significa que dependen de paquetes " +"nuevos o que entran en conflicto con otro paquete. Puede usar <prgn>dselect</" +"prgn> o <tt>apt-get install</tt> para forzar la instalación de tales " +"paquetes." #. type: <p></p> #: guide.sgml:140 @@ -9185,6 +9991,13 @@ msgid "" "listed packages and will print a summary and ask for confirmation if " "anything other than its arguments are changed." msgstr "" +"«install» se usa para instalar paquetes por nombre. El paquete se obtendrá e " +"instalará automáticamente. Es de utilidad si ya conoce el nombre del paquete " +"a instalar y no desea ejecutar una interfaz gráfica para seleccionarlo. " +"Puede introducir cualquier número de paquetes para su instalación y todos se " +"obtendrán. La instalación automática intenta resolver problemas de " +"dependencias con los paquetes listados, y mostrará un resumen al pedir una " +"confirmación en caso de modificar cualquiera de los argumentos introducidos." #. type: <p></p> #: guide.sgml:149 @@ -9197,6 +10010,13 @@ msgid "" "<prgn>dselect</prgn>. Once dist-upgrade has completed then <prgn>dselect</" "prgn> can be used to install any packages that may have been left out." msgstr "" +"«dist-upgrade» es una actualizador completo diseñado para simplificar la " +"actualización entre publicaciones de Debian. Usa un sofisticado algoritmo " +"para diseñar el mejor conjunto de paquetes a instalar, actualizar y eliminar " +"para así obtener cuanto sea posible de la última publicación. Puede que en " +"algunas situaciones desee usar «dist-upgrade» en lugar de pasar tiempo " +"resolviendo dependencias con <prgn>dselect</prgn>. Puede usar <prgn>dselect</" +"prgn> para instalar cualquier paquete que se haya quedado atrás." #. type: <p></p> #: guide.sgml:152 @@ -9204,6 +10024,8 @@ msgid "" "It is important to closely look at what dist-upgrade is going to do, its " "decisions may sometimes be quite surprising." msgstr "" +"Es importante revisar lo que «dist-upgrade» planea hacer, ya que sus " +"decisiones a veces pueden resultar sorprendentes." #. type: <p></p> #: guide.sgml:163 @@ -9216,12 +10038,18 @@ msgid "" "the downloaded archives can be installed by simply running the command that " "caused them to be downloaded again without <tt>-d</tt>." msgstr "" +"<prgn>apt-get</prgn> ofrece varias opciones de línea de órdenes detalladas " +"en su página de manual, <manref section=\"8\" name=\"apt-get\">. La opción " +"más útil es <tt>-d</tt>, que no instala los ficheros obtenidos. Puede que no " +"desee instalar los paquetes de inicio si el sistema se tiene que descargar " +"un gran número de éstos, en caso de que algo vaya mal. Cuando usa <tt>-d</" +"tt> puede instalar los ficheros descargados simplemente ejecutando la orden " +"que provocó su descarga, sin <tt>-d</tt>." #. type: <heading></heading> #: guide.sgml:168 -#, fuzzy msgid "DSelect" -msgstr "APT con DSelect" +msgstr "DSelect" #. type: <p></p> #: guide.sgml:173 @@ -9231,9 +10059,24 @@ msgid "" "to select the packages to be installed or removed and APT actually installs " "them." msgstr "" +"El método <prgn>dselect</prgn> de APT ofrece el sistema completo de APT con " +"la interfaz gráfica de selección de paquetes <prgn>dselect</prgn>. " +"<prgn>dselect</prgn> se usa para seleccionar los paquetes a instalar o " +"desinstalar que en realidad instalará APT." #. type: <p></p> #: guide.sgml:184 +#, fuzzy +#| msgid "" +#| "To enable the APT method you need to to select [A]ccess in <prgn>dselect</" +#| "prgn> and then choose the APT method. You will be prompted for a set of " +#| "<em>Sources</em> which are places to fetch archives from. These can be " +#| "remote Internet sites, local Debian mirrors or CDROMs. Each source can " +#| "provide a fragment of the total Debian archive, APT will automatically " +#| "combine them to form a complete set of packages. If you have a CDROM then " +#| "it is a good idea to specify it first and then specify a mirror so that " +#| "you have access to the latest bug fixes. APT will automatically use " +#| "packages on your CDROM before downloading from the Internet." msgid "" "To enable the APT method you need to select [A]ccess in <prgn>dselect</prgn> " "and then choose the APT method. You will be prompted for a set of " @@ -9245,6 +10088,17 @@ msgid "" "have access to the latest bug fixes. APT will automatically use packages on " "your CDROM before downloading from the Internet." msgstr "" +"Para habilitar el método APT tiene que seleccionar [M]étodo en " +"<prgn>dselect</prgn>, y después seleccionar el método APT. Se le pedirá un " +"conjunto de <em>fuentes</em>, ubicaciones de donde obtener los ficheros. " +"Pueden ser sitios remotos de Internet, replicas locales de Debian o discos " +"ópticos. Cada fuente puede proporcionar un fragmento del total del archivo " +"Debian, los cuales APT combinará automáticamente para formar un conjunto " +"completo de paquetes. Si tiene un disco óptico es una buena idea definirlo " +"primero en el fichero de configuración y después especificar una replica " +"para así tener acceso a los últimos arreglos de fallos. APT usará " +"automáticamente los paquetes del disco óptico en lugar de descargarlos de " +"Internet." #. type: <example></example> #: guide.sgml:198 @@ -9263,6 +10117,18 @@ msgid "" " \n" " URL [http://llug.sep.bnl.gov/debian]:" msgstr "" +" Set up a list of distribution source locations\n" +"\t \n" +" Please give the base URL of the debian distribution.\n" +" The access schemes I know about are: http file\n" +"\t \n" +" For example:\n" +" file:/mnt/debian,\n" +" ftp://ftp.debian.org/debian,\n" +" http://ftp.de.debian.org/debian,\n" +" \n" +" \n" +" URL [http://llug.sep.bnl.gov/debian]:" #. type: <p></p> #: guide.sgml:205 @@ -9271,6 +10137,9 @@ msgid "" "archive, defaulting to a HTTP mirror. Next it asks for the distribution to " "get." msgstr "" +"La configuración de las <em>fuentes</em> comienza preguntando la base del " +"archivo de Debian, cuyo valor predeterminado es una réplica HTTP. A " +"continuación, preguntará la distribución a obtener." #. type: <example></example> #: guide.sgml:212 @@ -9282,6 +10151,11 @@ msgid "" " \n" " Distribution [stable]:" msgstr "" +" Please give the distribution tag to get or a path to the\n" +" package file ending in a /. The distribution\n" +" tags are typically something like: stable unstable testing non-US\n" +" \n" +" Distribution [stable]:" #. type: <p></p> #: guide.sgml:222 @@ -9293,6 +10167,12 @@ msgid "" "that cannot be exported from the United States. Importing these packages " "into the US is legal however." msgstr "" +"La distribución se refiere a la versión de Debian en el archivo, <em>stable</" +"em> (estable) se refiere a la última versión publicada, y <em>unstable</em> " +"(inestable) se refiere a la versión en desarrollo. <em>non-US</em> sólo está " +"disponible en algunas réplicas, aquellos paquetes que contienen tecnología " +"cifrada y otras cosas que no se pueden exportar desde los Estados Unidos. " +"Aun así, importar estos paquetes a E.E.U.U es ilegal." #. type: <example></example> #: guide.sgml:228 @@ -9303,6 +10183,10 @@ msgid "" " \n" " Components [main contrib non-free]:" msgstr "" +" Please give the components to get\n" +" The components are typically something like: main contrib non-free\n" +" \n" +" Components [main contrib non-free]:" #. type: <p></p> #: guide.sgml:236 @@ -9312,6 +10196,11 @@ msgid "" "packages while contrib and non-free contain things that have various " "restrictions placed on their use and distribution." msgstr "" +"La lista de componentes se refiere a la lista de sub-distribuciones a " +"obtener. La distribución está dividida en base a licencias de software, " +"siendo «main» paquetes libres de acuerdo con DFSG, mientras que «contrib» y " +"«non-free» contienen paquetes con restricciones en cuanto a su uso y " +"distribución." #. type: <p></p> #: guide.sgml:240 @@ -9319,9 +10208,18 @@ msgid "" "Any number of sources can be added, the setup script will continue to prompt " "until you have specified all that you want." msgstr "" +"Puede añadir cualquier número de fuentes, el script de configuración le " +"preguntará por fuentes hasta que el usuario defina todo lo que quiera." #. type: <p></p> #: guide.sgml:247 +#, fuzzy +#| msgid "" +#| "Before starting to use <prgn>dselect</prgn> it is necessary to update the " +#| "available list by selecting [U]pdate from the menu. This is a super-set " +#| "of <tt>apt-get update</tt> that makes the fetched information available " +#| "to <prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get " +#| "update</tt> has been run before." msgid "" "Before starting to use <prgn>dselect</prgn> it is necessary to update the " "available list by selecting [U]pdate from the menu. This is a superset of " @@ -9329,6 +10227,11 @@ msgid "" "<prgn>dselect</prgn>. [U]pdate must be performed even if <tt>apt-get update</" "tt> has been run before." msgstr "" +"Es necesario actualizar la lista disponible mediante el elemento de menú [A]" +"ctualizar antes de iniciar <prgn>dselect</prgn>. Éste es un super-conjunto " +"de <tt>apt-get update</tt> que permite a <prgn>dselect</prgn> disponer de la " +"información obtenida. Debe ejecutar [A]ctualizar aunque haya ejecutado " +"<tt>apt-get update</tt> con anterioridad." #. type: <p></p> #: guide.sgml:253 @@ -9338,6 +10241,10 @@ msgid "" "[R]emove commands have no meaning, the [I]nstall command performs both of " "them together." msgstr "" +"Hecho esto puede realizar sus selecciones usando [S]elect y ejecutar la " +"instalación posteriormente con [I]nstall. Al usar el método APT las órdenes " +"[C]onfig y [R]emove carecen de significado ya que la orden [I]nstall ejecuta " +"ambos a la vez." #. type: <p></p> #: guide.sgml:258 @@ -9346,11 +10253,15 @@ msgid "" "have been successfully installed. To change this behavior place <tt>Dselect::" "clean \"prompt\";</tt> in /etc/apt/apt.conf." msgstr "" +"Por omisión, APT eliminará automáticamente los ficheros de paquete («.deb») " +"una vez que se hayan instalado con éxito. Para modificar este " +"comportamiento, inserte <tt>Dselect::clean \"prompt\";</tt> en «/etc/apt/apt." +"conf»." #. type: <heading></heading> #: guide.sgml:264 msgid "The Interface" -msgstr "" +msgstr "La interfaz" #. type: <p></p> #: guide.sgml:278 @@ -9364,11 +10275,19 @@ msgid "" "then will print out some informative status messages so that you can " "estimate how far along it is and how much is left to do." msgstr "" +"El método <prgn>dselect</prgn> de APT y <prgn>apt-get</prgn> comparten la " +"misma interfaz. Es un sencillo programa que le informa de lo que va a hacer, " +"para después llevarlo a cabo. <footnote><p> El método <prgn>dselect</prgn> " +"es en realidad un conjunto de scripts en torno a <prgn>apt-get</prgn>. En " +"realidad, el método ofrece más funcionalidad que la presente en <prgn>apt-" +"get</prgn> por si mismo. </p></footnote> Después de mostrar el resumen de lo " +"que va a pasar APT mostrará mensajes de estado informativos para ofrecer una " +"estimación de cuánto queda por hacer." #. type: <heading></heading> #: guide.sgml:280 msgid "Startup" -msgstr "" +msgstr "Arranque" #. type: <p></p> #: guide.sgml:284 @@ -9378,6 +10297,10 @@ msgid "" "At any time these operations can be performed by running <tt>apt-get check</" "tt>." msgstr "" +"APT realiza un número de acciones para preparar su estado interno antes de " +"cualquier operación, a excepción de «update». También realiza algunas " +"revisiones del estado del sistema. Puede llevar a cabo estas acciones en " +"cualquier momento ejecutando <tt>apt-get check</tt>." #. type: <example></example> #: guide.sgml:289 @@ -9387,6 +10310,10 @@ msgid "" "Reading Package Lists... Done\n" "Building Dependency Tree... Done" msgstr "" +"# apt-get check\n" +"Leyendo lista de paquetes... Hecho\n" +"Creando árbol de dependencias \n" +"Leyendo la información de estado... Hecho" #. type: <p></p> #: guide.sgml:297 @@ -9396,6 +10323,10 @@ msgid "" "If some of the package files are not found then they will be ignored and a " "warning will be printed when apt-get exits." msgstr "" +"La primera acción que ejecuta es pasar todos los ficheros de paquete a la " +"memoria. APT usa un esquema de almacenado con lo cual esta operación será " +"más rápida la segunda vez que la ejecute. De no encontrar algún fichero de " +"paquete, éstos se ignorarán y verá una advertencia al finalizar apt-get." #. type: <p></p> #: guide.sgml:303 @@ -9405,6 +10336,10 @@ msgid "" "package and considers if it is OK. Should this find a problem then a report " "will be printed out and <prgn>apt-get</prgn> will refuse to run." msgstr "" +"La última acción realiza un detallado análisis de las dependencias del " +"sistema. Revisa cada dependencia de cada paquete instalado o sin " +"desempaquetar analiza su validación. En caso de error aparecerá un informe, " +"y <prgn>apt-get</prgn> se negará a ejecutarse." #. type: <example></example> #: guide.sgml:320 @@ -9426,6 +10361,22 @@ msgid "" " Depends: xlib6g (>= 3.3-5) but it is not installed\n" " libreadlineg2: Conflicts:libreadline2 (<< 2.1-2.1)" msgstr "" +"# apt-get check\n" +"Leyendo lista de paquetes... Hecho\n" +"Creando árbol de dependencias \n" +"Leyendo la información de estado... Hecho\n" +"Tal vez quiera ejecutar `apt-get -f install' para corregirlo.\n" +"Los siguientes paquetes tienen dependencias incumplidas:\n" +" 9fonts: Depende: xlib6g pero no está instalado\n" +" uucp: Depende: mailx pero no está instalado\n" +" blast: Depende: xlib6g (>= 3.3-5) pero no está instalado\n" +" adduser: Depende: perl-base pero no está instalado\n" +" aumix: Depende: libgpmg1 pero no está instalado\n" +" debiandoc-sgml: Depende: sgml-base pero no está instalado\n" +" bash-builtins: Depende: bash (>= 2.01) pero 2.0-3 está instalado\n" +" cthugha: Depende: svgalibg1 pero no está instalado\n" +" Depende: xlib6g (>= 3.3-5) pero no está instalado\n" +" libreadlineg2: Entra en conflicto:libreadline2 (<< 2.1-2.1)" #. type: <p></p> #: guide.sgml:329 @@ -9436,6 +10387,11 @@ msgid "" "that are unmet. A short explanation of why the package has a dependency " "problem is also included." msgstr "" +"En este ejemplo el sistema tiene varios problemas, incluyendo un serio " +"problema con libreadlineg2. Una línea aparecerá por cada paquete con " +"dependencias no satisfechas indicando el paquete con el problema y las " +"dependencias no satisfechas. También incluye una explicación de porqué el " +"paquete tiene un problema de dependencias." #. type: <p></p> #: guide.sgml:337 @@ -9448,6 +10404,14 @@ msgid "" "situation a package may have been unpacked without its dependents being " "installed." msgstr "" +"Hay dos formas de que el sistema tenga un estado roto como éste. El primero " +"es causado por la omisión de <prgn>dpkg</prgn> de ciertas relaciones " +"delicadas entre paquetes al realizar una actualización. <footnote><p>APT, de " +"todas formas, considera todas las dependencias conocidas e intenta prevenir " +"paquetes rotos</p></footnote>. El segundo ocurre se la instalación de un " +"paquete falla durante la operación. En esta situación puede que un paquete " +"se haya desempaquetado sin que sus dependencias estuviesen instaladas " +"previamente." #. type: <p></p> #: guide.sgml:345 @@ -9459,6 +10423,13 @@ msgid "" "<prgn>dselect</prgn> method always supplies the <tt>-f</tt> option to allow " "for easy continuation of failed maintainer scripts." msgstr "" +"La segunda situación es mucho menos grave que la primera ya que APT define " +"ciertos límites en el orden de instalación de los paquetes. En ambos casos, " +"introducir la opción <tt>-f</tt> a <prgn>apt-get</prgn> causará que APT " +"deduzca una posible solución al problema para después continuar. El método " +"<prgn>dselect</prgn> de APT siempre ofrece la opción <tt>-f</tt> para " +"permitir una fácil continuación cuando existen scripts fallidos del " +"mantenedor." #. type: <p></p> #: guide.sgml:351 @@ -9469,11 +10440,16 @@ msgid "" "necessary to manually use dpkg (possibly with forcing options) to correct " "the situation enough to allow APT to proceed." msgstr "" +"Aún así, de usar la opción <tt>-f</tt> para corregir un sistema gravemente " +"roto por el primer caso cabe que la acción falle inmediatamente o que la " +"secuencia de instalación se interrumpa. En cualquier caso es necesario usar " +"dpkg manualmente (puede que con opciones de forzado) para corregir la " +"situación lo suficiente como para que APT pueda continuar." #. type: <heading></heading> #: guide.sgml:356 msgid "The Status Report" -msgstr "" +msgstr "El informe de estado" #. type: <p></p> #: guide.sgml:363 @@ -9484,11 +10460,16 @@ msgid "" "final state of things, taking into account the <tt>-f</tt> option and any " "other relevant activities to the command being executed." msgstr "" +"Antes de proceder <prgn>apt-get</prgn> presentará un informe de lo que va a " +"ocurrir. Generalmente el informe refleja el tipo de operación a realizar, " +"pero hay ciertos elementos comunes. La lista refleja el estado final de las " +"cosas en todos los casos, teniendo en cuenta la opción <tt>-f</tt> y " +"cualquier otra actividad relevante a la orden ejecutada." #. type: <heading></heading> #: guide.sgml:364 msgid "The Extra Package list" -msgstr "" +msgstr "La lista de paquetes extras" #. type: <example></example> #: guide.sgml:372 @@ -9501,6 +10482,12 @@ msgid "" " squake pgp-i python-base debmake ldso perl libreadlineg2\n" " ssh" msgstr "" +"Se instalarán los siguientes paquetes extras:\n" +" libdbd-mysql-perl xlib6 zlib1 xzx libreadline2 libdbd-msql-perl\n" +" mailpgp xdpkg fileutils pinepgp zlib1g xlib6g perl-base\n" +" bin86 libgdbm1 libgdbmg1 quake-lib gmp2 bcc xbuffy\n" +" squake pgp-i python-base debmake ldso perl libreadlineg2\n" +" ssh" #. type: <p></p> #: guide.sgml:379 @@ -9510,11 +10497,15 @@ msgid "" "generated for an <tt>install</tt> command. The listed packages are often the " "result of an Auto Install." msgstr "" +"La lista de paquetes extras muestra todos los paquetes que se van a instalar " +"o actualizar en adición a aquellos mencionados en la línea de órdenes. Sólo " +"se genera para la orden <tt>install</tt>. Generalmente, los paquetes " +"listados son el resultado de una instalación automática." #. type: <heading></heading> #: guide.sgml:382 msgid "The Packages to Remove" -msgstr "" +msgstr "Los paquetes a eliminar" #. type: <example></example> #: guide.sgml:389 @@ -9526,6 +10517,11 @@ msgid "" " xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" " nas xpilot xfig" msgstr "" +"Los siguientes paquetes se ELIMINARÁN:\n" +" xlib6-dev xpat2 tk40-dev xkeycaps xbattle xonix\n" +" xdaliclock tk40 tk41 xforms0.86 ghostview xloadimage xcolorsel\n" +" xadmin xboard perl-debug tkined xtetris libreadline2-dev perl-suid\n" +" nas xpilot xfig" #. type: <p></p> #: guide.sgml:399 @@ -9538,11 +10534,17 @@ msgid "" "that are going to be removed because they are only partially installed, " "possibly due to an aborted installation." msgstr "" +"La lista de paquetes a eliminar muestra todos los paquetes que se van a " +"eliminar del sistema. Puede aparecer durante cualquier operación, y se " +"debería revisar cuidadosamente para asegurar que no se va a eliminar nada " +"importante, y de ser así el caso se debería actuar cuidadosamente. La lista " +"puede contener paquetes a eliminar porque están parcialmente instalados, " +"posiblemente debido a una instalación interrumpida." #. type: <heading></heading> #: guide.sgml:402 msgid "The New Packages list" -msgstr "" +msgstr "La lista de paquetes nuevos" #. type: <example></example> #: guide.sgml:406 @@ -9551,6 +10553,8 @@ msgid "" "The following NEW packages will installed:\n" " zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" msgstr "" +"Se instalarán los siguientes paquetes NUEVOS:\n" +" zlib1g xlib6g perl-base libgdbmg1 quake-lib gmp2 pgp-i python-base" #. type: <p></p> #: guide.sgml:411 @@ -9559,11 +10563,14 @@ msgid "" "listed are not presently installed in the system but will be when APT is " "done." msgstr "" +"La lista de paquetes nuevos es sólo un recordatorio de lo que va a ocurrir. " +"Los paquetes listados no se encuentran instalados en el sistema pero lo " +"estarán cuando APT finalice." #. type: <heading></heading> #: guide.sgml:414 msgid "The Kept Back list" -msgstr "" +msgstr "La lista de paquetes retenidos" #. type: <example></example> #: guide.sgml:419 @@ -9573,6 +10580,9 @@ msgid "" " compface man-db tetex-base msql libpaper svgalib1\n" " gs snmp arena lynx xpat2 groff xscreensaver" msgstr "" +"Los siguientes paquetes se han retenido:\n" +" compface man-db tetex-base msql libpaper svgalib1\n" +" gs snmp arena lynx xpat2 groff xscreensaver" #. type: <p></p> #: guide.sgml:428 @@ -9584,11 +10594,17 @@ msgid "" "to install is with <tt>apt-get install</tt> or by using <prgn>dselect</prgn> " "to resolve their problems." msgstr "" +"Puede que al actualizar el sistema por completo no se puedan instalar " +"versiones nuevas de paquetes porque requieren nuevos elementos que entran en " +"conflicto con paquetes ya instalados. En este caso, el paquete aparecerá en " +"la lista de paquetes retenidos. La mejor manera de instalar paquetes " +"listados aquí es mediante <tt>apt-get install</tt> o mediante <prgn>dselect</" +"prgn> para así resolver esos problemas." #. type: <heading></heading> #: guide.sgml:431 msgid "Held Packages warning" -msgstr "" +msgstr "Advertencia de paquetes retenidos" #. type: <example></example> #: guide.sgml:435 @@ -9597,6 +10613,8 @@ msgid "" "The following held packages will be changed:\n" " cvs" msgstr "" +"Se cambiarán los siguientes paquetes retenidos:\n" +" cvs" #. type: <p></p> #: guide.sgml:441 @@ -9605,17 +10623,21 @@ msgid "" "case it prints out a warning that the held package is going to be changed. " "This should only happen during dist-upgrade or install." msgstr "" +"Puede que a veces ordene a APT que instale un paquete retenido, en cuyo caso " +"verá una advertencia de que el paquete retenido se va a modificar. Esto sólo " +"debería ocurrir durante un «dist-upgrade» o un «install»." #. type: <heading></heading> #: guide.sgml:444 msgid "Final summary" -msgstr "" +msgstr "Resumen final" #. type: <p></p> #: guide.sgml:447 msgid "" "Finally, APT will print out a summary of all the changes that will occur." msgstr "" +"Por último, APT mostrará un resumen de los cambios que se llevarán a cabo." #. type: <example></example> #: guide.sgml:452 @@ -9625,6 +10647,10 @@ msgid "" "12 packages not fully installed or removed.\n" "Need to get 65.7M/66.7M of archives. After unpacking 26.5M will be used." msgstr "" +"206 paquetes actualizados, 8 se instalarán, 23 para eliminar y 51 no\n" +"actualizados.\n" +"12 paquetes no instalados del todo o eliminados.\n" +"Se necesita descargar 65.7M/66.7M de archivos. Se usarán 26.5M después de desempaquetar." #. type: <p></p> #: guide.sgml:470 @@ -9643,6 +10669,20 @@ msgid "" "If a large number of packages are being removed then the value may indicate " "the amount of space that will be freed." msgstr "" +"La primera línea del resumen es simplemente una versión reducida de todas " +"las listas e incluye el número de actualizaciones, esto es, paquetes ya " +"instalados y de los cuales existen versiones nuevas disponibles. La segunda " +"línea indica el número de paquetes mal configurados, posiblemente el " +"resultado de una instalación interrumpida. La última línea muestra los " +"requerimientos de espacio para la instalación. El primer par de números " +"indican el tamaño de los ficheros del archivo. El primer número indica el " +"número de bytes que se tienen que obtener de ubicaciones remotas, y el " +"segundo indica el tamaño total de todos los archivos requeridos. El " +"siguiente número indica la diferencia de tamaño entre los paquetes " +"instalados y los paquetes nuevos a instalar. Básicamente equivale al espacio " +"requerido en «/usr» al finalizar el proceso. En caso de existir varios " +"paquetes a eliminar el valor puede indicar la cantidad de espacio que se va " +"a liberar." #. type: <p></p> #: guide.sgml:473 @@ -9650,11 +10690,13 @@ msgid "" "Some other reports can be generated by using the -u option to show packages " "to upgrade, they are similar to the previous examples." msgstr "" +"Puede generar otros informes con la opción «-u» para mostrar los paquetes a " +"actualizar, similar a los ejemplos anteriores." #. type: <heading></heading> #: guide.sgml:477 msgid "The Status Display" -msgstr "" +msgstr "La pantalla de estado" #. type: <p></p> #: guide.sgml:481 @@ -9662,6 +10704,8 @@ msgid "" "During the download of archives and package files APT prints out a series of " "status messages." msgstr "" +"APT muestra una serie de mensajes de estado en el transcurso de descargar " +"ficheros de paquete y archivo." #. type: <example></example> #: guide.sgml:490 @@ -9675,6 +10719,13 @@ msgid "" "Get:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" "11% [5 testing/non-free `Waiting for file' 0/32.1k 0%] 2203b/s 1m52s" msgstr "" +"# apt-get update\n" +"Des:1 http://ftp.de.debian.org/debian-non-US/ stable/non-US/ Packages\n" +"Des:2 http://llug.sep.bnl.gov/debian/ testing/contrib Packages\n" +"Obj http://llug.sep.bnl.gov/debian/ testing/main Packages\n" +"Des:4 http://ftp.de.debian.org/debian-non-US/ unstable/binary-i386/ Packages\n" +"es:5 http://llug.sep.bnl.gov/debian/ testing/non-free Packages\n" +"11% [5 testing/non-free Esperando las cabeceras 0/32.1k 0%] 2203b/s 1m52s" #. type: <p></p> #: guide.sgml:500 @@ -9686,6 +10737,12 @@ msgid "" "<tt>apt-get update</tt> estimates the percent done which causes some " "inaccuracies." msgstr "" +"Las líneas comenzando con <em>Des</em> aparecen cuando APT inicia la " +"obtención de un fichero, mientras que la última línea indica el progreso de " +"la descarga. El primer valor porcentual en la barra de progreso indica el " +"porcentaje total de los ficheros ya descargados. Desafortunadamente, <tt>apt-" +"get update</tt> desconoce el tamaño de los ficheros de paquete y por ello " +"genera una estimación que puede ser inexacta." #. type: <p></p> #: guide.sgml:509 @@ -9698,6 +10755,14 @@ msgid "" "The next word is the short form name of the object being downloaded. For " "archives it will contain the name of the package that is being fetched." msgstr "" +"La siguiente sección de la línea de estado se repite por cada instancia de " +"descarga e indica la operación realizada, así como información útil relativa " +"a lo que está pasando. Puede que esta sección sólo muestre <em>Forking</em>, " +"lo cual significa que el sistema operativo está cargando el módulo de " +"descargas. La primera palabra después de «[» es el número de obtención tal y " +"como se muestra en la línea del histórico. La siguiente palabra es la forma " +"corta del nombre del objeto en descarga. Al conectarse con los archivos, " +"contendrá el nombre del paquete obtenido." #. type: <p></p> #: guide.sgml:524 @@ -9716,6 +10781,20 @@ msgid "" "regularly and reflects the time to complete everything at the shown transfer " "rate." msgstr "" +"Una cadena informativa aparecerá entre comillas simples indicando el " +"progreso de la fase de negociación de la descarga. Generalmente progresa de " +"<em>Conectando</em> a <em>Esperando fichero</em>, finalizando con " +"<em>Descargando</em> o <em>Continuando</em>. El último valor es el número de " +"bytes descargados desde el sitio remoto. Una vez que la descarga arranque se " +"representará como <tt>102/10.2k</tt> indicando que ya se han obtenido 102 " +"bytes y que se esperan 10.2 kilobytes. El tamaño total siempre aparece con " +"la notación de la figura 4 para conservar espacio. A continuación aparece un " +"medidor porcentual del fichero. El penúltimo elemento es la media " +"instantánea de velocidad. Estos valores se actualizan cada 5 segundos y " +"reflejan la tasa de descarga de datos de ese periodo. Por último puede ver " +"el tiempo estimado para la transferencia. Esto se actualiza regularmente y " +"refleja el tiempo restante para completar todo tal y como se ve en la tasa " +"de transferencia visible." #. type: <p></p> #: guide.sgml:530 @@ -9726,11 +10805,17 @@ msgid "" "for logging to a file, use the <tt>-q</tt> option to remove the status " "display." msgstr "" +"La pantalla de estado se actualiza cada medio segundo para ofrecer una " +"constante información del progreso de la descarga, mientras que las líneas " +"«Des» se desplazan hacia atrás cuando se inicia la descarga de otro fichero. " +"Ya que la pantalla de estado se actualiza constantemente carece de utilidad " +"para su registro en un fichero. Puede usar la opción <tt>-q</tt> para omitir " +"la pantalla de estado." #. type: <heading></heading> #: guide.sgml:535 msgid "Dpkg" -msgstr "" +msgstr "Dpkg" #. type: <p></p> #: guide.sgml:542 @@ -9742,16 +10827,22 @@ msgid "" "each question there is usually a description of what it is asking and the " "questions are too varied to discuss completely here." msgstr "" +"APT usa <prgn>dpkg</prgn> para instalar ficheros, y pasará a interactuar con " +"<prgn>dpkg</prgn> al finalizar la descarga. <prgn>dpkg</prgn> también " +"planteará un número de preguntas a medida que procesa los paquetes, los " +"cuales también pueden formular preguntas. A cada pregunta generalmente le " +"precede una descripción de la pregunta en sí. Éstas son demasiado variadas " +"como para poder tratarlas aquí en su totalidad." #. type: <title></title> #: offline.sgml:4 msgid "Using APT Offline" -msgstr "" +msgstr "Usar APT Offline" #. type: <version></version> #: offline.sgml:7 msgid "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" -msgstr "" +msgstr "$Id: offline.sgml,v 1.8 2003/02/12 15:06:41 doogie Exp $" #. type: <abstract></abstract> #: offline.sgml:12 @@ -9759,21 +10850,23 @@ msgid "" "This document describes how to use APT in a non-networked environment, " "specifically a 'sneaker-net' approach for performing upgrades." msgstr "" +"Este documento describe el uso de APT en un entorno sin conexión a red, " +"específicamente una aproximación «sneaker-net» a la acción de actualizar." #. type: <copyrightsummary></copyrightsummary> #: offline.sgml:16 msgid "Copyright © Jason Gunthorpe, 1999." -msgstr "" +msgstr "Copyright © Jason Gunthorpe, 1999." #. type: <heading></heading> #: offline.sgml:32 msgid "Introduction" -msgstr "" +msgstr "Introducción" #. type: <heading></heading> #: offline.sgml:34 offline.sgml:65 offline.sgml:180 msgid "Overview" -msgstr "" +msgstr "Resumen" #. type: <p></p> #: offline.sgml:40 @@ -9783,6 +10876,11 @@ msgid "" "machine is on a slow link, such as a modem and another machine has a very " "fast connection but they are physically distant." msgstr "" +"Generalmente, APT necesita un acceso directo a un archivo de Debian, bien " +"desde un dispositivo local o a través de una red. Otra queja frecuente es " +"que una máquina con un sistema Debian dispone de una conexión lenta como la " +"de un módem, y otra máquina físicamente lejos dispone de una conexión muy " +"rápida." #. type: <p></p> #: offline.sgml:51 @@ -9797,20 +10895,41 @@ msgid "" "the machine downloading the packages, and <em>target host</em> the one with " "bad or no connection." msgstr "" +"La solución a esto es usar dispositivos extraíbles de gran capacidad tales " +"como un disco Zip o uno SuperDisk. Estos discos no tienen la suficiente " +"capacidad para almacenar todo el archivo de Debian, pero pueden contener un " +"sub-conjunto suficientemente grande para la mayoría de usuarios. La idea es " +"usar APT para generar una lista de los paquetes requeridos para después " +"almacenarlos en un disco usando el sistema que tiene una conexión rápida. Es " +"incluso posible usar otro sistema Debian con APT, o usar un sistema " +"operativo totalmente distinto junto con una herramienta de descarga como " +"wget. Digamos que el <em>sistema remoto</em> es aquél que descarga los " +"paquetes, y <em>sistema destino</em> es aquél con poca o ninguna conexión." #. type: <p></p> #: offline.sgml:57 +#, fuzzy +#| msgid "" +#| "This is achieved by creatively manipulating the APT configuration file. " +#| "The essential premis to tell APT to look on a disc for it's archive " +#| "files. Note that the disc should be formated with a filesystem that can " +#| "handle long file names such as ext2, fat32 or vfat." msgid "" "This is achieved by creatively manipulating the APT configuration file. The " "essential premise to tell APT to look on a disc for it's archive files. Note " "that the disc should be formated with a filesystem that can handle long file " "names such as ext2, fat32 or vfat." msgstr "" +"Esto se logra manipulando con imaginación el fichero de configuración de " +"APT. La premisa esencial es decirle a APT que busque en el disco los " +"ficheros del archivo. Tenga en cuenta que el disco debería tener un formato " +"de un sistema de ficheros capaz de gestionar nombres largos de ficheros, " +"tales como ext2, fat32 o vfat." #. type: <heading></heading> #: offline.sgml:63 msgid "Using APT on both machines" -msgstr "" +msgstr "Usar APT en ambas máquinas" #. type: <p><example> #: offline.sgml:71 @@ -9820,6 +10939,11 @@ msgid "" "remote machine to fetch the latest package files and decide which packages " "to download. The disk directory structure should look like:" msgstr "" +"La configuración más sencilla es posible si APT está instalado en ambas " +"máquinas. La idea básica es guardar una copia del fichero de estado en el " +"disco, después usar el sistema remoto para obtener los últimos ficheros de " +"paquete y decidir qué paquetes descargar. La estructura de directorios del " +"disco debería tener este aspecto:" #. type: <example></example> #: offline.sgml:80 @@ -9834,12 +10958,19 @@ msgid "" " sources.list\n" " apt.conf" msgstr "" +" /disc/\n" +" archives/\n" +" partial/\n" +" lists/\n" +" partial/\n" +" status\n" +" sources.list\n" +" apt.conf" #. type: <heading></heading> #: offline.sgml:88 -#, fuzzy msgid "The configuration file" -msgstr "Programa para la consulta de configuración de APT" +msgstr "El fichero de configuración" #. type: <p></p> #: offline.sgml:96 @@ -9851,6 +10982,12 @@ msgid "" "<em>target host</em>. Please note, if you are using a local archive you must " "use copy URIs, the syntax is identical to file URIs." msgstr "" +"El fichero de configuración debería hacer que APT guarde los ficheros en el " +"disco, así como usar los ficheros de configuración en el disco. El fichero " +"«sources.list» debería contener los sitios apropiados que desea usar desde el " +"sistema remoto, y el fichero de estado debería ser una copia de <em>/var/lib/" +"dpkg/status</em> del <em>sistema destino</em>. Tenga en cuenta que si usa un " +"archivo local debe usar la URI «copy», de idéntica sintaxis a la URI «file»." #. type: <p><example> #: offline.sgml:100 @@ -9858,6 +10995,8 @@ msgid "" "<em>apt.conf</em> must contain the necessary information to make APT use the " "disc:" msgstr "" +"<em>apt-conf</em> debe contener toda la información necesaria para que APT " +"use el disco:" #. type: <example></example> #: offline.sgml:124 @@ -9887,6 +11026,29 @@ msgid "" " Etc \"/disc/\";\n" " };" msgstr "" +" APT\n" +" {\n" +" /* Esto no es necesario si ambos sistemas tienen la misma arquitectura,\n" +" informa al APT remoto la arquitectura del sistema destino */\n" +" Architecture \"i386\";\n" +" \n" +" Get::Download-Only \"true\";\n" +" };\n" +" \n" +" Dir\n" +" {\n" +" /* Use el disco para información de estado y redireccionar el fichero de\n" +" estado desde el valor predeterminado «/var/lib/dpkg» */\n" +" State \"/disc/\";\n" +" State::status \"status\";\n" +"\n" +" // Los cachés binarios se guardan localmente\n" +" Cache::archives \"/disc/archives/\";\n" +" Cache \"/tmp/\";\n" +" \n" +" // Ubicación del fichero de fuentes.\n" +" Etc \"/disc/\";\n" +" };" #. type: </example></p> #: offline.sgml:129 @@ -9894,9 +11056,18 @@ msgid "" "More details can be seen by examining the apt.conf man page and the sample " "configuration file in <em>/usr/share/doc/apt/examples/apt.conf</em>." msgstr "" +"Para más detalles vea la página de manual y el fichero de configuración de " +"ejemplo en <em>/usr/share/doc/apt/examples/apt.conf</em>." #. type: <p><example> #: offline.sgml:136 +#, fuzzy +#| msgid "" +#| "On the target machine the first thing to do is mount the disc and copy " +#| "<em>/var/lib/dpkg/status</em> to it. You will also need to create the " +#| "directories outlined in the Overview, <em>archives/partial/</em> and " +#| "<em>lists/partial/</em> Then take the disc to the remote machine and " +#| "configure the sources.list. On the remote machine execute the following:" msgid "" "On the target machine the first thing to do is mount the disc and copy <em>/" "var/lib/dpkg/status</em> to it. You will also need to create the directories " @@ -9904,6 +11075,11 @@ msgid "" "em>. Then take the disc to the remote machine and configure the sources." "list. On the remote machine execute the following:" msgstr "" +"Lo primero que debe hacer en el sistema destino es montar el disco y guardar " +"en él una copia de <em>/var/lib/dpkg/status</em>. También debe crear los " +"directorios definidos en el Resumen, <em>archives/partial/</em> y <em>lists/" +"partial/</em>. Lleve el disco hasta el sistema remoto y configure «sources." +"list». Ejecute lo siguiente en el sistema remoto:" #. type: <example></example> #: offline.sgml:142 @@ -9915,15 +11091,31 @@ msgid "" " # apt-get dist-upgrade\n" " [ APT fetches all the packages needed to upgrade the target machine ]" msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get update\n" +" [ APT obtiene los ficheros de paquete ]\n" +" # apt-get dist-upgrade\n" +" [ APT obtiene todos los paquetes necesarios para actualizar el sistema\n" +" destino ]" #. type: </example></p> #: offline.sgml:149 +#, fuzzy +#| msgid "" +#| "The dist-upgrade command can be replaced with any-other standard APT " +#| "commands, particularly dselect-upgrade. You can even use an APT front end " +#| "such as <em>dselect</em> However this presents a problem in communicating " +#| "your selections back to the local computer." msgid "" "The dist-upgrade command can be replaced with any other standard APT " "commands, particularly dselect-upgrade. You can even use an APT front end " "such as <em>dselect</em>. However this presents a problem in communicating " "your selections back to the local computer." msgstr "" +"Puede reemplazar la orden «dist-upgrade» con cualquiera otra orden estándar " +"de APT, en especial «dselect-upgrade». Incluso puede usar una interfaz de APT " +"como <em>dselect</em>. Sin embargo, esto presenta un problema al informar " +"después de sus selecciones al sistema remoto." #. type: <p><example> #: offline.sgml:153 @@ -9931,6 +11123,8 @@ msgid "" "Now the disc contains all of the index files and archives needed to upgrade " "the target machine. Take the disc back and run:" msgstr "" +"Ahora el disco contiene todos los ficheros de índice y archivo necesarios " +"para actualizar el sistema destino. Inserte el disco otra vez y ejecute:" #. type: <example></example> #: offline.sgml:159 @@ -9942,6 +11136,11 @@ msgid "" " # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" " [ Or any other APT command ]" msgstr "" +" # export APT_CONFIG=\"/disc/apt.conf\"\n" +" # apt-get check\n" +" [ APT genera una copia local de los ficheros de caché ]\n" +" # apt-get --no-d -o dir::state::status=/var/lib/dpkg/status dist-upgrade\n" +" [ O cualquiera otra orden de APT ]" #. type: <p></p> #: offline.sgml:165 @@ -9949,6 +11148,8 @@ msgid "" "It is necessary for proper function to re-specify the status file to be the " "local one. This is very important!" msgstr "" +"Para un correcto funcionamiento debe definir nuevamente el fichero de estado " +"local. ¡Es muy importante!" #. type: <p></p> #: offline.sgml:172 @@ -9959,11 +11160,16 @@ msgid "" "the local machine - but this may not always be possible. DO NOT copy the " "status file if dpkg or APT have been run in the mean time!!" msgstr "" +"Si está usando dselect puede realizar la arriesgada operación de copiar «disc/" +"status» a «/var/lib/dpkg/status» para actualizar toda selección hecha en el " +"sistema remoto. Recomiendo seriamente hacer las selecciones sólo en el " +"sistema local, aunque puede que no sea posible. NO copie el fichero de " +"estado si dpkg o APT se han ejecutado mientras tanto." #. type: <heading></heading> #: offline.sgml:178 msgid "Using APT and wget" -msgstr "" +msgstr "Usar APT y wget" #. type: <p></p> #: offline.sgml:185 @@ -9972,6 +11178,9 @@ msgid "" "any machine. Unlike the method above this requires that the Debian machine " "already has a list of available packages." msgstr "" +"<em>wget</em> es una herramienta de descarga muy popular que funciona " +"prácticamente en cualquier sistema. A diferencia del método anterior, " +"requiere que el sistema Debian tenga una lista de paquetes disponibles." #. type: <p></p> #: offline.sgml:190 @@ -9981,12 +11190,15 @@ msgid "" "option to apt-get and then preparing a wget script to actually fetch the " "packages." msgstr "" +"La idea básica es crear un disco que sólo contiene los ficheros del archivo " +"descargados desde el sistema remoto. Esto se hace mediante la opción de apt-" +"get «--print-uris», para después preparar un script de wget que finalmente " +"obtendrá los paquetes." #. type: <heading></heading> #: offline.sgml:196 -#, fuzzy msgid "Operation" -msgstr "Opciones" +msgstr "Operación" #. type: <p><example> #: offline.sgml:200 @@ -9994,6 +11206,9 @@ msgid "" "Unlike the previous technique no special configuration files are required. " "We merely use the standard APT commands to generate the file list." msgstr "" +"A diferencia de la técnica anterior no necesita ningún fichero de " +"configuración especial. Se usan sólo las órdenes estándar de APT para " +"generar el fichero con la lista." #. type: <example></example> #: offline.sgml:205 @@ -10004,6 +11219,11 @@ msgid "" " # apt-get -qq --print-uris dist-upgrade > uris\n" " # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" msgstr "" +" # apt-get dist-upgrade \n" +" [ Pulse no cuando se le pregunte, asegúrese de estar conforme con las\n" +" acciones ]\n" +" # apt-get -qq --print-uris dist-upgrade > uris\n" +" # awk '{print \"wget -O \" $2 \" \" $1}' < uris > /disc/wget-script" #. type: </example></p> #: offline.sgml:210 @@ -10011,6 +11231,8 @@ msgid "" "Any command other than dist-upgrade could be used here, including dselect-" "upgrade." msgstr "" +"Ahora podría usar cualquiera otra orden aparte de «dist-upgrade», incluyendo " +"«dselect-upgrade»." #. type: <p></p> #: offline.sgml:216 @@ -10020,11 +11242,15 @@ msgid "" "with the current directory as the disc's mount point so as to save the " "output on the disc." msgstr "" +"El fichero «/disc/wget-script» ahora contiene una lista de órdenes de wget a " +"ejecutar para obtener los archivos necesarios. Este script se debería " +"ejecutar en el directorio del punto de montaje del disco para poder guardar " +"la salida en el disco." #. type: <p><example> #: offline.sgml:219 msgid "The remote machine would do something like" -msgstr "" +msgstr "El sistema remoto haría algo como" #. type: <example></example> #: offline.sgml:223 @@ -10034,6 +11260,9 @@ msgid "" " # sh -x ./wget-script\n" " [ wait.. ]" msgstr "" +" # cd /disc\n" +" # sh -x ./wget-script\n" +" [ wait.. ]" #. type: </example><example> #: offline.sgml:228 @@ -10041,19 +11270,28 @@ msgid "" "Once the archives are downloaded and the disc returned to the Debian machine " "installation can proceed using," msgstr "" +"Una vez que los archivos se han descargado y el disco está finalmente " +"conectado al sistema Debian, ejecute la instalación con lo siguiente." #. type: <example></example> #: offline.sgml:230 #, no-wrap msgid " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" -msgstr "" +msgstr " # apt-get -o dir::cache::archives=\"/disc/\" dist-upgrade" #. type: </example></p> #: offline.sgml:234 msgid "Which will use the already fetched archives on the disc." -msgstr "" +msgstr "Ésto usará los archivos del disco previamente obtenidos." + +#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" +#~ msgstr "<filename>/etc/apt/trusted.gpg</filename>" + +#~ msgid "Keyring of local trusted keys, new keys will be added here." +#~ msgstr "" +#~ "El registro local de las claves de confianza. Las claves nuevas se " +#~ "añadirán a este fichero." -#, fuzzy #~ msgid "" #~ "<filename>apt.conf</filename> is the main configuration file for the APT " #~ "suite of tools, all tools make use of the configuration file and a common " @@ -10066,326 +11304,13 @@ msgstr "" #~ "directives, possibly loading even more config files." #~ msgstr "" #~ "<filename>apt.conf</filename> 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</envar> (si existe), luego leerá los ficheos en " -#~ "<literal>Dir::Etc::Parts</literal>, entonces leerá el fichero de " -#~ "configuración principal especificado por <literal>Dir::Etc::main</" -#~ "literal>, 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." - -#, fuzzy -#~ msgid "<filename>/etc/apt/trusted.gpg</filename>" -#~ msgstr "<filename>/etc/apt/apt.conf</filename>" - -#, fuzzy -#~ msgid "/usr/share/doc/apt/" -#~ msgstr "/usr/share/doc/apt/" - -#, fuzzy -#~ msgid "<filename>&docdir;examples/configure-index.gz</>" -#~ msgstr "<filename>&docdir;examples/configure-index.gz</>" - -#, fuzzy -#~ msgid "<filename>/etc/apt.conf</>" -#~ msgstr "<filename>/etc/apt.conf</>" - -#, fuzzy -#~ msgid "/var/lib/apt" -#~ msgstr "/var/lib/apt" - -#, fuzzy -#~ msgid "/var/cache/apt" -#~ msgstr "/var/cache/apt" - -#, fuzzy -#~ msgid "" -#~ "\n" -#~ " <VarListEntry><term><option/-h/</><term><option/--help/</>\n" -#~ " <ListItem><Para>\n" -#~ " Show a short usage summary.\n" -#~ " </VarListEntry>\n" -#~ " \n" -#~ " <VarListEntry><term><option/-v/</><term><option/--version/</>\n" -#~ " <ListItem><Para>\n" -#~ " Show the program version.\n" -#~ " </VarListEntry>\n" -#~ "\n" -#~ " <VarListEntry><term><option/-c/</><term><option/--config-file/</>\n" -#~ " <ListItem><Para>\n" -#~ " Configuration File; Specify a configuration file to use. \n" -#~ " The program will read the default configuration file and then this \n" -#~ " configuration file. See &apt-conf; for syntax information. \n" -#~ " </VarListEntry>\n" -#~ " \n" -#~ " <VarListEntry><term><option/-o/</><term><option/--option/</>\n" -#~ " <ListItem><Para>\n" -#~ " Set a Configuration Option; This will set an arbitary " -#~ "configuration \n" -#~ " option. The syntax is <option>-o Foo::Bar=bar</>.\n" -#~ " </VarListEntry>\n" -#~ msgstr "" -#~ "\n" -#~ " <VarListEntry><term><option/-h/</><term><option/--help/</>\n" -#~ " <ListItem><Para>\n" -#~ " Muestra un breve resumen del modo de uso.\n" -#~ " </VarListEntry>\n" -#~ " \n" -#~ " <VarListEntry><term><option/-v/</><term><option/--version/</>\n" -#~ " <ListItem><Para>\n" -#~ " Muestra la versión del programa.\n" -#~ " </VarListEntry>\n" -#~ "\n" -#~ " <VarListEntry><term><option/-c/</><term><option/--config-file/</>\n" -#~ " <ListItem><Para>\n" -#~ " Especifica el fichero de configuración a usar.\n" -#~ " El programa leerá el fichero de configuración por omisión y luego\n" -#~ " este otro. Lea &apt-conf; para más información acerca de la " -#~ "sintaxis.\n" -#~ " </VarListEntry>\n" -#~ " \n" -#~ " <VarListEntry><term><option/-o/</><term><option/--option/</>\n" -#~ " <ListItem><Para>\n" -#~ " Establece una opción de configuración. La sintaxis es <option>-o\n" -#~ " Foo::Bar=bar</>. \n" -#~ " </VarListEntry>\n" - -#, fuzzy -#~ msgid "" -#~ "&apt-docinfo;\n" -#~ " \n" -#~ " " -#~ msgstr "" -#~ "&apt-docinfo;\n" -#~ " \n" -#~ " " - -#, fuzzy -#~ msgid "<manvolnum>5</manvolnum>" -#~ msgstr "<manvolnum>8</manvolnum>" - -#, fuzzy -#~ msgid "" -#~ "Syntacticly the configuration language is modeled after what the ISC " -#~ "tools such as bind and dhcp use. Lines starting with <literal>//</" -#~ "literal> are treated as comments (ignored). Each line is of the form" -#~ msgstr "" -#~ "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" - -#, fuzzy -#~ msgid "" -#~ "<literallayout class=\"normal\">\n" -#~ "APT::Get::Assume-Yes \"true\";" -#~ msgstr "" -#~ "<literallayout class=\"normal\">\n" -#~ "APT::Get::Assume-Yes \"true\";" - -#, fuzzy -#~ msgid "" -#~ "</literallayout> The trailing semicolon is required and the quotes are " -#~ "optional. A new scope can be opened with curly braces, like: " -#~ "<informalexample>" -#~ msgstr "" -#~ "</literallayout> Los espacios entre los dos puntos son obligatorios, y " -#~ "las comillas son opcionales. Un nuevo ámbito puede abrirse con llaves, " -#~ "por ejemplo: <informalexample>" - -#, fuzzy -#~ msgid "" -#~ "Disable Immediate Configuration; This dangerous option disables some of " -#~ "APT's ordering code to cause it to make fewer dpkg calls. Doing so may be " -#~ "necessary on some extremely slow single user systems but is very " -#~ "dangerous and may cause package install scripts to fail or worse. Use at " -#~ "your own risk." -#~ msgstr "" -#~ "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." - -#, fuzzy -#~ msgid "" -#~ "<literallayout class=\"normal\">\n" -#~ "\"/cdrom/\"::Mount \"foo\";" -#~ msgstr "" -#~ "<literallayout class=\"normal\">\n" -#~ "deb ftp://ftp.debian.org/debian unstable contrib" - -#, fuzzy -#~ msgid "" -#~ "</literallayout> within the cdrom block. It is important to have the " -#~ "trailing slash. Unmount commands can be specified using UMount." -#~ msgstr "" -#~ "</literallayout> dentro del bloque cdrom. Es importante no tener una " -#~ "barra final. Las órdenes de unmount pueden especificarse usando UMount." - -#, fuzzy -#~ msgid "" -#~ "Most of the options in the <literal>debug</literal> section are not " -#~ "interesting to the normal user, however <literal>Debug::" -#~ "pkgProblemResolver</literal> shows interesting output about the decisions " -#~ "dist-upgrade makes. <literal>Debug::NoLocking</literal> disables file " -#~ "locking so APT can do some operations as non-root and <literal>Debug::" -#~ "pkgDPkgPM</literal> will print out the command line for each dpkg " -#~ "invokation. <literal>Debug::IdentCdrom</literal> will disable the " -#~ "inclusion of statfs data in CDROM IDs." -#~ msgstr "" -#~ "La mayoría de las opciones de la sección <literal>debug</literal> no son " -#~ "interesantes para el usuario normal, sin embargo <literal>Debug::" -#~ "pkgProblemResolver</literal> muestra una salida interesante acerca de las " -#~ "decisiones que realiza dist-upgrade. <literal>Debug::NoLocking</literal> " -#~ "deshabilita el bloqueo de fichero de forma que APT puede realizar algunas " -#~ "operaciones sin permisos de superusuario y <literal>Debug::pkgDPkgPM</" -#~ "literal> mostrará la línea de órdenes para cada llamada a dpkg. " -#~ "<literal>Debug::IdentCdrom</literal> deshabilitará la inclusión de datos " -#~ "de statfs en los ID's de los CDROM." - -#, fuzzy -#~ msgid "&manbugs; &manauthor;" -#~ msgstr "&manbugs; &manauthor;" - -#, fuzzy -#~ msgid "<manvolnum>8</manvolnum>" -#~ msgstr "<manvolnum>8</manvolnum>" - -#, fuzzy -#~ msgid "" -#~ "<arg rep=\"norepeat\" choice=\"opt\">shell</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">dump</arg>" -#~ msgstr "" -#~ "<arg rep=\"norepeat\" choice=\"opt\">add</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">ident</arg>" - -#, fuzzy -#~ msgid "" -#~ "&apt-docinfo;\n" -#~ "\n" -#~ " " -#~ msgstr "" -#~ "&apt-docinfo;\n" -#~ " \n" -#~ " " - -#, fuzzy -#~ msgid "</programlisting> Then:" -#~ msgstr "</programlisting> Entonces:" - -#, fuzzy -#~ msgid "<filename>/etc/apt/sources.list</filename>" -#~ msgstr "<filename>/etc/apt/sources.list</filename>" - -#, fuzzy -#~ msgid "" -#~ "Locations to fetch packages from. Configuration Item: <literal>Dir::Etc::" -#~ "SourceList</literal>." -#~ msgstr "" -#~ "#-#-#-#-# apt-cdrom.es.8.sgml:558 apt-cache.es.8.sgml:558 apt-get.es.8." -#~ "sgml:558 #-#-#-#-#\n" -#~ "Fichero que contiene los sitios de donde se obtienen los paquetes. Opción " -#~ "de configuración: <literal>Dir::Etc::SourceList</literal>.\n" -#~ "#-#-#-#-# apt-cdrom.es.8.sgml:1091 apt-cache.es.8.sgml:1091 apt-get.es.8." -#~ "sgml:1091 #-#-#-#-#\n" -#~ "Fichero que contiene los sitios de donde se obtienen los paquetes. Opción " -#~ "de Configuración: <literal>Dir::Etc::SourceList</literal>.\n" -#~ "#-#-#-#-# apt-cdrom.es.8.sgml:558 apt-cache.es.8.sgml:558 apt-get.es.8." -#~ "sgml:558 #-#-#-#-#\n" -#~ "Fichero que contiene los sitios de donde se obtienen los paquetes. Opción " -#~ "de configuración: <literal>Dir::Etc::SourceList</literal>.\n" -#~ "#-#-#-#-# apt-cdrom.es.8.sgml:1091 apt-cache.es.8.sgml:1091 apt-get.es.8." -#~ "sgml:1091 #-#-#-#-#\n" -#~ "Fichero que contiene los sitios de donde se obtienen los paquetes. Opción " -#~ "de Configuración: <literal>Dir::Etc::SourceList</literal>.\n" -#~ "#-#-#-#-# apt-cdrom.es.8.sgml:558 apt-cache.es.8.sgml:558 apt-get.es.8." -#~ "sgml:558 #-#-#-#-#\n" -#~ "Fichero que contiene los sitios de donde se obtienen los paquetes. Opción " -#~ "de configuración: <literal>Dir::Etc::SourceList</literal>.\n" -#~ "#-#-#-#-# apt-cdrom.es.8.sgml:1091 apt-cache.es.8.sgml:1091 apt-get.es.8." -#~ "sgml:1091 #-#-#-#-#\n" -#~ "Fichero que contiene los sitios de donde se obtienen los paquetes. Opción " -#~ "de Configuración: <literal>Dir::Etc::SourceList</literal>." - -#, fuzzy -#~ msgid "<filename>&statedir;/lists/</filename>" -#~ msgstr "<filename>&statedir;/lists/</filename>" - -#, fuzzy -#~ msgid "<filename>&statedir;/lists/partial/</filename>" -#~ msgstr "<filename>&statedir;/lists/partial/</filename>" - -#, fuzzy -#~ msgid "" -#~ "<arg rep=\"norepeat\" choice=\"opt\">update</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">upgrade</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">dselect-upgrade</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">install <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>pkg</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">remove <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>pkg</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">source <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>pkg</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">build-dep <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>pkg</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">check</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">clean</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">autoclean</arg>" -#~ msgstr "" -#~ "<arg rep=\"norepeat\" choice=\"opt\">update</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">upgrade</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">dselect-upgrade</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">install <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">remove <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">source <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">build-dep <arg rep=\"repeat\" choice=" -#~ "\"plain\"><replaceable>paquete</replaceable></arg></arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">check</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">clean</arg>\n" -#~ "<arg rep=\"norepeat\" choice=\"opt\">autoclean</arg>" - -#, fuzzy -#~ msgid "<filename>/etc/apt/apt.conf.d/</filename>" -#~ msgstr "<filename>/etc/apt/apt.conf.d/</filename>" - -#, fuzzy -#~ msgid "" -#~ "APT configuration file fragments Configuration Item: <literal>Dir::Etc::" -#~ "Parts</literal>." -#~ msgstr "" -#~ "Directorio con fragmentos de ficheros de configuración APT. Opción de " -#~ "Configuración: <literal>Dir::Etc::Parts</literal>." - -#, fuzzy -#~ msgid "<filename>&cachedir;/archives/</filename>" -#~ msgstr "<filename>&cachedir;/archives/</filename>" - -#, fuzzy -#~ msgid "" -#~ "Storage area for retrieved package files. Configuration Item: " -#~ "<literal>Dir::Cache::Archives</literal>." -#~ msgstr "" -#~ "Directorio donde se guardan los paquetes obtenidos. Opción de " -#~ "Configuración: <literal>Dir::Cache::Archives</literal>." - -#, fuzzy -#~ msgid "<filename>&cachedir;/archives/partial/</filename>" -#~ msgstr "<filename>&cachedir;/archives/partial/</filename>" - -#, fuzzy -#~ msgid "" -#~ "APT is a management system for software packages. It is still under " -#~ "development; the snazzy front ends are not yet available. In the " -#~ "meantime, please see B<apt-get>(8)." -#~ msgstr "" -#~ "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, B<apt-get>(8)." +#~ "del conjunto de herramientas de APT, todas las herramientas hacen uso del " +#~ "fichero de configuración y de un analizador común de la línea de órdenes " +#~ "para proporcionar un entorno uniforme. Cuando se inicia una herramienta " +#~ "de APT, ésta leerá la configuración definida en la variable de entorno " +#~ "<envar>APT_CONFIG</envar> (si existe), y luego leerá los ficheros " +#~ "definidos en <literal>Dir::Etc::Parts</literal>. Entonces, leerá el " +#~ "fichero de la configuración principal definido en <literal>Dir::Etc::" +#~ "main</literal> para finalmente aplicar las opciones de la línea de " +#~ "órdenes y redefinir las directrices de la configuración, posiblemente " +#~ "cargando incluso más ficheros de configuración." diff --git a/doc/po/fr.po b/doc/po/fr.po index a6d12364e..9cbfd48b2 100644 --- a/doc/po/fr.po +++ b/doc/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2010-01-29 19:58+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1059,12 +1059,6 @@ msgstr "" #. type: Plain text #: apt.ent:362 #, no-wrap -#| msgid "" -#| "<!ENTITY file-sourceslist \"\n" -#| " <varlistentry><term><filename>/etc/apt/sources.list</filename></term>\n" -#| " <listitem><para>Locations to fetch packages from.\n" -#| " Configuration Item: <literal>Dir::Etc::SourceList</literal>.</para></listitem>\n" -#| " </varlistentry>\n" msgid "" "<!ENTITY file-trustedgpg \"\n" " <varlistentry><term><filename>/etc/apt/trusted.gpg</filename></term>\n" @@ -1142,7 +1136,7 @@ msgstr "" " traduction est légèrement en retard sur le contenu d'origine.\n" "\">\n" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-cache.8.xml:13 apt-config.8.xml:13 apt-extracttemplates.1.xml:13 #: apt-sortpkgs.1.xml:13 sources.list.5.xml:13 @@ -1224,7 +1218,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1758,7 +1752,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "options" @@ -1785,7 +1779,7 @@ msgstr "" "<literal>Dir::Cache::pkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1812,12 +1806,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1878,7 +1872,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -1998,14 +1992,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "Fichiers" @@ -2016,9 +2010,9 @@ msgstr "&file-sourceslist; &file-statelists;" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 msgid "See Also" msgstr "Voir aussi" @@ -2030,7 +2024,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;." #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "Diagnostics" @@ -2110,9 +2104,16 @@ msgstr "add" #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2165,7 +2166,7 @@ msgid "Options" msgstr "Options" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2343,7 +2344,7 @@ msgstr "" "apt.conf</filename>." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -2410,7 +2411,7 @@ msgid "Just show the contents of the configuration space." msgstr "Affiche seulement le contenu de l'espace de configuration." #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2489,7 +2490,7 @@ msgstr "" "<filename>package.config.XXXX</filename>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2518,7 +2519,7 @@ msgstr "" "<command>apt-extracttemplates</command> retourne zéro si tout se passe bien, " "le nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-ftparchive.1.xml:13 msgid "" @@ -2540,10 +2541,32 @@ msgstr "Outil de création de fichiers d'index" #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-ftparchive.1.xml:36 +#, fuzzy +#| msgid "" +#| "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " +#| "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " +#| "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +#| "arg> <arg><option>-o <replaceable>config</" +#| "replaceable>=<replaceable>string</replaceable></option></arg> " +#| "<arg><option>-c=<replaceable>file</replaceable></option></arg> <group " +#| "choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=\"repeat" +#| "\"><replaceable>path</replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>sources<arg choice=\"plain\" rep=\"repeat\"><replaceable>path</" +#| "replaceable></arg><arg><replaceable>override</" +#| "replaceable><arg><replaceable>pathprefix</replaceable></arg></arg></arg> " +#| "<arg>contents <arg choice=\"plain\"><replaceable>path</replaceable></" +#| "arg></arg> <arg>release <arg choice=\"plain\"><replaceable>path</" +#| "replaceable></arg></arg> <arg>generate <arg choice=\"plain" +#| "\"><replaceable>config-file</replaceable></arg> <arg choice=\"plain\" rep=" +#| "\"repeat\"><replaceable>section</replaceable></arg></arg> <arg>clean <arg " +#| "choice=\"plain\"><replaceable>config-file</replaceable></arg></arg> </" +#| "group>" msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2580,7 +2603,7 @@ msgstr "" "replaceable></arg></arg> </group>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2592,7 +2615,7 @@ msgstr "" "index doit être créé pour un site et basé sur le contenu de ce site." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2607,7 +2630,7 @@ msgstr "" "élaborée pour « scripter » le processus de création d'une archive complète." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2622,12 +2645,12 @@ msgstr "" "voulus." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "packages" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2641,19 +2664,20 @@ msgstr "" "équivalente à &dpkg-scanpackages;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 -msgid "The option <option>--db</option> can be used to specify a binary caching DB." +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 +msgid "" +"The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" "On peut se servir de l'option <option>--db</option> pour demander un cache " "binaire." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "sources" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2667,7 +2691,7 @@ msgstr "" "équivalente à &dpkg-scansources;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2678,12 +2702,12 @@ msgstr "" "source-override</option> pour changer de fichier source d'« override »." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "contents" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2701,12 +2725,12 @@ msgstr "" "sépare les paquets." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "release" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2721,7 +2745,7 @@ msgstr "" "standard avec un résumé MD5 et un résumé SHA1 pour chaque fichier." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2740,12 +2764,12 @@ msgstr "" "<literal>Components</literal>, <literal>Description</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "generate" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2759,12 +2783,12 @@ msgstr "" "préciser index et répertoires aussi bien que les paramètres requis." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." @@ -2774,12 +2798,12 @@ msgstr "" "sont plus nécessaires." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "Configuration de la commande generate" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2796,17 +2820,19 @@ msgstr "" "arborescence. Cela n'affecte que l'usage de l'étiquette de visée (scope tag)." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 -msgid "The generate configuration has 4 separate sections, each described below." -msgstr "Ce fichier de configuration possède quatre sections, décrites ci-dessous." +#: apt-ftparchive.1.xml:156 +msgid "" +"The generate configuration has 4 separate sections, each described below." +msgstr "" +"Ce fichier de configuration possède quatre sections, décrites ci-dessous." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "La section Dir" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2819,12 +2845,12 @@ msgstr "" "manière à produire un chemin absolu et complet." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "ArchiveDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2835,32 +2861,32 @@ msgstr "" "filename> et les noeuds des distributions." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "OverrideDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "Indique l'emplacement des fichiers d'« override »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "CacheDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "Indique l'emplacement des fichiers de cache." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "FileListDir" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." @@ -2869,12 +2895,12 @@ msgstr "" "sert de la valeur <literal>FileList</literal> définie plus bas)." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "La section Default" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2885,12 +2911,12 @@ msgstr "" "annulées dans d'autres sections (paramètrage par section)." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "Packages::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2903,12 +2929,12 @@ msgstr "" "défaut, c'est la chaîne « . gzip »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "Packages::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." @@ -2917,12 +2943,12 @@ msgstr "" "paquets. Par défaut, c'est « .deb »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "Sources::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." @@ -2931,12 +2957,12 @@ msgstr "" "compressés les fichiers sources." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "Sources::Extensions" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." @@ -2945,12 +2971,12 @@ msgstr "" "fichiers sources. Par défaut, c'est « .dsc »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "Contents::Compress" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." @@ -2959,12 +2985,12 @@ msgstr "" "compressés les fichiers « Contents »." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "DeLinkLimit" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2975,12 +3001,12 @@ msgstr "" "paramètre <literal>External-Links</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "FileMode" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." @@ -2990,12 +3016,12 @@ msgstr "" "utilisateur (umasq) est ignoré." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "La section TreeDefault" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -3007,12 +3033,12 @@ msgstr "" "respective." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "MaxContentsChange" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -3024,12 +3050,12 @@ msgstr "" "soient reconstruits." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "ContentsAge" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -3047,12 +3073,12 @@ msgstr "" "nombre vaut 10, l'unité étant le jour." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "Directory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" @@ -3061,12 +3087,12 @@ msgstr "" "$(DIST)/$(SECTION)/binary-$(ARCH)/</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "SrcDirectory" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" @@ -3075,12 +3101,12 @@ msgstr "" "<filename>$(DIST)/$(SECTION)/source/</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "Packages" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" @@ -3089,15 +3115,12 @@ msgstr "" "$(SECTION)/binary-$(ARCH)/Packages</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "Sources" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 -#| msgid "" -#| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" -#| "source/Sources</filename>" +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" @@ -3106,12 +3129,12 @@ msgstr "" "$(SECTION)/source/Sources</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "InternalPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -3122,12 +3145,12 @@ msgstr "" "défaut, c'est <filename>$(DIST)/$(SECTION)/</filename>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "Contents" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -3140,22 +3163,22 @@ msgstr "" "ftparchive</command> les intègre automatiquement." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "Contents::Header" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "Indique l'en-tête à préfixer au fichier « Contents » créé." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "BinCacheDB" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." @@ -3164,12 +3187,12 @@ msgstr "" "Différentes sections peuvent partager cette base de données." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "FileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3180,12 +3203,12 @@ msgstr "" "relatifs sont préfixés par le répertoire de l'archive." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3198,12 +3221,12 @@ msgstr "" "traiter les index de sources." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "La section Tree" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3217,7 +3240,7 @@ msgstr "" "par la variable de substitution <literal>Directory</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3230,7 +3253,7 @@ msgstr "" "C'est par exemple : <filename>dists/woody</filename>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3241,12 +3264,8 @@ msgstr "" "trois nouvelles variables suivantes." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap -#| msgid "" -#| "for i in Sections do \n" -#| " for j in Architectures do\n" -#| " Generate for DIST=scope SECTION=i ARCH=j\n" msgid "" "for i in Sections do \n" " for j in Architectures do\n" @@ -3259,26 +3278,23 @@ msgstr "" " " #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 -#| msgid "" -#| "When processing a <literal>Tree</literal> section <command>apt-" -#| "ftparchive</command> performs an operation similar to:" +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" "\" id=\"0\"/>" msgstr "" "Quand il exécute la section <literal>Tree</literal>, <command>apt-" -"ftparchive</command> effectue une opération analogue à : <placeholder type=\"programlisting" -"\" id=\"0\"/>" +"ftparchive</command> effectue une opération analogue à : <placeholder type=" +"\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "Sections" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3289,12 +3305,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "Architectures" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3305,12 +3321,12 @@ msgstr "" "que l'arborescence est une arborescence de sources." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "BinOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." @@ -3319,12 +3335,12 @@ msgstr "" "informations sur la section, la priorité et le responsable du paquet." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "SrcOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." @@ -3333,32 +3349,32 @@ msgstr "" "informations sur la section." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "ExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "Indique un autre fichier d'« override » pour les binaires." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "SrcExtraOverride" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "Indique un autre fichier d'« override » pour les sources." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "La section BinDirectory" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3373,12 +3389,12 @@ msgstr "" "paramètrage de <literal>Section</literal><literal>Architecture</literal>." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "Définit le fichier « Packages » créé." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." @@ -3387,52 +3403,52 @@ msgstr "" "<literal>Packages</literal> ou <literal>Sources</literal> est nécessaire." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "Définit le fichier « Contents » créé." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "Définit le fichier d'« override » pour les binaires." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "Définit le fichier d'« override » pour les sources." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "Définit la base de données cache." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "PathPrefix" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "Ajoute un chemin à tous les chemins créés." #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "FileList, SourceFileList" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "Définit le fichier contenant la liste des fichiers." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "Le fichier d'« Override » pour les binaires." #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3447,19 +3463,19 @@ msgstr "" "responsable de paquet." #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "old [// oldn]* => new" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "new" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3476,12 +3492,12 @@ msgstr "" "deuxième forme remplace inconditionnellement le champ." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "Le fichier d'« Override » pour les sources" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3492,12 +3508,12 @@ msgstr "" "sa section." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "Le fichier supplémentaire d'« Override »" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3509,12 +3525,12 @@ msgstr "" "la nouvelle valeur." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "<option>--md5</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3526,12 +3542,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "<option>--db</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3541,7 +3557,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3556,12 +3572,12 @@ msgstr "" "configuration : <literal>quiet</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3575,12 +3591,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3596,12 +3612,12 @@ msgstr "" "de configuration : <literal>APT::FTPArchive::Contents</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3612,12 +3628,12 @@ msgstr "" "FTPArchive::SourceOverride</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3626,16 +3642,42 @@ msgstr "" "configuration : <literal>APT::FTPArchive::ReadOnlyDB</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"Si la commande utilisée est soit <literal>install</literal> soit " +"<literal>remove</literal>, cette option a le même effet " +"qu'<literal>autoremove</literal> et supprime les paquets de dépendance " +"inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy #| msgid "<option>APT::FTPArchive::LongDescription</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3647,12 +3689,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>APT::FTPArchive::LongDescription</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3667,19 +3709,19 @@ msgstr "" "pas possible de créer ces fichiers avec <command>apt-ftparchive</command>." #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 msgid "Examples" msgstr "Exemples" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>répertoire</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3688,7 +3730,7 @@ msgstr "" "paquets binaires (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3696,7 +3738,7 @@ msgstr "" "<command>apt-ftparchive</command> retourne zéro si tout se passe bien, le " "nombre 100 en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-get.8.xml:13 msgid "" @@ -3714,7 +3756,8 @@ msgstr "apt-get" #. type: Content of: <refentry><refnamediv><refpurpose> #: apt-get.8.xml:30 msgid "APT package handling utility -- command-line interface" -msgstr "Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." +msgstr "" +"Utilitaire APT pour la gestion des paquets -- interface en ligne de commande." #. type: Content of: <refentry><refsynopsisdiv><cmdsynopsis> #: apt-get.8.xml:36 @@ -4565,11 +4608,37 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 +#, fuzzy +#| msgid "<option>--no-upgrade</option>" +msgid "<option>--only-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "" +#| "Do not upgrade packages; When used in conjunction with <literal>install</" +#| "literal>, <literal>no-upgrade</literal> will prevent packages on the " +#| "command line from being upgraded if they are already installed. " +#| "Configuration Item: <literal>APT::Get::Upgrade</literal>." +msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" +"Aucune mise à niveau ; quand elle est utilisée avec <literal>install</" +"literal>, cette commande empêche les paquets mentionnés sur la ligne de " +"commande d'être mis à niveau. Élément de configuration : <literal>APT::Get::" +"Upgrade</literal>." + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:448 +#: apt-get.8.xml:455 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4585,12 +4654,12 @@ msgstr "" "yes</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4612,12 +4681,12 @@ msgstr "" "<literal>APT::Get::Print-URIs</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 #, fuzzy #| msgid "" #| "Use purge instead of remove for anything that would be removed. An " @@ -4636,12 +4705,12 @@ msgstr "" "être purgés. Élément de configuration : <literal>APT::Get::Purge</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4650,12 +4719,12 @@ msgstr "" "Élément de configuration : <literal>APT::Get::ReInstall</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4673,17 +4742,17 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4705,12 +4774,12 @@ msgstr "" "Release</literal>. Voyez aussi la page de manuel d'&apt-preferences;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4724,12 +4793,12 @@ msgstr "" "Get::Trivial-Only</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4739,12 +4808,12 @@ msgstr "" "Remove</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4757,12 +4826,12 @@ msgstr "" "inutilisés. Élément de configuration : <literal>APT::Get::Upgrade</literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4782,22 +4851,22 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -4809,12 +4878,12 @@ msgstr "" "literal>, " #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -4824,12 +4893,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -4841,7 +4910,7 @@ msgstr "" "AllowUnauthenticated</literal>." #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -4850,7 +4919,7 @@ msgstr "" "&file-statelists;" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -4861,7 +4930,7 @@ msgstr "" "« HOWTO » d'APT." #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -4870,22 +4939,22 @@ msgstr "" "décimal 100 en cas d'erreur." #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "AUTEURS D'ORIGINE" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "AUTEURS ACTUELS" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -5072,8 +5141,10 @@ msgstr "Trousseau des clés fiables de l'archive Debian." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-key.8.xml:166 -msgid "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" -msgstr "<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgid "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" +msgstr "" +"<filename>/usr/share/keyrings/debian-archive-removed-keys.gpg</filename>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-key.8.xml:167 @@ -5085,7 +5156,7 @@ msgstr "Trousseau des clés fiables supprimées de l'archive Debian." msgid "&apt-get;, &apt-secure;" msgstr "&apt-get;, &apt-secure;" -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt-mark.8.xml:13 msgid "" @@ -5195,8 +5266,10 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:93 -msgid "<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" -msgstr "<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" +msgid "" +"<option>-f=<filename><replaceable>FILENAME</replaceable></filename></option>" +msgstr "" +"<option>-f=<filename><replaceable>FICHIER</replaceable></filename></option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-mark.8.xml:94 @@ -5656,7 +5729,7 @@ msgstr "" "<command>apt-sortpkgs</command> retourne zéro si tout se passe bien ou 100 " "en cas d'erreur." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt.conf.5.xml:13 #, fuzzy @@ -5729,7 +5802,8 @@ msgstr "" #| msgid "" #| "APT configuration file. Configuration Item: <literal>Dir::Etc::Main</" #| "literal>." -msgid "the main configuration file specified by <literal>Dir::Etc::main</literal>" +msgid "" +"the main configuration file specified by <literal>Dir::Etc::main</literal>" msgstr "" "Fichier de configuration d'APT. Élément de configuration : <literal>Dir::" "Etc::Main</literal>." @@ -7478,7 +7552,7 @@ msgstr "" #. TODO: provide a #. motivating example, except I haven't a clue why you'd want -#. to do this. +#. to do this. #. type: Content of: <refentry><refsect1><para><itemizedlist><listitem><para> #: apt.conf.5.xml:692 msgid "" @@ -7500,7 +7574,8 @@ msgstr "<literal>Debug::Acquire::cdrom</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:711 -msgid "Print information related to accessing <literal>cdrom://</literal> sources." +msgid "" +"Print information related to accessing <literal>cdrom://</literal> sources." msgstr "" "Affiche les informations concernant les sources de type <literal>cdrom://</" "literal>" @@ -7513,7 +7588,8 @@ msgstr "<literal>Debug::Acquire::ftp</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:722 msgid "Print information related to downloading packages using FTP." -msgstr "Affiche les informations concernant le téléchargement de paquets par FTP." +msgstr "" +"Affiche les informations concernant le téléchargement de paquets par FTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:729 @@ -7523,7 +7599,8 @@ msgstr "<literal>Debug::Acquire::http</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:733 msgid "Print information related to downloading packages using HTTP." -msgstr "Affiche les informations concernant le téléchargement de paquets par HTTP." +msgstr "" +"Affiche les informations concernant le téléchargement de paquets par HTTP." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt.conf.5.xml:740 @@ -7684,7 +7761,8 @@ msgstr "<literal>Debug::pkgAcquire::Worker</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:862 -msgid "Log all interactions with the sub-processes that actually perform downloads." +msgid "" +"Log all interactions with the sub-processes that actually perform downloads." msgstr "" "Affiche toutes les interactions avec les processus enfants qui se chargent " "effectivement des téléchargements." @@ -7825,7 +7903,8 @@ msgstr "<literal>Debug::pkgPackageManager</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt.conf.5.xml:963 -msgid "Output status messages tracing the steps performed when invoking &dpkg;." +msgid "" +"Output status messages tracing the steps performed when invoking &dpkg;." msgstr "Affiche le détail des opérations liées à l'invocation de &dpkg;." #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> @@ -7896,16 +7975,19 @@ msgstr "" msgid "&file-aptconf;" msgstr "&file-aptconf;" -#. ? reading apt.conf +#. ? reading apt.conf #. type: Content of: <refentry><refsect1><para> #: apt.conf.5.xml:1042 msgid "&apt-cache;, &apt-config;, &apt-preferences;." msgstr "&apt-cache;, &apt-config;, &apt-preferences;." -#. The last update date +#. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 mai 2009</date>" #. type: Content of: <refentry><refnamediv><refname> @@ -7971,6 +8053,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -7980,24 +8076,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "Priorités affectées par défaut" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>paquet</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8022,22 +8118,22 @@ msgstr "" "\"programlisting\" id=\"0\"/> <placeholder type=\"programlisting\" id=\"1\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "une priorité égale à 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "est affectée à la version déjà installée (si elle existe)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "une priorité égale à 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8046,19 +8142,20 @@ msgstr "" "pas à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "une priorité égale à 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 -msgid "to the versions that are not installed and belong to the target release." +#: apt_preferences.5.xml:112 +msgid "" +"to the versions that are not installed and belong to the target release." msgstr "" "est affectée aux versions qui ne sont pas installées et qui appartiennent à " "la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8069,7 +8166,7 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8080,7 +8177,7 @@ msgstr "" "une priorité égale à 500 à tout version non installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8089,7 +8186,7 @@ msgstr "" "qu'il faut installer (par ordre de priorité) :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8105,12 +8202,12 @@ msgstr "" "arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "Installer la version qui possède la priorité la plus haute." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8119,7 +8216,7 @@ msgstr "" "plus récente (c.-à-d. celle dont le numéro de version est le plus grand)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8131,7 +8228,7 @@ msgstr "" "qui n'est pas installée." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8146,7 +8243,7 @@ msgstr "" "replaceable></command> ou <command>apt-get dist-upgrade</command>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8159,7 +8256,7 @@ msgstr "" "<command>apt-get upgrade</command> ne provoquent pas de retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8178,12 +8275,12 @@ msgstr "" "priorité que celle de la version installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "Conséquences des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8196,7 +8293,7 @@ msgstr "" "formes, une forme particulière et une forme générale." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8211,7 +8308,7 @@ msgstr "" "dont le numéro de version commence par <literal>5.8</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@ -8223,7 +8320,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8238,7 +8335,7 @@ msgstr "" "un nom complètement qualifié." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8249,7 +8346,7 @@ msgstr "" "priorité haute à toutes les versions disponibles dans le site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@ -8261,7 +8358,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8276,7 +8373,7 @@ msgstr "" "mais le nom d'un auteur ou d'un distributeur, comme « Debian » ou « Ximian »." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8287,7 +8384,7 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@ -8299,7 +8396,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8310,7 +8407,7 @@ msgstr "" "<literal>squeeze</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@ -8322,7 +8419,7 @@ msgstr "" "Pin-Priority: 900\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8334,7 +8431,7 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@ -8346,17 +8443,17 @@ msgstr "" "Pin-Priority: 500\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "Méthode d'interprétation des priorités par APT" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8365,12 +8462,12 @@ msgstr "" "retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8380,12 +8477,12 @@ msgstr "" "plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8394,12 +8491,12 @@ msgstr "" "distribution par défaut ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8408,29 +8505,29 @@ msgstr "" "autre distribution ou si la version installée est plus récente." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "0 < P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "la version sera installée si aucune version du paquet n'est installée." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "cette priorité empêche l'installation de la version." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8441,7 +8538,7 @@ msgstr "" "<placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8455,7 +8552,7 @@ msgstr "" "trouvée détermine la priorité." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8464,7 +8561,7 @@ msgstr "" "entrées décrites ci-dessous :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@ -8492,12 +8589,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "Alors :" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8511,7 +8608,7 @@ msgstr "" "installée est une version 5.9*, il y aura un retour en arrière." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8522,7 +8619,7 @@ msgstr "" "appartenant à la distribution par défaut." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8535,12 +8632,13 @@ msgstr "" "paquet n'est déjà installée." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" -msgstr "Détermination de la version des paquets et des propriétés des distributions" +msgstr "" +"Détermination de la version des paquets et des propriétés des distributions" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8551,27 +8649,27 @@ msgstr "" "décrivent les paquets disponibles à cet endroit." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "la ligne <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "donne le nom du paquet" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "la ligne <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "donne le numéro de version du paquet" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8592,12 +8690,12 @@ msgstr "" "\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "La ligne <literal>Archive:</literal> ou <literal>Suite:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -8614,18 +8712,18 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "la ligne <literal>Codename:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -8641,13 +8739,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8663,7 +8761,7 @@ msgstr "" "préférences demanderait ces lignes :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8675,12 +8773,12 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "La ligne <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8698,18 +8796,18 @@ msgstr "" "fichier des préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "La ligne <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8722,18 +8820,18 @@ msgstr "" "ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "La ligne <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8746,13 +8844,13 @@ msgstr "" "préférences demanderait cette ligne :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -8774,7 +8872,7 @@ msgstr "" "déterminer les priorités : <placeholder type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8799,12 +8897,12 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "Lignes facultatives dans le fichier des préférences" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8815,7 +8913,7 @@ msgstr "" "commentaires." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -8828,12 +8926,12 @@ msgstr "" "literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "Méthode pour suivre Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8857,7 +8955,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -8872,8 +8970,8 @@ msgstr "" "literal>. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8885,7 +8983,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8898,13 +8996,13 @@ msgstr "" "\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>paquet</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -8917,12 +9015,12 @@ msgstr "" "de relancer la commande. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "Méthode pour suivre Testing ou Unstable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@ -8950,7 +9048,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -8967,7 +9065,7 @@ msgstr "" "<placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -8980,13 +9078,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>paquet</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -9005,12 +9103,12 @@ msgstr "" "installée. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "Suivre l'évolution d'une version par son nom de code" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9044,7 +9142,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9068,7 +9166,7 @@ msgstr "" "exemples précédents. <placeholder type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -9081,13 +9179,13 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>paquet</replaceable>/sid\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -9106,12 +9204,12 @@ msgstr "" "type=\"programlisting\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "&file-preferences;" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" @@ -9630,7 +9728,8 @@ msgstr "$Id: guide.sgml,v 1.7 2003/04/26 23:26:13 doogie Exp $" #. type: <abstract></abstract> #: guide.sgml:11 -msgid "This document provides an overview of how to use the the APT package manager." +msgid "" +"This document provides an overview of how to use the the APT package manager." msgstr "" "Ce document fournit un aperçu des méthode d'utilisation du gestionnaire de " "paquets APT." @@ -10561,8 +10660,10 @@ msgstr "Résumé final" #. type: <p></p> #: guide.sgml:447 -msgid "Finally, APT will print out a summary of all the changes that will occur." -msgstr "Anfin, APT affichera un résumé de toutes les opérations qui prendront place." +msgid "" +"Finally, APT will print out a summary of all the changes that will occur." +msgstr "" +"Anfin, APT affichera un résumé de toutes les opérations qui prendront place." #. type: <example></example> #: guide.sgml:452 diff --git a/doc/po/it.po b/doc/po/it.po index fd2e2994e..e4db82c4e 100644 --- a/doc/po/it.po +++ b/doc/po/it.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2003-04-26 23:26+0100\n" "Last-Translator: Traduzione di Eugenia Franzoni <eugenia@linuxcare.com>\n" "Language-Team: <debian-l10n-italian@lists.debian.org>\n" @@ -866,7 +866,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1257,7 +1257,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1281,7 +1281,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1302,12 +1302,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1356,7 +1356,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1452,14 +1452,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "" @@ -1470,9 +1470,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1484,7 +1484,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1549,7 +1549,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1589,7 +1589,7 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1733,7 +1733,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1784,7 +1784,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1845,7 +1845,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "" @@ -1893,6 +1893,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -1910,7 +1911,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1919,7 +1920,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -1929,7 +1930,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1939,12 +1940,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -1953,18 +1954,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1973,7 +1974,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -1981,12 +1982,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1997,12 +1998,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2012,7 +2013,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2024,13 +2025,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 #, fuzzy msgid "generate" msgstr "Descrizione generale" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2040,24 +2041,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2068,18 +2069,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2088,12 +2089,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2101,44 +2102,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2146,12 +2147,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2160,60 +2161,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2221,24 +2222,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2246,12 +2247,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2259,12 +2260,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2275,60 +2276,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2336,12 +2337,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2350,34 +2351,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2385,12 +2386,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2399,12 +2400,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2414,7 +2415,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2423,7 +2424,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2431,7 +2432,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2441,7 +2442,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -2449,12 +2450,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -2462,12 +2463,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2475,56 +2476,56 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2534,64 +2535,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2601,19 +2602,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -2624,12 +2625,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2637,12 +2638,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2650,12 +2651,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2663,19 +2664,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2684,12 +2685,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2698,12 +2699,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2713,12 +2714,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2726,26 +2727,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2757,12 +2772,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2772,26 +2787,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3414,12 +3429,26 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 -msgid "<option>--force-yes</option>" +msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " "not be used except in very special situations. Using <literal>force-yes</" @@ -3428,12 +3457,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3446,12 +3475,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3460,24 +3489,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3488,17 +3517,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3512,12 +3541,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3526,24 +3555,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3552,12 +3581,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3569,22 +3598,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3592,24 +3621,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3617,14 +3646,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3632,29 +3661,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "" @@ -5844,7 +5873,8 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5892,6 +5922,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -5901,24 +5945,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5934,40 +5978,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:112 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5975,7 +6019,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5983,14 +6027,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -6000,19 +6044,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -6020,7 +6064,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -6030,7 +6074,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -6039,7 +6083,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6051,12 +6095,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6065,7 +6109,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6075,7 +6119,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@ -6084,7 +6128,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6094,7 +6138,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6102,7 +6146,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@ -6111,7 +6155,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6121,7 +6165,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6129,7 +6173,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@ -6138,7 +6182,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6146,7 +6190,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@ -6155,7 +6199,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6163,7 +6207,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@ -6172,82 +6216,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6255,7 +6299,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6264,14 +6308,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@ -6288,12 +6332,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6303,7 +6347,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6311,7 +6355,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6320,12 +6364,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6333,27 +6377,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6366,12 +6410,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6382,18 +6426,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6403,13 +6447,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6419,7 +6463,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6428,12 +6472,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6444,18 +6488,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6464,18 +6508,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6484,13 +6528,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6503,7 +6547,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6518,12 +6562,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6531,7 +6575,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6540,12 +6584,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6560,7 +6604,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6570,8 +6614,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6580,7 +6624,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6589,13 +6633,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6604,12 +6648,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@ -6626,7 +6670,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6637,7 +6681,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6646,13 +6690,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6664,12 +6708,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6689,7 +6733,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6704,7 +6748,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6713,13 +6757,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6731,12 +6775,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/ja.po b/doc/po/ja.po index f1a766d97..58012cfb6 100644 --- a/doc/po/ja.po +++ b/doc/po/ja.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2009-07-30 22:55+0900\n" "Last-Translator: KURASAWA Nozomu <nabetaro@caldron.jp>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1222,7 +1222,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1786,7 +1786,7 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "オプション" @@ -1814,7 +1814,7 @@ msgstr "" "pkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "<option>-s</option>" @@ -1841,12 +1841,12 @@ msgstr "" "<literal>Dir::Cache::srcpkgcache</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "<option>-q</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "<option>--quiet</option>" @@ -1907,7 +1907,7 @@ msgstr "" "ShowFull</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "<option>-a</option>" @@ -2029,15 +2029,15 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "&apt-commonoptions;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "ファイル" @@ -2049,9 +2049,9 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 msgid "See Also" msgstr "関連項目" @@ -2065,7 +2065,7 @@ msgstr "&apt-conf;, &sources-list;, &apt-get;" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "診断メッセージ" @@ -2151,9 +2151,16 @@ msgstr "add" # type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><para><variablelist><varlistentry><listitem><para> #: apt-cdrom.8.xml:66 +#, fuzzy +#| msgid "" +#| "<literal>add</literal> is used to add a new disc to the source list. It " +#| "will unmount the CDROM device, prompt for a disk to be inserted and then " +#| "procceed to scan it and copy the index files. If the disc does not have a " +#| "proper <filename>disk</filename> directory you will be prompted for a " +#| "descriptive title." msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -2208,7 +2215,7 @@ msgid "Options" msgstr "オプション" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "<option>-d</option>" @@ -2395,7 +2402,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -2466,7 +2473,7 @@ msgstr "設定箇所の内容を表示するだけです。" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "&apt-conf;" @@ -2550,7 +2557,7 @@ msgstr "" "<filename>package.config.XXXX</filename> と言った形になります。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "<option>-t</option>" @@ -2638,6 +2645,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -2673,7 +2681,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -2686,7 +2694,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -2701,7 +2709,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -2716,13 +2724,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "packages" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2736,20 +2744,20 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "<option>--db</option> オプションで、キャッシュ DB を指定できます。" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "sources" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2763,7 +2771,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2774,13 +2782,13 @@ msgstr "" "override オプションを使用します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "contents" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2797,13 +2805,13 @@ msgstr "" "で出力します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "release" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2819,7 +2827,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2838,13 +2846,13 @@ msgstr "" "<literal>Description</literal> です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "generate" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2858,13 +2866,13 @@ msgstr "" "のディレクトリから作成するかを指定する、柔軟な方法を提供します。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "clean" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." @@ -2874,13 +2882,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "Generate 設定" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2898,7 +2906,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" @@ -2907,13 +2915,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "Dir セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 #, fuzzy #| msgid "" #| "The <literal>Dir</literal> section defines the standard directories " @@ -2932,13 +2940,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "ArchiveDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2948,36 +2956,36 @@ msgstr "" "リには <filename>ls-LR</filename> と dist ノードがあります。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "OverrideDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "オーバーライドファイルの場所を指定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "CacheDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "キャッシュファイルの場所を指定します。" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "FileListDir" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." @@ -2987,13 +2995,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "Default セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -3005,13 +3013,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "Packages::Compress" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -3023,13 +3031,13 @@ msgstr "" "法のデフォルトはすべて '. gzip' です。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "Packages::Extensions" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." @@ -3038,13 +3046,13 @@ msgstr "" "deb' です。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "Sources::Compress" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." @@ -3053,13 +3061,13 @@ msgstr "" "指定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "Sources::Extensions" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." @@ -3068,13 +3076,13 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "Contents::Compress" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." @@ -3083,13 +3091,13 @@ msgstr "" "指定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "DeLinkLimit" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -3101,13 +3109,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "FileMode" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." @@ -3117,13 +3125,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "TreeDefault セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -3134,13 +3142,13 @@ msgstr "" "に展開します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "MaxContentsChange" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -3151,13 +3159,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "ContentsAge" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -3174,13 +3182,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "Directory" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" @@ -3190,13 +3198,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "SrcDirectory" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" @@ -3206,13 +3214,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "Packages" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" @@ -3222,13 +3230,13 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "Sources" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 #, fuzzy #| msgid "" #| "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" @@ -3241,13 +3249,13 @@ msgstr "" "$(SECTION)/source/Sources</filename> です。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "InternalPrefix" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -3258,13 +3266,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "Contents" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -3277,24 +3285,24 @@ msgstr "" "ftparchive</command> は自動でパッケージファイルをまとめます。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "Contents::Header" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "contents の出力に付けるヘッダファイルを設定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "BinCacheDB" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." @@ -3304,13 +3312,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "FileList" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3322,13 +3330,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "SourceFileList" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -3341,13 +3349,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "Tree セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -3362,7 +3370,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -3376,7 +3384,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -3387,7 +3395,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><informalexample><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, fuzzy, no-wrap #| msgid "" #| "for i in Sections do \n" @@ -3405,7 +3413,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><informalexample> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 #, fuzzy #| msgid "" #| "When processing a <literal>Tree</literal> section <command>apt-" @@ -3420,13 +3428,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "Sections" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -3437,13 +3445,13 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "Architectures" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -3455,13 +3463,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "BinOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." @@ -3471,13 +3479,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "SrcOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." @@ -3487,37 +3495,37 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "ExtraOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "バイナリ特別オーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "SrcExtraOverride" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "ソース特別オーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "BinDirectory セクション" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -3532,13 +3540,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "Packages ファイルの出力先を設定します。" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." @@ -3548,59 +3556,59 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "Contents ファイルの出力先を設定します。(オプション)" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "バイナリオーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "ソースオーバーライドファイルを設定します。" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "キャッシュ DB を設定します。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "PathPrefix" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "全出力パスに付加するパス。" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "FileList, SourceFileList" # type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "ファイル一覧ファイルを指定します。" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "バイナリオーバーライドファイル" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -3615,20 +3623,20 @@ msgstr "" "す。" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "old [// oldn]* => new" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "new" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -3646,13 +3654,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "ソースオーバーライドファイル" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -3664,13 +3672,13 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "特別オーバーライドファイル" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -3680,13 +3688,13 @@ msgstr "" "す。3 列からなり、先頭はパッケージ、2番目はタグ、残りは新しい値です。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "<option>--md5</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -3697,13 +3705,13 @@ msgstr "" "FTPArchive::MD5</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "<option>--db</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." @@ -3713,7 +3721,7 @@ msgstr "" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -3726,13 +3734,13 @@ msgstr "" "<literal>quiet</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "<option>--delink</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -3745,13 +3753,13 @@ msgstr "" "<literal>APT::FTPArchive::DeLinkAct</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "<option>--contents</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -3766,13 +3774,13 @@ msgstr "" "<literal>APT::FTPArchive::Contents</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "<option>--source-override</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -3782,13 +3790,13 @@ msgstr "" "選択します。設定項目 - <literal>APT::FTPArchive::SourceOverride</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "<option>--readonly</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." @@ -3797,16 +3805,43 @@ msgstr "" "FTPArchive::ReadOnlyDB</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 +#: apt-ftparchive.1.xml:548 +#, fuzzy +#| msgid "<option>-a</option>" +msgid "<option>--arch</option>" +msgstr "<option>-a</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:549 +#, fuzzy +#| msgid "" +#| "If the command is either <literal>install</literal> or <literal>remove</" +#| "literal>, then this option acts like running <literal>autoremove</" +#| "literal> command, removing the unused dependency packages. Configuration " +#| "Item: <literal>APT::Get::AutomaticRemove</literal>." +msgid "" +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" +"コマンドが <literal>install</literal> か <literal>remove</literal> である場" +"合、このオプションは使用していないパッケージを削除し、<literal>autoremove</" +"literal> のように動作します。設定項目 - <literal>APT::Get::AutomaticRemove</" +"literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 #, fuzzy #| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::AlwaysStat</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:549 +#: apt-ftparchive.1.xml:557 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -3818,14 +3853,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 #, fuzzy #| msgid "<option>--version</option>" msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "<option>--version</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -3836,21 +3871,21 @@ msgstr "" # type: Content of: <refentry><refsect1><title> #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 msgid "Examples" msgstr "サンプル" # type: Content of: <refentry><refsect1><para><programlisting> #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" @@ -3860,7 +3895,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -4768,12 +4803,38 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 +#, fuzzy +#| msgid "<option>--no-upgrade</option>" +msgid "<option>--only-upgrade</option>" +msgstr "<option>--no-upgrade</option>" + +# type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:448 +#, fuzzy +#| msgid "" +#| "Do not upgrade packages; When used in conjunction with <literal>install</" +#| "literal>, <literal>no-upgrade</literal> will prevent packages on the " +#| "command line from being upgraded if they are already installed. " +#| "Configuration Item: <literal>APT::Get::Upgrade</literal>." +msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" +"パッケージ更新なし - <literal>install</literal> と同時に使用すると、" +"<literal>no-upgrade</literal> は、指定したパッケージがすでにインストールして" +"ある場合に更新を行いません。設定項目 - <literal>APT::Get::Upgrade</literal>" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 msgid "<option>--force-yes</option>" msgstr "<option>--force-yes</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:448 +#: apt-get.8.xml:455 msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " @@ -4787,13 +4848,13 @@ msgstr "" "ねません! 設定項目 - <literal>APT::Get::force-yes</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "<option>--print-uris</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -4814,13 +4875,13 @@ msgstr "" "Print-URIs</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "<option>--purge</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 #, fuzzy #| msgid "" #| "Use purge instead of remove for anything that would be removed. An " @@ -4840,13 +4901,13 @@ msgstr "" "<literal>APT::Get::Purge</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "<option>--reinstall</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." @@ -4855,13 +4916,13 @@ msgstr "" "定項目 - <literal>APT::Get::ReInstall</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "<option>--list-cleanup</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -4877,18 +4938,18 @@ msgstr "" "する時ぐらいでしょう。設定項目 - <literal>APT::Get::List-Cleanup</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "<option>--target-release</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "<option>--default-release</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -4910,13 +4971,13 @@ msgstr "" "Release</literal>。&apt-preferences; のマニュアルページもご覧ください。" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "<option>--trivial-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -4929,13 +4990,13 @@ msgstr "" "目 - <literal>APT::Get::Trivial-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "<option>--no-remove</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." @@ -4944,13 +5005,13 @@ msgstr "" "項目 - <literal>APT::Get::Remove</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "<option>--auto-remove</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -4963,13 +5024,13 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "<option>--only-source</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -4987,23 +5048,23 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "<option>--diff-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "<option>--dsc-only</option>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "<option>--tar-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -5014,13 +5075,13 @@ msgstr "" "Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "<option>--arch-only</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." @@ -5029,13 +5090,13 @@ msgstr "" "<literal>APT::Get::Arch-Only</literal>" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "<option>--allow-unauthenticated</option>" # type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 #, fuzzy msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " @@ -5047,7 +5108,7 @@ msgstr "" "literal>" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" @@ -5055,7 +5116,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -5066,7 +5127,7 @@ msgstr "" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." @@ -5075,22 +5136,22 @@ msgstr "" "100 を返します。" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "原著者" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "&apt-author.jgunthorpe;" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "現著者" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "&apt-author.team;" @@ -7952,7 +8013,10 @@ msgstr "&apt-cache;, &apt-config;, &apt-preferences;." #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +#, fuzzy +#| msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" # type: Content of: <refentry><refnamediv><refname> @@ -8025,6 +8089,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -8035,27 +8113,27 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "APT のデフォルト優先度の割り当て" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "APT::Default-Release \"stable\";\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -8080,25 +8158,25 @@ msgstr "" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "priority 100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "(あるならば) 既にインストールされているバージョン。" # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "priority 500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." @@ -8106,20 +8184,20 @@ msgstr "インストールされておらず、ターゲットリリースに含 # type: <tag></tag> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "priority 990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:112 msgid "" "to the versions that are not installed and belong to the target release." msgstr "インストールされておらず、ターゲットリリースに含まれるバージョン。" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -8131,7 +8209,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -8143,7 +8221,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." @@ -8153,7 +8231,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -8169,13 +8247,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "最も高い優先度のバージョンをインストールします。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." @@ -8185,7 +8263,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -8197,7 +8275,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -8213,7 +8291,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -8227,7 +8305,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -8247,13 +8325,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "APT 設定の効果" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -8266,7 +8344,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -8281,7 +8359,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@ -8294,7 +8372,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -8309,7 +8387,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -8321,7 +8399,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@ -8334,7 +8412,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -8350,7 +8428,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -8361,7 +8439,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@ -8374,7 +8452,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -8385,7 +8463,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@ -8398,7 +8476,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -8410,7 +8488,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@ -8423,18 +8501,18 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "APT が優先度に割り込む方法" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "P > 1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" @@ -8442,13 +8520,13 @@ msgstr "" "パッケージがダウングレードしても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "990 < P <=1000" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" @@ -8457,13 +8535,13 @@ msgstr "" "含まれなくても、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "500 < P <=990" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" @@ -8472,13 +8550,13 @@ msgstr "" "ジョンの方が新しいのでなければ、このバージョンのパッケージをインストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "100 < P <=500" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" @@ -8488,13 +8566,13 @@ msgstr "" "ル" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "0 < P <=100" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" @@ -8503,19 +8581,19 @@ msgstr "" "ンストール" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "P < 0" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "このバージョンのインストール禁止" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -8527,7 +8605,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -8541,7 +8619,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" @@ -8551,7 +8629,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><programlisting> #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@ -8580,13 +8658,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "すると、以下のように動作します。" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -8601,7 +8679,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -8613,7 +8691,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -8627,13 +8705,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" msgstr "パッケージのバージョンとディストリビューションプロパティの決定" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -8644,30 +8722,30 @@ msgstr "" "filename> ファイルを提供します。" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "<literal>Package:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "パッケージ名" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "<literal>Version:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "その名前のパッケージのバージョン番号" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -8687,13 +8765,13 @@ msgstr "" "type=\"variablelist\" id=\"0\"/>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "<literal>Archive:</literal> 行や <literal>Suite:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -8711,19 +8789,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "<literal>Codename:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -8740,14 +8818,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "Pin: release n=squeeze\n" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -8763,7 +8841,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -8775,13 +8853,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "<literal>Component:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -8799,19 +8877,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "<literal>Origin:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8824,19 +8902,19 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "<literal>Label:</literal> 行" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -8849,14 +8927,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "Pin: release l=Debian\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -8878,7 +8956,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -8904,13 +8982,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "APT 設定レコードのオプション行" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -8921,7 +8999,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -8935,13 +9013,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -8966,7 +9044,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -8982,8 +9060,8 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -8996,7 +9074,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9009,14 +9087,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "apt-get install <replaceable>package</replaceable>/testing\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9030,13 +9108,13 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><title> #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "テスト版や不安定版の追跡" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@ -9065,7 +9143,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -9083,7 +9161,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9096,14 +9174,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "apt-get install <replaceable>package</replaceable>/unstable\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9122,13 +9200,13 @@ msgstr "" "の最新版にアップグレードします。" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -9162,7 +9240,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -9178,7 +9256,7 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -9191,14 +9269,14 @@ msgstr "" # type: Content of: <refentry><refsect1><refsect2><para><programlisting> #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "apt-get install <replaceable>package</replaceable>/sid\n" # type: Content of: <refentry><refsect1><refsect2><para> #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -9218,7 +9296,7 @@ msgstr "" # type: Content of: <refentry><refnamediv><refname> #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 #, fuzzy #| msgid "apt_preferences" msgid "&file-preferences;" @@ -9226,7 +9304,7 @@ msgstr "apt_preferences" # type: Content of: <refentry><refsect1><para> #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/po/pl.po b/doc/po/pl.po index a3936cff2..54b4a507d 100644 --- a/doc/po/pl.po +++ b/doc/po/pl.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2004-02-12 15:06+0100\n" "Last-Translator: Krzysztof Fiertek <akfedux@megapolis.pl>\n" "Language-Team: <debian-l10n-polish@lists.debian.org>\n" @@ -865,7 +865,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1257,7 +1257,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 #, fuzzy msgid "options" @@ -1282,7 +1282,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1303,12 +1303,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1357,7 +1357,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1453,14 +1453,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "" @@ -1471,9 +1471,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 msgid "See Also" msgstr "" @@ -1485,7 +1485,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1550,7 +1550,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1591,7 +1591,7 @@ msgid "Options" msgstr "Kolejne kroki" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1736,7 +1736,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1787,7 +1787,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 msgid "&apt-conf;" msgstr "" @@ -1848,7 +1848,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "" @@ -1896,6 +1896,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -1913,7 +1914,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1922,7 +1923,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -1932,7 +1933,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1942,12 +1943,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -1956,18 +1957,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -1976,7 +1977,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -1984,12 +1985,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2000,12 +2001,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2015,7 +2016,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2027,12 +2028,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2042,25 +2043,25 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 #, fuzzy msgid "The Generate Configuration" msgstr "Plik konfiguracyjny" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2071,18 +2072,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 msgid "Dir Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2091,12 +2092,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2104,45 +2105,45 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 #, fuzzy msgid "OverrideDir" msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2150,12 +2151,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2164,60 +2165,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2225,24 +2226,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2250,12 +2251,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2263,12 +2264,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2279,60 +2280,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2340,12 +2341,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2354,34 +2355,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2389,12 +2390,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2403,12 +2404,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2418,7 +2419,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2427,7 +2428,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2435,7 +2436,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2445,7 +2446,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -2453,12 +2454,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 msgid "Sections" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -2466,12 +2467,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2479,58 +2480,58 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 #, fuzzy msgid "BinOverride" msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 #, fuzzy msgid "SrcOverride" msgstr "Wprowadzenie" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2540,64 +2541,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2607,19 +2608,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -2630,12 +2631,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2643,12 +2644,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2656,12 +2657,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2669,19 +2670,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2690,12 +2691,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2704,12 +2705,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2719,12 +2720,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2732,26 +2733,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2763,12 +2778,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2778,26 +2793,26 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 msgid "Examples" msgstr "" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3414,12 +3429,26 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 -msgid "<option>--force-yes</option>" +msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " "not be used except in very special situations. Using <literal>force-yes</" @@ -3428,12 +3457,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3446,12 +3475,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3460,24 +3489,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3488,17 +3517,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3512,12 +3541,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3526,24 +3555,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3552,12 +3581,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3569,22 +3598,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3592,24 +3621,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3617,14 +3646,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3632,29 +3661,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "" @@ -5845,7 +5874,8 @@ msgstr "" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5893,6 +5923,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -5902,24 +5946,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 msgid "APT's Default Priority Assignments" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 msgid "" "If there is no preferences file or if there is no entry in the file that " "applies to a particular version then the priority assigned to that version " @@ -5935,40 +5979,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 msgid "priority 100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 msgid "to the version that is already installed (if any)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 msgid "priority 500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 msgid "" "to the versions that are not installed and do not belong to the target " "release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 msgid "priority 990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:112 msgid "" "to the versions that are not installed and belong to the target release." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 msgid "" "If the target release has been specified then APT uses the following " "algorithm to set the priorities of the versions of a package. Assign: " @@ -5976,7 +6020,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 msgid "" "If the target release has not been specified then APT simply assigns " "priority 100 to all installed package versions and priority 500 to all " @@ -5984,14 +6028,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 msgid "" "APT then applies the following rules, listed in order of precedence, to " "determine which version of a package to install." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " "(\"Downgrading\" is installing a less recent version of a package in place " @@ -6001,19 +6045,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 msgid "Install the highest priority version." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 msgid "" "If two or more versions have the same priority, install the most recent one " "(that is, the one with the higher version number)." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 msgid "" "If two or more versions have the same priority and version number but either " "the packages differ in some of their metadata or the <literal>--reinstall</" @@ -6021,7 +6065,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 msgid "" "In a typical situation, the installed version of a package (priority 100) " "is not as recent as one of the versions available from the sources listed in " @@ -6031,7 +6075,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " "recent than any of the other available versions. The package will not be " @@ -6040,7 +6084,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 msgid "" "Sometimes the installed version of a package is more recent than the version " "belonging to the target release, but not as recent as a version belonging to " @@ -6052,12 +6096,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 msgid "The Effect of APT Preferences" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 msgid "" "The APT preferences file allows the system administrator to control the " "assignment of priorities. The file consists of one or more multi-line " @@ -6066,7 +6110,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " "specified packages and specified version or version range. For example, the " @@ -6076,7 +6120,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, no-wrap msgid "" "Package: perl\n" @@ -6085,7 +6129,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 msgid "" "The general form assigns a priority to all of the package versions in a " "given distribution (that is, to all the versions of packages that are listed " @@ -6095,7 +6139,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 msgid "" "This general-form entry in the APT preferences file applies only to groups " "of packages. For example, the following record assigns a high priority to " @@ -6103,7 +6147,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, no-wrap msgid "" "Package: *\n" @@ -6112,7 +6156,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " "This should not be confused with the Origin of a distribution as specified " @@ -6122,7 +6166,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 msgid "" "The following record assigns a low priority to all package versions " "belonging to any distribution whose Archive name is \"<literal>unstable</" @@ -6130,7 +6174,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, no-wrap msgid "" "Package: *\n" @@ -6139,7 +6183,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 msgid "" "The following record assigns a high priority to all package versions " "belonging to any distribution whose Codename is \"<literal>squeeze</literal>" @@ -6147,7 +6191,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, no-wrap msgid "" "Package: *\n" @@ -6156,7 +6200,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 msgid "" "The following record assigns a high priority to all package versions " "belonging to any release whose Archive name is \"<literal>stable</literal>\" " @@ -6164,7 +6208,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, no-wrap msgid "" "Package: *\n" @@ -6173,82 +6217,82 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 msgid "How APT Interprets Priorities" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 msgid "P > 1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 msgid "" "causes a version to be installed even if this constitutes a downgrade of the " "package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 msgid "990 < P <=1000" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 msgid "" "causes a version to be installed even if it does not come from the target " "release, unless the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 msgid "500 < P <=990" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 msgid "" "causes a version to be installed unless there is a version available " "belonging to the target release or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 msgid "100 < P <=500" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 msgid "" "causes a version to be installed unless there is a version available " "belonging to some other distribution or the installed version is more recent" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 msgid "0 < P <=100" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 msgid "" "causes a version to be installed only if there is no installed version of " "the package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 msgid "P < 0" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 msgid "prevents the version from being installed" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " "negative integers. They are interpreted as follows (roughly speaking): " @@ -6256,7 +6300,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 msgid "" "If any specific-form records match an available package version then the " "first such record determines the priority of the package version. Failing " @@ -6265,14 +6309,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 msgid "" "For example, suppose the APT preferences file contains the three records " "presented earlier:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, no-wrap msgid "" "Package: perl\n" @@ -6289,12 +6333,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 msgid "" "The most recent available version of the <literal>perl</literal> package " "will be installed, so long as that version's version number begins with " @@ -6304,7 +6348,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 msgid "" "A version of any package other than <literal>perl</literal> that is " "available from the local system has priority over other versions, even " @@ -6312,7 +6356,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 msgid "" "A version of a package whose origin is not the local system but some other " "site listed in &sources-list; and which belongs to an <literal>unstable</" @@ -6321,12 +6365,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 msgid "Determination of Package Version and Distribution Properties" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 msgid "" "The locations listed in the &sources-list; file should provide " "<filename>Packages</filename> and <filename>Release</filename> files to " @@ -6334,27 +6378,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 msgid "the <literal>Package:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 msgid "gives the package name" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 msgid "the <literal>Version:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 msgid "gives the version number for the named package" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 msgid "" "The <filename>Packages</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable>/" @@ -6367,12 +6411,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 msgid "" "names the archive to which all the packages in the directory tree belong. " "For example, the line \"Archive: stable\" or \"Suite: stable\" specifies " @@ -6383,18 +6427,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, no-wrap msgid "Pin: release a=stable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 msgid "the <literal>Codename:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 msgid "" "names the codename to which all the packages in the directory tree belong. " "For example, the line \"Codename: squeeze\" specifies that all of the " @@ -6404,13 +6448,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 msgid "" "names the release version. For example, the packages in the tree might " "belong to Debian GNU/Linux release version 3.0. Note that there is normally " @@ -6420,7 +6464,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6429,12 +6473,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 msgid "the <literal>Component:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 msgid "" "names the licensing component associated with the packages in the directory " "tree of the <filename>Release</filename> file. For example, the line " @@ -6445,18 +6489,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, no-wrap msgid "Pin: release c=main\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 msgid "the <literal>Origin:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 msgid "" "names the originator of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6465,18 +6509,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, no-wrap msgid "Pin: release o=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 msgid "the <literal>Label:</literal> line" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 msgid "" "names the label of the packages in the directory tree of the " "<filename>Release</filename> file. Most commonly, this is <literal>Debian</" @@ -6485,13 +6529,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, no-wrap msgid "Pin: release l=Debian\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 msgid "" "The <filename>Release</filename> file is normally found in the directory " "<filename>.../dists/<replaceable>dist-name</replaceable></filename>: for " @@ -6504,7 +6548,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " "files retrieved from locations listed in the &sources-list; file are stored " @@ -6519,12 +6563,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 msgid "Optional Lines in an APT Preferences Record" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 msgid "" "Each record in the APT preferences file can optionally begin with one or " "more lines beginning with the word <literal>Explanation:</literal>. This " @@ -6532,7 +6576,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " "optional. If omitted, APT assigns a priority of 1 less than the last value " @@ -6541,12 +6585,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 msgid "Tracking Stable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6561,7 +6605,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6571,8 +6615,8 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 #, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -6581,7 +6625,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6590,13 +6634,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>testing</literal> distribution; the package " @@ -6605,12 +6649,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 msgid "Tracking Testing or Unstable" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, no-wrap msgid "" "Package: *\n" @@ -6627,7 +6671,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 msgid "" "The following APT preferences file will cause APT to assign a high priority " "to package versions from the <literal>testing</literal> distribution, a " @@ -6638,7 +6682,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest " @@ -6647,13 +6691,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>unstable</literal> distribution. " @@ -6665,12 +6709,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -6690,7 +6734,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -6705,7 +6749,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 msgid "" "With a suitable &sources-list; file and the above preferences file, any of " "the following commands will cause APT to upgrade to the latest version(s) in " @@ -6714,13 +6758,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 msgid "" "The following command will cause APT to upgrade the specified package to the " "latest version from the <literal>sid</literal> distribution. Thereafter, " @@ -6732,12 +6776,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 msgid "&file-preferences;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "" diff --git a/doc/po/pt_BR.po b/doc/po/pt_BR.po index e6225eb67..c97eff77b 100644 --- a/doc/po/pt_BR.po +++ b/doc/po/pt_BR.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" -"POT-Creation-Date: 2010-01-20 12:18+0100\n" +"POT-Creation-Date: 2010-03-14 16:41+0100\n" "PO-Revision-Date: 2004-09-20 17:02+0000\n" "Last-Translator: André Luís Lopes <andrelop@debian.org>\n" "Language-Team: <debian-l10n-portuguese@lists.debian.org>\n" @@ -823,7 +823,7 @@ msgstr "<!ENTITY translation-title \"Tradução\">" #. type: Plain text #: apt.ent:380 -#, no-wrap, fuzzy +#, fuzzy, no-wrap msgid "" "<!-- TRANSLATOR: This is a placeholder. You should write here who has constributed\n" " to the translation in the past, who is responsible now and maybe further information\n" @@ -913,7 +913,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:62 apt-cdrom.8.xml:47 apt-config.8.xml:47 -#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:55 apt-get.8.xml:125 +#: apt-extracttemplates.1.xml:43 apt-ftparchive.1.xml:56 apt-get.8.xml:125 #: apt-key.8.xml:35 apt-mark.8.xml:52 apt-secure.8.xml:40 #: apt-sortpkgs.1.xml:44 apt.conf.5.xml:39 apt_preferences.5.xml:33 #: sources.list.5.xml:33 @@ -1308,7 +1308,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-cache.8.xml:281 apt-config.8.xml:93 apt-extracttemplates.1.xml:56 -#: apt-ftparchive.1.xml:492 apt-get.8.xml:319 apt-mark.8.xml:89 +#: apt-ftparchive.1.xml:493 apt-get.8.xml:319 apt-mark.8.xml:89 #: apt-sortpkgs.1.xml:54 apt.conf.5.xml:502 apt.conf.5.xml:524 msgid "options" msgstr "" @@ -1332,7 +1332,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:291 apt-ftparchive.1.xml:535 apt-get.8.xml:376 +#: apt-cache.8.xml:291 apt-ftparchive.1.xml:536 apt-get.8.xml:376 #: apt-sortpkgs.1.xml:58 msgid "<option>-s</option>" msgstr "" @@ -1353,12 +1353,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>-q</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:299 apt-ftparchive.1.xml:509 apt-get.8.xml:366 +#: apt-cache.8.xml:299 apt-ftparchive.1.xml:510 apt-get.8.xml:366 msgid "<option>--quiet</option>" msgstr "" @@ -1407,7 +1407,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 +#: apt-cache.8.xml:317 apt-cdrom.8.xml:131 apt-ftparchive.1.xml:548 msgid "<option>-a</option>" msgstr "" @@ -1503,14 +1503,14 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist> #: apt-cache.8.xml:356 apt-cdrom.8.xml:150 apt-config.8.xml:98 -#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:568 apt-get.8.xml:554 +#: apt-extracttemplates.1.xml:67 apt-ftparchive.1.xml:576 apt-get.8.xml:561 #: apt-sortpkgs.1.xml:64 msgid "&apt-commonoptions;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-cache.8.xml:361 apt-get.8.xml:559 apt-key.8.xml:153 apt-mark.8.xml:122 -#: apt.conf.5.xml:1035 apt_preferences.5.xml:622 +#: apt-cache.8.xml:361 apt-get.8.xml:566 apt-key.8.xml:153 apt-mark.8.xml:122 +#: apt.conf.5.xml:1035 apt_preferences.5.xml:633 msgid "Files" msgstr "" @@ -1521,9 +1521,9 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:368 apt-cdrom.8.xml:155 apt-config.8.xml:103 -#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:584 apt-get.8.xml:569 +#: apt-extracttemplates.1.xml:74 apt-ftparchive.1.xml:592 apt-get.8.xml:576 #: apt-key.8.xml:174 apt-mark.8.xml:133 apt-secure.8.xml:181 -#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:629 +#: apt-sortpkgs.1.xml:69 apt.conf.5.xml:1041 apt_preferences.5.xml:640 #: sources.list.5.xml:233 #, fuzzy msgid "See Also" @@ -1536,7 +1536,7 @@ msgstr "" #. type: Content of: <refentry><refsect1><title> #: apt-cache.8.xml:373 apt-cdrom.8.xml:160 apt-config.8.xml:108 -#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:588 apt-get.8.xml:575 +#: apt-extracttemplates.1.xml:78 apt-ftparchive.1.xml:596 apt-get.8.xml:582 #: apt-mark.8.xml:137 apt-sortpkgs.1.xml:73 msgid "Diagnostics" msgstr "" @@ -1601,7 +1601,7 @@ msgstr "" #: apt-cdrom.8.xml:66 msgid "" "<literal>add</literal> is used to add a new disc to the source list. It will " -"unmount the CDROM device, prompt for a disk to be inserted and then procceed " +"unmount the CDROM device, prompt for a disk to be inserted and then proceed " "to scan it and copy the index files. If the disc does not have a proper " "<filename>disk</filename> directory you will be prompted for a descriptive " "title." @@ -1641,7 +1641,7 @@ msgid "Options" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:503 apt-get.8.xml:328 +#: apt-cdrom.8.xml:95 apt-ftparchive.1.xml:504 apt-get.8.xml:328 msgid "<option>-d</option>" msgstr "" @@ -1786,7 +1786,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:53 apt-ftparchive.1.xml:71 +#: apt-config.8.xml:53 apt-ftparchive.1.xml:72 msgid "" "Unless the <option>-h</option>, or <option>--help</option> option is given " "one of the commands below must be present." @@ -1837,7 +1837,7 @@ msgid "Just show the contents of the configuration space." msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:585 +#: apt-config.8.xml:104 apt-extracttemplates.1.xml:75 apt-ftparchive.1.xml:593 #: apt-sortpkgs.1.xml:70 #, fuzzy msgid "&apt-conf;" @@ -1902,7 +1902,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-extracttemplates.1.xml:60 apt-get.8.xml:488 +#: apt-extracttemplates.1.xml:60 apt-get.8.xml:495 msgid "<option>-t</option>" msgstr "" @@ -1950,6 +1950,7 @@ msgid "" "<command>apt-ftparchive</command> <arg><option>-hvdsq</option></arg> " "<arg><option>--md5</option></arg> <arg><option>--delink</option></arg> " "<arg><option>--readonly</option></arg> <arg><option>--contents</option></" +"arg> <arg><option>--arch <replaceable>architecture</replaceable></option></" "arg> <arg><option>-o <replaceable>config</replaceable>=<replaceable>string</" "replaceable></option></arg> <arg><option>-c=<replaceable>file</replaceable></" "option></arg> <group choice=\"req\"> <arg>packages<arg choice=\"plain\" rep=" @@ -1967,7 +1968,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:56 +#: apt-ftparchive.1.xml:57 msgid "" "<command>apt-ftparchive</command> is the command line tool that generates " "the index files that APT uses to access a distribution source. The index " @@ -1976,7 +1977,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:60 +#: apt-ftparchive.1.xml:61 msgid "" "<command>apt-ftparchive</command> is a superset of the &dpkg-scanpackages; " "program, incorporating its entire functionality via the <literal>packages</" @@ -1986,7 +1987,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:66 +#: apt-ftparchive.1.xml:67 msgid "" "Internally <command>apt-ftparchive</command> can make use of binary " "databases to cache the contents of a .deb file and it does not rely on any " @@ -1996,12 +1997,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:75 +#: apt-ftparchive.1.xml:76 msgid "packages" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:77 +#: apt-ftparchive.1.xml:78 msgid "" "The packages command generates a package file from a directory tree. It " "takes the given directory and recursively searches it for .deb files, " @@ -2010,18 +2011,18 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:82 apt-ftparchive.1.xml:106 +#: apt-ftparchive.1.xml:83 apt-ftparchive.1.xml:107 msgid "" "The option <option>--db</option> can be used to specify a binary caching DB." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:85 +#: apt-ftparchive.1.xml:86 msgid "sources" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:87 +#: apt-ftparchive.1.xml:88 msgid "" "The <literal>sources</literal> command generates a source index file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2030,7 +2031,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:92 +#: apt-ftparchive.1.xml:93 msgid "" "If an override file is specified then a source override file will be looked " "for with an extension of .src. The --source-override option can be used to " @@ -2038,12 +2039,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:97 +#: apt-ftparchive.1.xml:98 msgid "contents" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:99 +#: apt-ftparchive.1.xml:100 msgid "" "The <literal>contents</literal> command generates a contents file from a " "directory tree. It takes the given directory and recursively searches it " @@ -2054,12 +2055,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:109 +#: apt-ftparchive.1.xml:110 msgid "release" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:111 +#: apt-ftparchive.1.xml:112 msgid "" "The <literal>release</literal> command generates a Release file from a " "directory tree. It recursively searches the given directory for Packages, " @@ -2069,7 +2070,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:118 +#: apt-ftparchive.1.xml:119 msgid "" "Values for the additional metadata fields in the Release file are taken from " "the corresponding variables under <literal>APT::FTPArchive::Release</" @@ -2081,12 +2082,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:128 +#: apt-ftparchive.1.xml:129 msgid "generate" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:130 +#: apt-ftparchive.1.xml:131 msgid "" "The <literal>generate</literal> command is designed to be runnable from a " "cron script and builds indexes according to the given config file. The " @@ -2096,24 +2097,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:137 apt-get.8.xml:292 +#: apt-ftparchive.1.xml:138 apt-get.8.xml:292 msgid "clean" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:139 +#: apt-ftparchive.1.xml:140 msgid "" "The <literal>clean</literal> command tidies the databases used by the given " "configuration file by removing any records that are no longer necessary." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:145 +#: apt-ftparchive.1.xml:146 msgid "The Generate Configuration" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:147 +#: apt-ftparchive.1.xml:148 msgid "" "The <literal>generate</literal> command uses a configuration file to " "describe the archives that are going to be generated. It follows the typical " @@ -2124,19 +2125,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:155 +#: apt-ftparchive.1.xml:156 msgid "" "The generate configuration has 4 separate sections, each described below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:157 +#: apt-ftparchive.1.xml:158 #, fuzzy msgid "Dir Section" msgstr "Descrição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:159 +#: apt-ftparchive.1.xml:160 msgid "" "The <literal>Dir</literal> section defines the standard directories needed " "to locate the files required during the generation process. These " @@ -2145,12 +2146,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:164 +#: apt-ftparchive.1.xml:165 msgid "ArchiveDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:166 +#: apt-ftparchive.1.xml:167 msgid "" "Specifies the root of the FTP archive, in a standard Debian configuration " "this is the directory that contains the <filename>ls-LR</filename> and dist " @@ -2158,44 +2159,44 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:171 +#: apt-ftparchive.1.xml:172 msgid "OverrideDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:173 +#: apt-ftparchive.1.xml:174 msgid "Specifies the location of the override files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:176 +#: apt-ftparchive.1.xml:177 msgid "CacheDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:178 +#: apt-ftparchive.1.xml:179 msgid "Specifies the location of the cache files" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:181 +#: apt-ftparchive.1.xml:182 msgid "FileListDir" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:183 +#: apt-ftparchive.1.xml:184 msgid "" "Specifies the location of the file list files, if the <literal>FileList</" "literal> setting is used below." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:189 +#: apt-ftparchive.1.xml:190 msgid "Default Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:191 +#: apt-ftparchive.1.xml:192 msgid "" "The <literal>Default</literal> section specifies default values, and " "settings that control the operation of the generator. Other sections may " @@ -2203,12 +2204,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:195 +#: apt-ftparchive.1.xml:196 msgid "Packages::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:197 +#: apt-ftparchive.1.xml:198 msgid "" "Sets the default compression schemes to use for the Package index files. It " "is a string that contains a space separated list of at least one of: '.' (no " @@ -2217,60 +2218,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:203 +#: apt-ftparchive.1.xml:204 msgid "Packages::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:205 +#: apt-ftparchive.1.xml:206 msgid "" "Sets the default list of file extensions that are package files. This " "defaults to '.deb'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:209 +#: apt-ftparchive.1.xml:210 msgid "Sources::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:211 +#: apt-ftparchive.1.xml:212 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Sources files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:215 +#: apt-ftparchive.1.xml:216 msgid "Sources::Extensions" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:217 +#: apt-ftparchive.1.xml:218 msgid "" "Sets the default list of file extensions that are source files. This " "defaults to '.dsc'." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:221 +#: apt-ftparchive.1.xml:222 msgid "Contents::Compress" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:223 +#: apt-ftparchive.1.xml:224 msgid "" "This is similar to <literal>Packages::Compress</literal> except that it " "controls the compression for the Contents files." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:227 +#: apt-ftparchive.1.xml:228 msgid "DeLinkLimit" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:229 +#: apt-ftparchive.1.xml:230 msgid "" "Specifies the number of kilobytes to delink (and replace with hard links) " "per run. This is used in conjunction with the per-section <literal>External-" @@ -2278,24 +2279,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:234 +#: apt-ftparchive.1.xml:235 msgid "FileMode" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:236 +#: apt-ftparchive.1.xml:237 msgid "" "Specifies the mode of all created index files. It defaults to 0644. All " "index files are set to this mode with no regard to the umask." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:243 +#: apt-ftparchive.1.xml:244 msgid "TreeDefault Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:245 +#: apt-ftparchive.1.xml:246 msgid "" "Sets defaults specific to <literal>Tree</literal> sections. All of these " "variables are substitution variables and have the strings $(DIST), " @@ -2303,12 +2304,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:250 +#: apt-ftparchive.1.xml:251 msgid "MaxContentsChange" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:252 +#: apt-ftparchive.1.xml:253 msgid "" "Sets the number of kilobytes of contents files that are generated each day. " "The contents files are round-robined so that over several days they will all " @@ -2316,12 +2317,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:257 +#: apt-ftparchive.1.xml:258 msgid "ContentsAge" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:259 +#: apt-ftparchive.1.xml:260 msgid "" "Controls the number of days a contents file is allowed to be checked without " "changing. If this limit is passed the mtime of the contents file is updated. " @@ -2332,60 +2333,60 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:268 +#: apt-ftparchive.1.xml:269 msgid "Directory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:270 +#: apt-ftparchive.1.xml:271 msgid "" "Sets the top of the .deb directory tree. Defaults to <filename>$(DIST)/" "$(SECTION)/binary-$(ARCH)/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:274 +#: apt-ftparchive.1.xml:275 msgid "SrcDirectory" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:276 +#: apt-ftparchive.1.xml:277 msgid "" "Sets the top of the source package directory tree. Defaults to <filename>" "$(DIST)/$(SECTION)/source/</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:280 apt-ftparchive.1.xml:406 +#: apt-ftparchive.1.xml:281 apt-ftparchive.1.xml:407 msgid "Packages" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:282 +#: apt-ftparchive.1.xml:283 msgid "" "Sets the output Packages file. Defaults to <filename>$(DIST)/$(SECTION)/" "binary-$(ARCH)/Packages</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:286 apt-ftparchive.1.xml:411 +#: apt-ftparchive.1.xml:287 apt-ftparchive.1.xml:412 msgid "Sources" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:288 +#: apt-ftparchive.1.xml:289 msgid "" "Sets the output Sources file. Defaults to <filename>$(DIST)/$(SECTION)/" "source/Sources</filename>" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:292 +#: apt-ftparchive.1.xml:293 msgid "InternalPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:294 +#: apt-ftparchive.1.xml:295 msgid "" "Sets the path prefix that causes a symlink to be considered an internal link " "instead of an external link. Defaults to <filename>$(DIST)/$(SECTION)/</" @@ -2393,12 +2394,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:299 apt-ftparchive.1.xml:417 +#: apt-ftparchive.1.xml:300 apt-ftparchive.1.xml:418 msgid "Contents" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:301 +#: apt-ftparchive.1.xml:302 msgid "" "Sets the output Contents file. Defaults to <filename>$(DIST)/Contents-$(ARCH)" "</filename>. If this setting causes multiple Packages files to map onto a " @@ -2407,34 +2408,34 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:308 +#: apt-ftparchive.1.xml:309 msgid "Contents::Header" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:310 +#: apt-ftparchive.1.xml:311 msgid "Sets header file to prepend to the contents output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:313 apt-ftparchive.1.xml:442 +#: apt-ftparchive.1.xml:314 apt-ftparchive.1.xml:443 msgid "BinCacheDB" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:315 +#: apt-ftparchive.1.xml:316 msgid "" "Sets the binary cache database to use for this section. Multiple sections " "can share the same database." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:319 +#: apt-ftparchive.1.xml:320 msgid "FileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:321 +#: apt-ftparchive.1.xml:322 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2442,12 +2443,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:326 +#: apt-ftparchive.1.xml:327 msgid "SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:328 +#: apt-ftparchive.1.xml:329 msgid "" "Specifies that instead of walking the directory tree, <command>apt-" "ftparchive</command> should read the list of files from the given file. " @@ -2456,12 +2457,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:336 +#: apt-ftparchive.1.xml:337 msgid "Tree Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:338 +#: apt-ftparchive.1.xml:339 msgid "" "The <literal>Tree</literal> section defines a standard Debian file tree " "which consists of a base directory, then multiple sections in that base " @@ -2471,7 +2472,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:343 +#: apt-ftparchive.1.xml:344 msgid "" "The <literal>Tree</literal> section takes a scope tag which sets the " "<literal>$(DIST)</literal> variable and defines the root of the tree (the " @@ -2480,7 +2481,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:348 +#: apt-ftparchive.1.xml:349 msgid "" "All of the settings defined in the <literal>TreeDefault</literal> section " "can be use in a <literal>Tree</literal> section as well as three new " @@ -2488,7 +2489,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt-ftparchive.1.xml:354 +#: apt-ftparchive.1.xml:355 #, no-wrap msgid "" "for i in Sections do \n" @@ -2498,7 +2499,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:351 +#: apt-ftparchive.1.xml:352 msgid "" "When processing a <literal>Tree</literal> section <command>apt-ftparchive</" "command> performs an operation similar to: <placeholder type=\"programlisting" @@ -2506,13 +2507,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:360 +#: apt-ftparchive.1.xml:361 #, fuzzy msgid "Sections" msgstr "Descrição" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:362 +#: apt-ftparchive.1.xml:363 msgid "" "This is a space separated list of sections which appear under the " "distribution, typically this is something like <literal>main contrib non-" @@ -2520,12 +2521,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:367 +#: apt-ftparchive.1.xml:368 msgid "Architectures" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:369 +#: apt-ftparchive.1.xml:370 msgid "" "This is a space separated list of all the architectures that appear under " "search section. The special architecture 'source' is used to indicate that " @@ -2533,56 +2534,56 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:374 apt-ftparchive.1.xml:422 +#: apt-ftparchive.1.xml:375 apt-ftparchive.1.xml:423 msgid "BinOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:376 +#: apt-ftparchive.1.xml:377 msgid "" "Sets the binary override file. The override file contains section, priority " "and maintainer address information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:380 apt-ftparchive.1.xml:427 +#: apt-ftparchive.1.xml:381 apt-ftparchive.1.xml:428 msgid "SrcOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:382 +#: apt-ftparchive.1.xml:383 msgid "" "Sets the source override file. The override file contains section " "information." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:386 apt-ftparchive.1.xml:432 +#: apt-ftparchive.1.xml:387 apt-ftparchive.1.xml:433 msgid "ExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:388 apt-ftparchive.1.xml:434 +#: apt-ftparchive.1.xml:389 apt-ftparchive.1.xml:435 msgid "Sets the binary extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:391 apt-ftparchive.1.xml:437 +#: apt-ftparchive.1.xml:392 apt-ftparchive.1.xml:438 msgid "SrcExtraOverride" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:393 apt-ftparchive.1.xml:439 +#: apt-ftparchive.1.xml:394 apt-ftparchive.1.xml:440 msgid "Sets the source extra override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt-ftparchive.1.xml:398 +#: apt-ftparchive.1.xml:399 msgid "BinDirectory Section" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt-ftparchive.1.xml:400 +#: apt-ftparchive.1.xml:401 msgid "" "The <literal>bindirectory</literal> section defines a binary directory tree " "with no special structure. The scope tag specifies the location of the " @@ -2592,64 +2593,64 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:408 +#: apt-ftparchive.1.xml:409 msgid "Sets the Packages file output." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:413 +#: apt-ftparchive.1.xml:414 msgid "" "Sets the Sources file output. At least one of <literal>Packages</literal> or " "<literal>Sources</literal> is required." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:419 +#: apt-ftparchive.1.xml:420 msgid "Sets the Contents file output. (optional)" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:424 +#: apt-ftparchive.1.xml:425 msgid "Sets the binary override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:429 +#: apt-ftparchive.1.xml:430 msgid "Sets the source override file." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:444 +#: apt-ftparchive.1.xml:445 msgid "Sets the cache DB." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:447 +#: apt-ftparchive.1.xml:448 msgid "PathPrefix" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:449 +#: apt-ftparchive.1.xml:450 msgid "Appends a path to all the output paths." msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:452 +#: apt-ftparchive.1.xml:453 msgid "FileList, SourceFileList" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:454 +#: apt-ftparchive.1.xml:455 msgid "Specifies the file list file." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:461 +#: apt-ftparchive.1.xml:462 msgid "The Binary Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:462 +#: apt-ftparchive.1.xml:463 msgid "" "The binary override file is fully compatible with &dpkg-scanpackages;. It " "contains 4 fields separated by spaces. The first field is the package name, " @@ -2659,19 +2660,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:468 +#: apt-ftparchive.1.xml:469 #, no-wrap msgid "old [// oldn]* => new" msgstr "" #. type: Content of: <refentry><refsect1><para><literallayout> -#: apt-ftparchive.1.xml:470 +#: apt-ftparchive.1.xml:471 #, no-wrap msgid "new" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:467 +#: apt-ftparchive.1.xml:468 msgid "" "The general form of the maintainer field is: <placeholder type=" "\"literallayout\" id=\"0\"/> or simply, <placeholder type=\"literallayout\" " @@ -2682,12 +2683,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:478 +#: apt-ftparchive.1.xml:479 msgid "The Source Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:480 +#: apt-ftparchive.1.xml:481 msgid "" "The source override file is fully compatible with &dpkg-scansources;. It " "contains 2 fields separated by spaces. The first fields is the source " @@ -2695,12 +2696,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:485 +#: apt-ftparchive.1.xml:486 msgid "The Extra Override File" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:487 +#: apt-ftparchive.1.xml:488 msgid "" "The extra override file allows any arbitrary tag to be added or replaced in " "the output. It has 3 columns, the first is the package, the second is the " @@ -2708,12 +2709,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:496 +#: apt-ftparchive.1.xml:497 msgid "<option>--md5</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:498 +#: apt-ftparchive.1.xml:499 msgid "" "Generate MD5 sums. This defaults to on, when turned off the generated index " "files will not have MD5Sum fields where possible. Configuration Item: " @@ -2721,19 +2722,19 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:503 +#: apt-ftparchive.1.xml:504 msgid "<option>--db</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:505 +#: apt-ftparchive.1.xml:506 msgid "" "Use a binary caching DB. This has no effect on the generate command. " "Configuration Item: <literal>APT::FTPArchive::DB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:511 +#: apt-ftparchive.1.xml:512 msgid "" "Quiet; produces output suitable for logging, omitting progress indicators. " "More q's will produce more quiet up to a maximum of 2. You can also use " @@ -2742,12 +2743,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:517 +#: apt-ftparchive.1.xml:518 msgid "<option>--delink</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:519 +#: apt-ftparchive.1.xml:520 msgid "" "Perform Delinking. If the <literal>External-Links</literal> setting is used " "then this option actually enables delinking of the files. It defaults to on " @@ -2756,12 +2757,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:525 +#: apt-ftparchive.1.xml:526 msgid "<option>--contents</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:527 +#: apt-ftparchive.1.xml:528 msgid "" "Perform contents generation. When this option is set and package indexes are " "being generated with a cache DB then the file listing will also be extracted " @@ -2771,12 +2772,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:535 +#: apt-ftparchive.1.xml:536 msgid "<option>--source-override</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:537 +#: apt-ftparchive.1.xml:538 msgid "" "Select the source override file to use with the <literal>sources</literal> " "command. Configuration Item: <literal>APT::FTPArchive::SourceOverride</" @@ -2784,26 +2785,40 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:541 +#: apt-ftparchive.1.xml:542 msgid "<option>--readonly</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:543 +#: apt-ftparchive.1.xml:544 msgid "" "Make the caching databases read only. Configuration Item: <literal>APT::" "FTPArchive::ReadOnlyDB</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:547 -msgid "<option>APT::FTPArchive::AlwaysStat</option>" +#: apt-ftparchive.1.xml:548 +msgid "<option>--arch</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-ftparchive.1.xml:549 msgid "" -"&apt-ftparchive; caches as much as possible of metadata in it is cachedb. If " +"Accept in the <literal>packages</literal> and <literal>contents</literal> " +"commands only package files matching <literal>*_arch.deb</literal> or " +"<literal>*_all.deb</literal> instead of all package files in the given " +"path. Configuration Item: <literal>APT::FTPArchive::Architecture</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-ftparchive.1.xml:555 +msgid "<option>APT::FTPArchive::AlwaysStat</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-ftparchive.1.xml:557 +msgid "" +"&apt-ftparchive; caches as much as possible of metadata in a cachedb. If " "packages are recompiled and/or republished with the same version again, this " "will lead to problems as the now outdated cached metadata like size and " "checksums will be used. With this option enabled this will no longer happen " @@ -2815,12 +2830,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-ftparchive.1.xml:559 +#: apt-ftparchive.1.xml:567 msgid "<option>APT::FTPArchive::LongDescription</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-ftparchive.1.xml:561 +#: apt-ftparchive.1.xml:569 msgid "" "This configuration option defaults to \"<literal>true</literal>\" and should " "only be set to <literal>\"false\"</literal> if the Archive generated with " @@ -2830,27 +2845,27 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-ftparchive.1.xml:573 apt.conf.5.xml:1029 apt_preferences.5.xml:469 +#: apt-ftparchive.1.xml:581 apt.conf.5.xml:1029 apt_preferences.5.xml:480 #: sources.list.5.xml:193 #, fuzzy msgid "Examples" msgstr "Exemplos" #. type: Content of: <refentry><refsect1><para><programlisting> -#: apt-ftparchive.1.xml:579 +#: apt-ftparchive.1.xml:587 #, no-wrap msgid "<command>apt-ftparchive</command> packages <replaceable>directory</replaceable> | <command>gzip</command> > <filename>Packages.gz</filename>\n" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:575 +#: apt-ftparchive.1.xml:583 msgid "" "To create a compressed Packages file for a directory containing binary " "packages (.deb): <placeholder type=\"programlisting\" id=\"0\"/>" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-ftparchive.1.xml:589 +#: apt-ftparchive.1.xml:597 msgid "" "<command>apt-ftparchive</command> returns zero on normal operation, decimal " "100 on error." @@ -3467,12 +3482,26 @@ msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> #: apt-get.8.xml:447 -msgid "<option>--force-yes</option>" +msgid "<option>--only-upgrade</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> #: apt-get.8.xml:448 msgid "" +"Do not install new packages; When used in conjunction with <literal>install</" +"literal>, <literal>only-upgrade</literal> will prevent packages on the " +"command line from being upgraded if they are not already installed. " +"Configuration Item: <literal>APT::Get::Only-Upgrade</literal>." +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> +#: apt-get.8.xml:454 +msgid "<option>--force-yes</option>" +msgstr "" + +#. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> +#: apt-get.8.xml:455 +msgid "" "Force yes; This is a dangerous option that will cause apt to continue " "without prompting if it is doing something potentially harmful. It should " "not be used except in very special situations. Using <literal>force-yes</" @@ -3481,12 +3510,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:455 +#: apt-get.8.xml:462 msgid "<option>--print-uris</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:456 +#: apt-get.8.xml:463 msgid "" "Instead of fetching the files to install their URIs are printed. Each URI " "will have the path, the destination file name, the size and the expected md5 " @@ -3499,12 +3528,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:466 +#: apt-get.8.xml:473 msgid "<option>--purge</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:467 +#: apt-get.8.xml:474 msgid "" "Use purge instead of remove for anything that would be removed. An asterisk " "(\"*\") will be displayed next to packages which are scheduled to be purged. " @@ -3513,24 +3542,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:474 +#: apt-get.8.xml:481 msgid "<option>--reinstall</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:475 +#: apt-get.8.xml:482 msgid "" "Re-Install packages that are already installed and at the newest version. " "Configuration Item: <literal>APT::Get::ReInstall</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:479 +#: apt-get.8.xml:486 msgid "<option>--list-cleanup</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:480 +#: apt-get.8.xml:487 msgid "" "This option defaults to on, use <literal>--no-list-cleanup</literal> to turn " "it off. When on <command>apt-get</command> will automatically manage the " @@ -3541,17 +3570,17 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:489 +#: apt-get.8.xml:496 msgid "<option>--target-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:490 +#: apt-get.8.xml:497 msgid "<option>--default-release</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:491 +#: apt-get.8.xml:498 msgid "" "This option controls the default input to the policy engine, it creates a " "default pin at priority 990 using the specified release string. This " @@ -3565,12 +3594,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:504 +#: apt-get.8.xml:511 msgid "<option>--trivial-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:506 +#: apt-get.8.xml:513 msgid "" "Only perform operations that are 'trivial'. Logically this can be considered " "related to <option>--assume-yes</option>, where <option>--assume-yes</" @@ -3579,24 +3608,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:512 +#: apt-get.8.xml:519 msgid "<option>--no-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:513 +#: apt-get.8.xml:520 msgid "" "If any packages are to be removed apt-get immediately aborts without " "prompting. Configuration Item: <literal>APT::Get::Remove</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:518 +#: apt-get.8.xml:525 msgid "<option>--auto-remove</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:519 +#: apt-get.8.xml:526 msgid "" "If the command is either <literal>install</literal> or <literal>remove</" "literal>, then this option acts like running <literal>autoremove</literal> " @@ -3605,12 +3634,12 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:525 +#: apt-get.8.xml:532 msgid "<option>--only-source</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:526 +#: apt-get.8.xml:533 msgid "" "Only has meaning for the <literal>source</literal> and <literal>build-dep</" "literal> commands. Indicates that the given source names are not to be " @@ -3622,22 +3651,22 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--diff-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--dsc-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:536 +#: apt-get.8.xml:543 msgid "<option>--tar-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:537 +#: apt-get.8.xml:544 msgid "" "Download only the diff, dsc, or tar file of a source archive. Configuration " "Item: <literal>APT::Get::Diff-Only</literal>, <literal>APT::Get::Dsc-Only</" @@ -3645,24 +3674,24 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:542 +#: apt-get.8.xml:549 msgid "<option>--arch-only</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:543 +#: apt-get.8.xml:550 msgid "" "Only process architecture-dependent build-dependencies. Configuration Item: " "<literal>APT::Get::Arch-Only</literal>." msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><term> -#: apt-get.8.xml:547 +#: apt-get.8.xml:554 msgid "<option>--allow-unauthenticated</option>" msgstr "" #. type: Content of: <refentry><refsect1><variablelist><varlistentry><listitem><para> -#: apt-get.8.xml:548 +#: apt-get.8.xml:555 msgid "" "Ignore if packages can't be authenticated and don't prompt about it. This " "is useful for tools like pbuilder. Configuration Item: <literal>APT::Get::" @@ -3670,14 +3699,14 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><variablelist> -#: apt-get.8.xml:561 +#: apt-get.8.xml:568 msgid "" "&file-sourceslist; &file-aptconf; &file-preferences; &file-cachearchives; " "&file-statelists;" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:570 +#: apt-get.8.xml:577 msgid "" "&apt-cache;, &apt-cdrom;, &dpkg;, &dselect;, &sources-list;, &apt-conf;, " "&apt-config;, &apt-secure;, The APT User's guide in &guidesdir;, &apt-" @@ -3685,29 +3714,29 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:576 +#: apt-get.8.xml:583 msgid "" "<command>apt-get</command> returns zero on normal operation, decimal 100 on " "error." msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:579 +#: apt-get.8.xml:586 msgid "ORIGINAL AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:580 +#: apt-get.8.xml:587 msgid "&apt-author.jgunthorpe;" msgstr "" #. type: Content of: <refentry><refsect1><title> -#: apt-get.8.xml:583 +#: apt-get.8.xml:590 msgid "CURRENT AUTHORS" msgstr "" #. type: Content of: <refentry><refsect1><para> -#: apt-get.8.xml:585 +#: apt-get.8.xml:592 msgid "&apt-author.team;" msgstr "" @@ -5923,7 +5952,8 @@ msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" #. The last update date #. type: Content of: <refentry><refentryinfo> #: apt_preferences.5.xml:13 -msgid "&apt-author.team; &apt-email; &apt-product; <date>04 May 2009</date>" +msgid "" +"&apt-author.team; &apt-email; &apt-product; <date>16 February 2010</date>" msgstr "" #. type: Content of: <refentry><refnamediv><refname> @@ -5993,6 +6023,20 @@ msgstr "" #. type: Content of: <refentry><refsect1><para> #: apt_preferences.5.xml:56 msgid "" +"Preferences are a strong power in the hands of a system administrator but " +"they can become also their biggest nightmare if used without care! APT will " +"not questioning the preferences so wrong settings will therefore lead to " +"uninstallable packages or wrong decisions while upgrading packages. Even " +"more problems will arise if multiply distribution releases are mixed without " +"a good understanding of the following paragraphs. Packages included in a " +"specific release aren't tested in and therefore doesn't always work as " +"expected in older or newer releases or together with other packages from " +"different releases. You have been warned." +msgstr "" + +#. type: Content of: <refentry><refsect1><para> +#: apt_preferences.5.xml:67 +msgid "" "Note that the files in the <filename>/etc/apt/preferences.d</filename> " "directory are parsed in alphanumeric ascending order and need to obey the " "following naming convention: The files have no or \"<literal>pref</literal>" @@ -6002,13 +6046,13 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:63 +#: apt_preferences.5.xml:74 #, fuzzy msgid "APT's Default Priority Assignments" msgstr "Atribuições de Prioridade Padrão do APT" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:78 +#: apt_preferences.5.xml:89 #, fuzzy, no-wrap msgid "<command>apt-get install -t testing <replaceable>some-package</replaceable></command>\n" msgstr "" @@ -6016,7 +6060,7 @@ msgstr "" "<command>apt-get install -t testing <replaceable>algum-pacote</replaceable></command>\n" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:81 +#: apt_preferences.5.xml:92 #, fuzzy, no-wrap msgid "APT::Default-Release \"stable\";\n" msgstr "" @@ -6024,7 +6068,7 @@ msgstr "" "APT::Default-Release \"stable\";\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:65 +#: apt_preferences.5.xml:76 #, fuzzy msgid "" "If there is no preferences file or if there is no entry in the file that " @@ -6049,25 +6093,25 @@ msgstr "" "etc/apt/apt.conf</filename>. Por exemplo," #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:90 +#: apt_preferences.5.xml:101 #, fuzzy msgid "priority 100" msgstr "prioridade 100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:91 +#: apt_preferences.5.xml:102 #, fuzzy msgid "to the version that is already installed (if any)." msgstr "para a instância que já esteja instalada (caso exista)." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:95 +#: apt_preferences.5.xml:106 #, fuzzy msgid "priority 500" msgstr "prioridade 500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:96 +#: apt_preferences.5.xml:107 #, fuzzy msgid "" "to the versions that are not installed and do not belong to the target " @@ -6076,13 +6120,13 @@ msgstr "" "para as instâncias que não estã instaladas e que não pertencem a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:100 +#: apt_preferences.5.xml:111 #, fuzzy msgid "priority 990" msgstr "prioridade 990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:101 +#: apt_preferences.5.xml:112 #, fuzzy msgid "" "to the versions that are not installed and belong to the target release." @@ -6090,7 +6134,7 @@ msgstr "" "para as instâncias que não estejam instaladas e pertençam a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:85 +#: apt_preferences.5.xml:96 #, fuzzy msgid "" "If the target release has been specified then APT uses the following " @@ -6102,7 +6146,7 @@ msgstr "" "Atribuirá :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:106 +#: apt_preferences.5.xml:117 #, fuzzy msgid "" "If the target release has not been specified then APT simply assigns " @@ -6114,7 +6158,7 @@ msgstr "" "prioridade 500 para todas as instâncias de pacotes não instaladas." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:110 +#: apt_preferences.5.xml:121 #, fuzzy msgid "" "APT then applies the following rules, listed in order of precedence, to " @@ -6124,7 +6168,7 @@ msgstr "" "determinar qual instância de um pacote instalar." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:113 +#: apt_preferences.5.xml:124 #, fuzzy msgid "" "Never downgrade unless the priority of an available version exceeds 1000. " @@ -6141,13 +6185,13 @@ msgstr "" "\"downgrade\" pode ser arriscado.)" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:119 +#: apt_preferences.5.xml:130 #, fuzzy msgid "Install the highest priority version." msgstr "Instala a instância de prioridade mais alta." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:120 +#: apt_preferences.5.xml:131 #, fuzzy msgid "" "If two or more versions have the same priority, install the most recent one " @@ -6157,7 +6201,7 @@ msgstr "" "mais recente (ou seja, aquela com o maior número de versão)." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:123 +#: apt_preferences.5.xml:134 #, fuzzy msgid "" "If two or more versions have the same priority and version number but either " @@ -6169,7 +6213,7 @@ msgstr "" "<literal>--reinstall</literal> seja fornecida, instala aquela desinstalada." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:129 +#: apt_preferences.5.xml:140 #, fuzzy msgid "" "In a typical situation, the installed version of a package (priority 100) " @@ -6186,7 +6230,7 @@ msgstr "" "forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:136 +#: apt_preferences.5.xml:147 #, fuzzy msgid "" "More rarely, the installed version of a package is <emphasis>more</emphasis> " @@ -6201,7 +6245,7 @@ msgstr "" "upgrade</command> forem executados." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:141 +#: apt_preferences.5.xml:152 #, fuzzy msgid "" "Sometimes the installed version of a package is more recent than the version " @@ -6221,13 +6265,13 @@ msgstr "" "disponíveis possuir uma prioridade maior do que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:150 +#: apt_preferences.5.xml:161 #, fuzzy msgid "The Effect of APT Preferences" msgstr "O Efeito das Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:152 +#: apt_preferences.5.xml:163 #, fuzzy msgid "" "The APT preferences file allows the system administrator to control the " @@ -6241,7 +6285,7 @@ msgstr "" "das duas formas, uma forma específica e uma forma geral." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:158 +#: apt_preferences.5.xml:169 #, fuzzy msgid "" "The specific form assigns a priority (a \"Pin-Priority\") to one or more " @@ -6257,7 +6301,7 @@ msgstr "" "com \"<literal>5.8</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:165 +#: apt_preferences.5.xml:176 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6270,7 +6314,7 @@ msgstr "" "Pin-Priority: 1001\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:171 +#: apt_preferences.5.xml:182 #, fuzzy msgid "" "The general form assigns a priority to all of the package versions in a " @@ -6286,7 +6330,7 @@ msgstr "" "identificado pelo nome de domínio totalmente qualificado do site Internet." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:177 +#: apt_preferences.5.xml:188 #, fuzzy msgid "" "This general-form entry in the APT preferences file applies only to groups " @@ -6299,7 +6343,7 @@ msgstr "" "no site local." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:182 +#: apt_preferences.5.xml:193 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6312,7 +6356,7 @@ msgstr "" "Pin-Priority: 999\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:187 +#: apt_preferences.5.xml:198 #, fuzzy msgid "" "A note of caution: the keyword used here is \"<literal>origin</literal>\". " @@ -6329,7 +6373,7 @@ msgstr "" "como \"Debian\" ou \"Ximian\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:193 +#: apt_preferences.5.xml:204 #, fuzzy msgid "" "The following record assigns a low priority to all package versions " @@ -6341,7 +6385,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:197 +#: apt_preferences.5.xml:208 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6354,7 +6398,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:202 +#: apt_preferences.5.xml:213 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6366,7 +6410,7 @@ msgstr "" "\"<literal>unstable</literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:206 +#: apt_preferences.5.xml:217 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6379,7 +6423,7 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:211 +#: apt_preferences.5.xml:222 #, fuzzy msgid "" "The following record assigns a high priority to all package versions " @@ -6392,7 +6436,7 @@ msgstr "" "literal>\"." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><programlisting> -#: apt_preferences.5.xml:216 +#: apt_preferences.5.xml:227 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -6405,19 +6449,19 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:227 +#: apt_preferences.5.xml:238 #, fuzzy msgid "How APT Interprets Priorities" msgstr "Como o APT Interpreta Prioridades" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:235 +#: apt_preferences.5.xml:246 #, fuzzy msgid "P > 1000" msgstr "P > 1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:236 +#: apt_preferences.5.xml:247 #, fuzzy msgid "" "causes a version to be installed even if this constitutes a downgrade of the " @@ -6427,13 +6471,13 @@ msgstr "" "dowgrade do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:240 +#: apt_preferences.5.xml:251 #, fuzzy msgid "990 < P <=1000" msgstr "990 < P <=1000" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:241 +#: apt_preferences.5.xml:252 #, fuzzy msgid "" "causes a version to be installed even if it does not come from the target " @@ -6443,13 +6487,13 @@ msgstr "" "versão alvo, a menos que a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:246 +#: apt_preferences.5.xml:257 #, fuzzy msgid "500 < P <=990" msgstr "500 < P <=990" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:247 +#: apt_preferences.5.xml:258 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6459,13 +6503,13 @@ msgstr "" "disponível pertencente a versão alvo ou a versão instalada seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:252 +#: apt_preferences.5.xml:263 #, fuzzy msgid "100 < P <=500" msgstr "100 < P <=500" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:253 +#: apt_preferences.5.xml:264 #, fuzzy msgid "" "causes a version to be installed unless there is a version available " @@ -6476,13 +6520,13 @@ msgstr "" "seja mais recente" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:258 +#: apt_preferences.5.xml:269 #, fuzzy msgid "0 < P <=100" msgstr "0 <= P <=100" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:259 +#: apt_preferences.5.xml:270 #, fuzzy msgid "" "causes a version to be installed only if there is no installed version of " @@ -6492,19 +6536,19 @@ msgstr "" "instalada do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:263 +#: apt_preferences.5.xml:274 #, fuzzy msgid "P < 0" msgstr "P < 0" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:264 +#: apt_preferences.5.xml:275 #, fuzzy msgid "prevents the version from being installed" msgstr "impede a versão de ser instalada" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:230 +#: apt_preferences.5.xml:241 #, fuzzy msgid "" "Priorities (P) assigned in the APT preferences file must be positive or " @@ -6516,7 +6560,7 @@ msgstr "" "seguir (a grosso modo):" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:269 +#: apt_preferences.5.xml:280 #, fuzzy msgid "" "If any specific-form records match an available package version then the " @@ -6532,7 +6576,7 @@ msgstr "" "determinará a prioridade da versão do pacote." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:275 +#: apt_preferences.5.xml:286 #, fuzzy msgid "" "For example, suppose the APT preferences file contains the three records " @@ -6542,7 +6586,7 @@ msgstr "" "registros apresentados anteriormente :" #. type: Content of: <refentry><refsect1><refsect2><programlisting> -#: apt_preferences.5.xml:279 +#: apt_preferences.5.xml:290 #, fuzzy, no-wrap msgid "" "Package: perl\n" @@ -6571,12 +6615,12 @@ msgstr "" "Pin-Priority: 50\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:292 +#: apt_preferences.5.xml:303 msgid "Then:" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:294 +#: apt_preferences.5.xml:305 #, fuzzy msgid "" "The most recent available version of the <literal>perl</literal> package " @@ -6592,7 +6636,7 @@ msgstr "" "será feito um downgrade do <literal>perl</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:299 +#: apt_preferences.5.xml:310 #, fuzzy msgid "" "A version of any package other than <literal>perl</literal> that is " @@ -6604,7 +6648,7 @@ msgstr "" "mesmo versões pertencentes a versão alvo." #. type: Content of: <refentry><refsect1><refsect2><para><itemizedlist><listitem><simpara> -#: apt_preferences.5.xml:303 +#: apt_preferences.5.xml:314 #, fuzzy msgid "" "A version of a package whose origin is not the local system but some other " @@ -6619,13 +6663,13 @@ msgstr "" "instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:313 +#: apt_preferences.5.xml:324 #, fuzzy msgid "Determination of Package Version and Distribution Properties" msgstr "Determinação da Versão do Pacote e Propriedades da Distribuição" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:315 +#: apt_preferences.5.xml:326 #, fuzzy msgid "" "The locations listed in the &sources-list; file should provide " @@ -6637,31 +6681,31 @@ msgstr "" "os pacotes disponíveis nessas localidades." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:327 +#: apt_preferences.5.xml:338 #, fuzzy msgid "the <literal>Package:</literal> line" msgstr "a linha <literal>Package:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:328 +#: apt_preferences.5.xml:339 #, fuzzy msgid "gives the package name" msgstr "informa o nome do pacote" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:331 apt_preferences.5.xml:381 +#: apt_preferences.5.xml:342 apt_preferences.5.xml:392 #, fuzzy msgid "the <literal>Version:</literal> line" msgstr "a linha <literal>Version:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:332 +#: apt_preferences.5.xml:343 #, fuzzy msgid "gives the version number for the named package" msgstr "informa o número de versão do pacote" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:319 +#: apt_preferences.5.xml:330 #, fuzzy msgid "" "The <filename>Packages</filename> file is normally found in the directory " @@ -6683,13 +6727,13 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:348 +#: apt_preferences.5.xml:359 #, fuzzy msgid "the <literal>Archive:</literal> or <literal>Suite:</literal> line" msgstr "a linha <literal>Archive:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:349 +#: apt_preferences.5.xml:360 #, fuzzy msgid "" "names the archive to which all the packages in the directory tree belong. " @@ -6707,7 +6751,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:359 +#: apt_preferences.5.xml:370 #, fuzzy, no-wrap msgid "Pin: release a=stable\n" msgstr "" @@ -6715,13 +6759,13 @@ msgstr "" "Pin: release a=stable\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:365 +#: apt_preferences.5.xml:376 #, fuzzy msgid "the <literal>Codename:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:366 +#: apt_preferences.5.xml:377 #, fuzzy msgid "" "names the codename to which all the packages in the directory tree belong. " @@ -6738,13 +6782,13 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:375 +#: apt_preferences.5.xml:386 #, no-wrap msgid "Pin: release n=squeeze\n" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:382 +#: apt_preferences.5.xml:393 #, fuzzy msgid "" "names the release version. For example, the packages in the tree might " @@ -6761,7 +6805,7 @@ msgstr "" "das linhas a seguir." #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:391 +#: apt_preferences.5.xml:402 #, fuzzy, no-wrap msgid "" "Pin: release v=3.0\n" @@ -6774,13 +6818,13 @@ msgstr "" "Pin: release 3.0\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:400 +#: apt_preferences.5.xml:411 #, fuzzy msgid "the <literal>Component:</literal> line" msgstr "a linha <literal>Component:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:401 +#: apt_preferences.5.xml:412 #, fuzzy msgid "" "names the licensing component associated with the packages in the directory " @@ -6799,7 +6843,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:410 +#: apt_preferences.5.xml:421 #, fuzzy, no-wrap msgid "Pin: release c=main\n" msgstr "" @@ -6807,13 +6851,13 @@ msgstr "" "Pin: release c=main\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:416 +#: apt_preferences.5.xml:427 #, fuzzy msgid "the <literal>Origin:</literal> line" msgstr "a linha <literal>Origin:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:417 +#: apt_preferences.5.xml:428 #, fuzzy msgid "" "names the originator of the packages in the directory tree of the " @@ -6827,7 +6871,7 @@ msgstr "" "requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:423 +#: apt_preferences.5.xml:434 #, fuzzy, no-wrap msgid "Pin: release o=Debian\n" msgstr "" @@ -6835,13 +6879,13 @@ msgstr "" "Pin: release o=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><term> -#: apt_preferences.5.xml:429 +#: apt_preferences.5.xml:440 #, fuzzy msgid "the <literal>Label:</literal> line" msgstr "a linha <literal>Label:</literal>" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><simpara> -#: apt_preferences.5.xml:430 +#: apt_preferences.5.xml:441 #, fuzzy msgid "" "names the label of the packages in the directory tree of the " @@ -6854,7 +6898,7 @@ msgstr "" "arquivo de preferências do APT iria requerer a linha :" #. type: Content of: <refentry><refsect1><refsect2><para><variablelist><varlistentry><listitem><programlisting> -#: apt_preferences.5.xml:436 +#: apt_preferences.5.xml:447 #, fuzzy, no-wrap msgid "Pin: release l=Debian\n" msgstr "" @@ -6862,7 +6906,7 @@ msgstr "" "Pin: release l=Debian\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:337 +#: apt_preferences.5.xml:348 #, fuzzy msgid "" "The <filename>Release</filename> file is normally found in the directory " @@ -6885,7 +6929,7 @@ msgstr "" "do APT :" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:443 +#: apt_preferences.5.xml:454 #, fuzzy msgid "" "All of the <filename>Packages</filename> and <filename>Release</filename> " @@ -6911,13 +6955,13 @@ msgstr "" "<literal>unstable</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:456 +#: apt_preferences.5.xml:467 #, fuzzy msgid "Optional Lines in an APT Preferences Record" msgstr "Linhas Opcionais em um Registro de Preferências do APT" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:458 +#: apt_preferences.5.xml:469 #, fuzzy msgid "" "Each record in the APT preferences file can optionally begin with one or " @@ -6929,7 +6973,7 @@ msgstr "" "</literal>. Isto oferece um local para inserir comentários." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:462 +#: apt_preferences.5.xml:473 #, fuzzy msgid "" "The <literal>Pin-Priority:</literal> line in each APT preferences record is " @@ -6943,13 +6987,13 @@ msgstr "" "release ...</literal>." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:471 +#: apt_preferences.5.xml:482 #, fuzzy msgid "Tracking Stable" msgstr "Acompanhando a Stable" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:479 +#: apt_preferences.5.xml:490 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated\n" @@ -6974,7 +7018,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:473 +#: apt_preferences.5.xml:484 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a priority " @@ -6990,8 +7034,8 @@ msgstr "" "outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:496 apt_preferences.5.xml:542 -#: apt_preferences.5.xml:600 +#: apt_preferences.5.xml:507 apt_preferences.5.xml:553 +#: apt_preferences.5.xml:611 #, fuzzy, no-wrap msgid "" "apt-get install <replaceable>package-name</replaceable>\n" @@ -7004,7 +7048,7 @@ msgstr "" "apt-get dist-upgrade\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:491 +#: apt_preferences.5.xml:502 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7017,7 +7061,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:508 +#: apt_preferences.5.xml:519 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/testing\n" msgstr "" @@ -7025,7 +7069,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:502 +#: apt_preferences.5.xml:513 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7038,13 +7082,13 @@ msgstr "" "atualizado novamente a menos que esse comando seja executado novamente." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:514 +#: apt_preferences.5.xml:525 #, fuzzy msgid "Tracking Testing or Unstable" msgstr "Acompanhando a Testing" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:523 +#: apt_preferences.5.xml:534 #, fuzzy, no-wrap msgid "" "Package: *\n" @@ -7073,7 +7117,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:516 +#: apt_preferences.5.xml:527 #, fuzzy msgid "" "The following APT preferences file will cause APT to assign a high priority " @@ -7090,7 +7134,7 @@ msgstr "" "versões de pacotes de outras distribuições <literal>Debian</literal>." #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:537 +#: apt_preferences.5.xml:548 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7103,7 +7147,7 @@ msgstr "" "(s) última(s) versão(ões) <literal>testing</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:557 +#: apt_preferences.5.xml:568 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/unstable\n" msgstr "" @@ -7111,7 +7155,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/unstable\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:548 +#: apt_preferences.5.xml:559 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7131,12 +7175,12 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><refsect2><title> -#: apt_preferences.5.xml:564 +#: apt_preferences.5.xml:575 msgid "Tracking the evolution of a codename release" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:578 +#: apt_preferences.5.xml:589 #, fuzzy, no-wrap msgid "" "Explanation: Uninstall or do not install any Debian-originated package versions\n" @@ -7166,7 +7210,7 @@ msgstr "" "Pin-Priority: -10\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:566 +#: apt_preferences.5.xml:577 msgid "" "The following APT preferences file will cause APT to assign a priority " "higher than the default (500) to all package versions belonging to a " @@ -7181,7 +7225,7 @@ msgid "" msgstr "" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:595 +#: apt_preferences.5.xml:606 #, fuzzy msgid "" "With a suitable &sources-list; file and the above preferences file, any of " @@ -7194,7 +7238,7 @@ msgstr "" "ulítma(s) versão(ôes) <literal>stable</literal>." #. type: Content of: <refentry><refsect1><refsect2><para><programlisting> -#: apt_preferences.5.xml:615 +#: apt_preferences.5.xml:626 #, fuzzy, no-wrap msgid "apt-get install <replaceable>package</replaceable>/sid\n" msgstr "" @@ -7202,7 +7246,7 @@ msgstr "" "apt-get install <replaceable>pacote</replaceable>/testing\n" #. type: Content of: <refentry><refsect1><refsect2><para> -#: apt_preferences.5.xml:606 +#: apt_preferences.5.xml:617 #, fuzzy msgid "" "The following command will cause APT to upgrade the specified package to the " @@ -7222,13 +7266,13 @@ msgstr "" "recente que a versão instalada." #. type: Content of: <refentry><refsect1><variablelist> -#: apt_preferences.5.xml:624 +#: apt_preferences.5.xml:635 #, fuzzy msgid "&file-preferences;" msgstr "apt_preferences" #. type: Content of: <refentry><refsect1><para> -#: apt_preferences.5.xml:630 +#: apt_preferences.5.xml:641 #, fuzzy msgid "&apt-get; &apt-cache; &apt-conf; &sources-list;" msgstr "&apt-get; &apt-cache; &apt-conf; &sources-list;" diff --git a/doc/pt_BR/makefile b/doc/pt_BR/makefile deleted file mode 100644 index 6e485bbf6..000000000 --- a/doc/pt_BR/makefile +++ /dev/null @@ -1,11 +0,0 @@ -# -*- make -*- -BASE=../.. -SUBDIR=doc/pt_BR - -# Bring in the default rules -include ../../buildlib/defaults.mak - -# Language Code of this translation -LC=pt_BR - -include $(PO4A_MANPAGE_H) diff --git a/methods/cdrom.cc b/methods/cdrom.cc index 6d694e7c9..bf4281e40 100644 --- a/methods/cdrom.cc +++ b/methods/cdrom.cc @@ -219,7 +219,7 @@ bool CDROMMethod::Fetch(FetchItem *Itm) return true; } - bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", false); + bool AutoDetect = _config->FindB("Acquire::cdrom::AutoDetect", true); CDROM = _config->FindDir("Acquire::cdrom::mount","/cdrom/"); if (Debug) clog << "Looking for CDROM at " << CDROM << endl; diff --git a/methods/http.cc b/methods/http.cc index 2dae87a02..b05444691 100644 --- a/methods/http.cc +++ b/methods/http.cc @@ -682,23 +682,25 @@ void HttpMethod::SendReq(FetchItem *Itm,CircleBuf &Out) and a no-store directive for archives. */ sprintf(Buf,"GET %s HTTP/1.1\r\nHost: %s\r\n", Itm->Uri.c_str(),ProperHost.c_str()); - // only generate a cache control header if we actually want to - // use a cache - if (_config->FindB("Acquire::http::No-Cache",false) == false) + } + // generate a cache control header (if needed) + if (_config->FindB("Acquire::http::No-Cache",false) == true) + { + strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n"); + } + else + { + if (Itm->IndexFile == true) { - if (Itm->IndexFile == true) - sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n", - _config->FindI("Acquire::http::Max-Age",0)); - else - { - if (_config->FindB("Acquire::http::No-Store",false) == true) - strcat(Buf,"Cache-Control: no-store\r\n"); - } + sprintf(Buf+strlen(Buf),"Cache-Control: max-age=%u\r\n", + _config->FindI("Acquire::http::Max-Age",0)); + } + else + { + if (_config->FindB("Acquire::http::No-Store",false) == true) + strcat(Buf,"Cache-Control: no-store\r\n"); } } - // generate a no-cache header if needed - if (_config->FindB("Acquire::http::No-Cache",false) == true) - strcat(Buf,"Cache-Control: no-cache\r\nPragma: no-cache\r\n"); string Req = Buf; @@ -1071,7 +1073,11 @@ bool HttpMethod::Configuration(string Message) PipelineDepth = _config->FindI("Acquire::http::Pipeline-Depth", PipelineDepth); Debug = _config->FindB("Debug::Acquire::http",false); - + AutoDetectProxyCmd = _config->Find("Acquire::http::ProxyAutoDetect"); + + // Get the proxy to use + AutoDetectProxy(); + return true; } /*}}}*/ @@ -1321,6 +1327,49 @@ int HttpMethod::Loop() return 0; } /*}}}*/ +// HttpMethod::AutoDetectProxy - auto detect proxy /*{{{*/ +// --------------------------------------------------------------------- +/* */ +bool HttpMethod::AutoDetectProxy() +{ + if (AutoDetectProxyCmd.empty()) + return true; + + if (Debug) + clog << "Using auto proxy detect command: " << AutoDetectProxyCmd << endl; + + int Pipes[2] = {-1,-1}; + if (pipe(Pipes) != 0) + return _error->Errno("pipe", "Failed to create Pipe"); + + pid_t Process = ExecFork(); + if (Process == 0) + { + dup2(Pipes[1],STDOUT_FILENO); + SetCloseExec(STDOUT_FILENO,false); + + const char *Args[2]; + Args[0] = AutoDetectProxyCmd.c_str(); + Args[1] = 0; + execv(Args[0],(char **)Args); + cerr << "Failed to exec method " << Args[0] << endl; + _exit(100); + } + char buf[512]; + int InFd = Pipes[0]; + if (read(InFd, buf, sizeof(buf)) < 0) + return _error->Errno("read", "Failed to read"); + ExecWait(Process, "ProxyAutoDetect"); + + if (Debug) + clog << "auto detect command returned: '" << buf << "'" << endl; + + if (strstr(buf, "http://") == buf) + _config->Set("Acquire::http::proxy", _strstrip(buf)); + + return true; +} + /*}}}*/ int main() { diff --git a/methods/http.h b/methods/http.h index 13f02ec77..ceee36cbe 100644 --- a/methods/http.h +++ b/methods/http.h @@ -134,6 +134,7 @@ class HttpMethod : public pkgAcqMethod bool Flush(ServerState *Srv); bool ServerDie(ServerState *Srv); int DealWithHeaders(FetchResult &Res,ServerState *Srv); + bool AutoDetectProxy(); virtual bool Fetch(FetchItem *); virtual bool Configuration(string Message); @@ -145,6 +146,7 @@ class HttpMethod : public pkgAcqMethod static void SigTerm(int); string NextURI; + string AutoDetectProxyCmd; public: friend class ServerState; diff --git a/po/apt-all.pot b/po/apt-all.pot index d849c7cca..ae0a7c375 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -7,13 +7,14 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-11 15:17+0100\n" +"POT-Creation-Date: 2010-03-14 16:30+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" #: cmdline/apt-cache.cc:141 #, c-format @@ -144,9 +145,9 @@ msgstr "" msgid " Version table:" msgstr "" -#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:134 cmdline/apt-config.cc:70 +#: cmdline/apt-cache.cc:1718 cmdline/apt-cdrom.cc:197 cmdline/apt-config.cc:70 #: cmdline/apt-extracttemplates.cc:225 ftparchive/apt-ftparchive.cc:547 -#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2693 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -198,7 +199,12 @@ msgstr "" msgid "Please insert a Disc in the drive and press enter" msgstr "" -#: cmdline/apt-cdrom.cc:114 +#: cmdline/apt-cdrom.cc:127 +#, c-format +msgid "Failed to mount '%s' to '%s'" +msgstr "" + +#: cmdline/apt-cdrom.cc:162 msgid "Repeat this process for the rest of the CDs in your set." msgstr "" @@ -360,87 +366,87 @@ msgstr "" msgid "Unable to get a cursor" msgstr "" -#: ftparchive/writer.cc:76 +#: ftparchive/writer.cc:72 #, c-format msgid "W: Unable to read directory %s\n" msgstr "" -#: ftparchive/writer.cc:81 +#: ftparchive/writer.cc:77 #, c-format msgid "W: Unable to stat %s\n" msgstr "" -#: ftparchive/writer.cc:132 +#: ftparchive/writer.cc:133 msgid "E: " msgstr "" -#: ftparchive/writer.cc:134 +#: ftparchive/writer.cc:135 msgid "W: " msgstr "" -#: ftparchive/writer.cc:141 +#: ftparchive/writer.cc:142 msgid "E: Errors apply to file " msgstr "" -#: ftparchive/writer.cc:158 ftparchive/writer.cc:188 +#: ftparchive/writer.cc:160 ftparchive/writer.cc:192 #, c-format msgid "Failed to resolve %s" msgstr "" -#: ftparchive/writer.cc:170 +#: ftparchive/writer.cc:173 msgid "Tree walking failed" msgstr "" -#: ftparchive/writer.cc:195 +#: ftparchive/writer.cc:200 #, c-format msgid "Failed to open %s" msgstr "" -#: ftparchive/writer.cc:254 +#: ftparchive/writer.cc:259 #, c-format msgid " DeLink %s [%s]\n" msgstr "" -#: ftparchive/writer.cc:262 +#: ftparchive/writer.cc:267 #, c-format msgid "Failed to readlink %s" msgstr "" -#: ftparchive/writer.cc:266 +#: ftparchive/writer.cc:271 #, c-format msgid "Failed to unlink %s" msgstr "" -#: ftparchive/writer.cc:273 +#: ftparchive/writer.cc:278 #, c-format msgid "*** Failed to link %s to %s" msgstr "" -#: ftparchive/writer.cc:283 +#: ftparchive/writer.cc:288 #, c-format msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:389 +#: ftparchive/writer.cc:392 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 +#: ftparchive/writer.cc:400 ftparchive/writer.cc:636 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 +#: ftparchive/writer.cc:461 ftparchive/writer.cc:741 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:638 +#: ftparchive/writer.cc:646 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:642 +#: ftparchive/writer.cc:650 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -544,7 +550,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1752 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -703,11 +709,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2096 cmdline/apt-get.cc:2129 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2177 cmdline/apt-get.cc:2434 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -736,8 +742,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2273 +#: cmdline/apt-get.cc:2276 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -771,7 +777,7 @@ msgstr "" msgid "Do you want to continue [Y/n]? " msgstr "" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2329 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -780,7 +786,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2338 msgid "Download complete and in download only mode" msgstr "" @@ -812,25 +818,30 @@ msgstr "" msgid "Skipping %s, it is already installed and upgrade is not set.\n" msgstr "" -#: cmdline/apt-get.cc:1115 +#: cmdline/apt-get.cc:1107 +#, c-format +msgid "Skipping %s, it is not installed and only upgrades are requested.\n" +msgstr "" + +#: cmdline/apt-get.cc:1125 #, c-format msgid "Package %s is not installed, so not removed\n" msgstr "" -#: cmdline/apt-get.cc:1126 +#: cmdline/apt-get.cc:1136 #, c-format msgid "Package %s is a virtual package provided by:\n" msgstr "" -#: cmdline/apt-get.cc:1138 +#: cmdline/apt-get.cc:1148 msgid " [Installed]" msgstr "" -#: cmdline/apt-get.cc:1143 +#: cmdline/apt-get.cc:1153 msgid "You should explicitly select one to install." msgstr "" -#: cmdline/apt-get.cc:1148 +#: cmdline/apt-get.cc:1158 #, c-format msgid "" "Package %s is not available, but is referred to by another package.\n" @@ -838,84 +849,90 @@ msgid "" "is only available from another source\n" msgstr "" -#: cmdline/apt-get.cc:1167 +#: cmdline/apt-get.cc:1177 msgid "However the following packages replace it:" msgstr "" -#: cmdline/apt-get.cc:1170 +#: cmdline/apt-get.cc:1180 #, c-format msgid "Package %s has no installation candidate" msgstr "" -#: cmdline/apt-get.cc:1190 +#: cmdline/apt-get.cc:1200 #, c-format msgid "Reinstallation of %s is not possible, it cannot be downloaded.\n" msgstr "" -#: cmdline/apt-get.cc:1198 +#: cmdline/apt-get.cc:1208 #, c-format msgid "%s is already the newest version.\n" msgstr "" -#: cmdline/apt-get.cc:1227 +#: cmdline/apt-get.cc:1237 #, c-format msgid "Release '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1229 +#: cmdline/apt-get.cc:1239 #, c-format msgid "Version '%s' for '%s' was not found" msgstr "" -#: cmdline/apt-get.cc:1235 +#: cmdline/apt-get.cc:1245 #, c-format msgid "Selected version %s (%s) for %s\n" msgstr "" -#: cmdline/apt-get.cc:1321 +#: cmdline/apt-get.cc:1331 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1352 +#: cmdline/apt-get.cc:1362 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" #. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1389 +#: cmdline/apt-get.cc:1399 #, c-format msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1405 +#: cmdline/apt-get.cc:1415 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1418 +#: cmdline/apt-get.cc:1428 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1474 +#: cmdline/apt-get.cc:1484 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1523 +#: cmdline/apt-get.cc:1532 msgid "" +"The following package is automatically installed and is no longer required:" +msgid_plural "" "The following packages were automatically installed and are no longer " "required:" -msgstr "" +msgstr[0] "" +msgstr[1] "" -#: cmdline/apt-get.cc:1525 +#: cmdline/apt-get.cc:1536 #, c-format -msgid "%lu packages were automatically installed and are no longer required.\n" -msgstr "" +msgid "%lu package was automatically installed and is no longer required.\n" +msgid_plural "" +"%lu packages were automatically installed and are no longer required.\n" +msgstr[0] "" +msgstr[1] "" -#: cmdline/apt-get.cc:1526 +#: cmdline/apt-get.cc:1538 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1531 +#: cmdline/apt-get.cc:1543 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -931,49 +948,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 +#: cmdline/apt-get.cc:1546 cmdline/apt-get.cc:1838 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1538 +#: cmdline/apt-get.cc:1550 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1557 +#: cmdline/apt-get.cc:1569 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1612 +#: cmdline/apt-get.cc:1624 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 +#: cmdline/apt-get.cc:1739 cmdline/apt-get.cc:1775 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1750 +#: cmdline/apt-get.cc:1762 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1781 +#: cmdline/apt-get.cc:1795 #, c-format msgid "%s set to manually installed.\n" msgstr "" -#: cmdline/apt-get.cc:1794 +#: cmdline/apt-get.cc:1808 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1797 +#: cmdline/apt-get.cc:1811 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1809 +#: cmdline/apt-get.cc:1823 msgid "" "Some packages could not be installed. This may mean that you have\n" "requested an impossible situation or if you are using the unstable\n" @@ -981,152 +998,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1827 +#: cmdline/apt-get.cc:1841 msgid "Broken packages" msgstr "" -#: cmdline/apt-get.cc:1856 +#: cmdline/apt-get.cc:1870 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1945 +#: cmdline/apt-get.cc:1959 msgid "Suggested packages:" msgstr "" -#: cmdline/apt-get.cc:1946 +#: cmdline/apt-get.cc:1960 msgid "Recommended packages:" msgstr "" -#: cmdline/apt-get.cc:1975 +#: cmdline/apt-get.cc:1989 msgid "Calculating upgrade... " msgstr "" -#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1992 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "" -#: cmdline/apt-get.cc:1983 +#: cmdline/apt-get.cc:1997 msgid "Done" msgstr "" -#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 +#: cmdline/apt-get.cc:2064 cmdline/apt-get.cc:2072 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2158 +#: cmdline/apt-get.cc:2172 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 +#: cmdline/apt-get.cc:2202 cmdline/apt-get.cc:2452 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2237 +#: cmdline/apt-get.cc:2251 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2272 +#: cmdline/apt-get.cc:2286 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2278 +#: cmdline/apt-get.cc:2292 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2281 +#: cmdline/apt-get.cc:2295 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2287 +#: cmdline/apt-get.cc:2301 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2318 +#: cmdline/apt-get.cc:2334 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2346 +#: cmdline/apt-get.cc:2363 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2358 +#: cmdline/apt-get.cc:2375 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2359 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2376 +#: cmdline/apt-get.cc:2393 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2395 +#: cmdline/apt-get.cc:2413 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2411 +#: cmdline/apt-get.cc:2429 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2439 +#: cmdline/apt-get.cc:2457 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2459 +#: cmdline/apt-get.cc:2477 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2511 +#: cmdline/apt-get.cc:2529 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2564 +#: cmdline/apt-get.cc:2582 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" msgstr "" -#: cmdline/apt-get.cc:2600 +#: cmdline/apt-get.cc:2618 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2627 +#: cmdline/apt-get.cc:2645 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2643 +#: cmdline/apt-get.cc:2661 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2648 +#: cmdline/apt-get.cc:2666 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2680 +#: cmdline/apt-get.cc:2698 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2721 +#: cmdline/apt-get.cc:2739 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1170,7 +1187,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2889 +#: cmdline/apt-get.cc:2908 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1400,10 +1417,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:166 #: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 -#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 -#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:92 +#: apt-pkg/init.cc:100 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "" @@ -1535,18 +1552,18 @@ msgstr "" msgid "Unparsable control file" msgstr "" -#: methods/cdrom.cc:200 +#: methods/cdrom.cc:199 #, c-format msgid "Unable to read the cdrom database %s" msgstr "" -#: methods/cdrom.cc:209 +#: methods/cdrom.cc:208 msgid "" "Please use apt-cdrom to make this CD-ROM recognized by APT. apt-get update " "cannot be used to add new CD-ROMs" msgstr "" -#: methods/cdrom.cc:219 +#: methods/cdrom.cc:218 msgid "Wrong CD-ROM" msgstr "" @@ -1694,7 +1711,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1002 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1863,67 +1880,80 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:791 +#: methods/http.cc:793 msgid "Select failed" msgstr "" -#: methods/http.cc:796 +#: methods/http.cc:798 msgid "Connection timed out" msgstr "" -#: methods/http.cc:819 +#: methods/http.cc:821 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:850 +#: methods/http.cc:852 msgid "Error writing to file" msgstr "" -#: methods/http.cc:878 +#: methods/http.cc:880 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:892 +#: methods/http.cc:894 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:894 +#: methods/http.cc:896 msgid "Error reading from server" msgstr "" -#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 +#: methods/http.cc:987 apt-pkg/contrib/mmap.cc:281 msgid "Failed to truncate file" msgstr "" -#: methods/http.cc:1150 +#: methods/http.cc:1156 msgid "Bad header data" msgstr "" -#: methods/http.cc:1167 methods/http.cc:1222 +#: methods/http.cc:1173 methods/http.cc:1228 msgid "Connection failed" msgstr "" -#: methods/http.cc:1314 +#: methods/http.cc:1320 msgid "Internal error" msgstr "" -#: apt-pkg/contrib/mmap.cc:76 +#: apt-pkg/contrib/mmap.cc:77 msgid "Can't mmap an empty file" msgstr "" -#: apt-pkg/contrib/mmap.cc:81 apt-pkg/contrib/mmap.cc:202 +#: apt-pkg/contrib/mmap.cc:89 +#, c-format +msgid "Couldn't duplicate file descriptor %i" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:97 apt-pkg/contrib/mmap.cc:250 #, c-format msgid "Couldn't make mmap of %lu bytes" msgstr "" -#: apt-pkg/contrib/mmap.cc:252 +#: apt-pkg/contrib/mmap.cc:124 +msgid "Unable to close mmap" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:152 apt-pkg/contrib/mmap.cc:180 +msgid "Unable to synchronize mmap" +msgstr "" + +#: apt-pkg/contrib/mmap.cc:300 #, c-format msgid "" "Dynamic MMap ran out of room. Please increase the size of APT::Cache-Limit. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -#: apt-pkg/contrib/mmap.cc:347 +#: apt-pkg/contrib/mmap.cc:395 #, c-format msgid "" "The size of a MMap has already reached the defined limit of %lu bytes,abort " @@ -1931,30 +1961,30 @@ msgid "" msgstr "" #. d means days, h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:346 +#: apt-pkg/contrib/strutl.cc:363 #, c-format msgid "%lid %lih %limin %lis" msgstr "" #. h means hours, min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:353 +#: apt-pkg/contrib/strutl.cc:370 #, c-format msgid "%lih %limin %lis" msgstr "" #. min means minutes, s means seconds -#: apt-pkg/contrib/strutl.cc:360 +#: apt-pkg/contrib/strutl.cc:377 #, c-format msgid "%limin %lis" msgstr "" #. s means seconds -#: apt-pkg/contrib/strutl.cc:365 +#: apt-pkg/contrib/strutl.cc:382 #, c-format msgid "%lis" msgstr "" -#: apt-pkg/contrib/strutl.cc:1040 +#: apt-pkg/contrib/strutl.cc:1075 #, c-format msgid "Selection %s not found" msgstr "" @@ -2035,32 +2065,32 @@ msgstr "" msgid "Command line option %s is not boolean" msgstr "" -#: apt-pkg/contrib/cmndline.cc:163 apt-pkg/contrib/cmndline.cc:184 +#: apt-pkg/contrib/cmndline.cc:165 apt-pkg/contrib/cmndline.cc:186 #, c-format msgid "Option %s requires an argument." msgstr "" -#: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 +#: apt-pkg/contrib/cmndline.cc:200 apt-pkg/contrib/cmndline.cc:206 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." msgstr "" -#: apt-pkg/contrib/cmndline.cc:234 +#: apt-pkg/contrib/cmndline.cc:236 #, c-format msgid "Option %s requires an integer argument, not '%s'" msgstr "" -#: apt-pkg/contrib/cmndline.cc:265 +#: apt-pkg/contrib/cmndline.cc:267 #, c-format msgid "Option '%s' is too long" msgstr "" -#: apt-pkg/contrib/cmndline.cc:298 +#: apt-pkg/contrib/cmndline.cc:300 #, c-format msgid "Sense %s is not understood, try true or false." msgstr "" -#: apt-pkg/contrib/cmndline.cc:348 +#: apt-pkg/contrib/cmndline.cc:350 #, c-format msgid "Invalid operation %s" msgstr "" @@ -2070,13 +2100,13 @@ msgstr "" msgid "Unable to stat the mount point %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 +#: apt-pkg/contrib/cdromutl.cc:162 apt-pkg/contrib/cdromutl.cc:196 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 #, c-format msgid "Unable to change to %s" msgstr "" -#: apt-pkg/contrib/cdromutl.cc:195 +#: apt-pkg/contrib/cdromutl.cc:204 msgid "Failed to stat the cdrom" msgstr "" @@ -2241,7 +2271,7 @@ msgstr "" msgid "Dependency generation" msgstr "" -#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 +#: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:198 msgid "Reading state information" msgstr "" @@ -2295,7 +2325,7 @@ msgstr "" msgid "Opening %s" msgstr "" -#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:446 #, c-format msgid "Line %u too long in source list %s." msgstr "" @@ -2401,12 +2431,12 @@ msgstr "" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" -#: apt-pkg/init.cc:133 +#: apt-pkg/init.cc:135 #, c-format msgid "Packaging system '%s' is not supported" msgstr "" -#: apt-pkg/init.cc:149 +#: apt-pkg/init.cc:151 msgid "Unable to determine a suitable packaging system type" msgstr "" @@ -2595,86 +2625,86 @@ msgstr "" msgid "Vendor block %s contains no fingerprint" msgstr "" -#: apt-pkg/cdrom.cc:525 +#: apt-pkg/cdrom.cc:526 #, c-format msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 +#: apt-pkg/cdrom.cc:535 apt-pkg/cdrom.cc:623 msgid "Identifying.. " msgstr "" -#: apt-pkg/cdrom.cc:559 +#: apt-pkg/cdrom.cc:560 #, c-format msgid "Stored label: %s\n" msgstr "" -#: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 +#: apt-pkg/cdrom.cc:567 apt-pkg/cdrom.cc:835 msgid "Unmounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:585 +#: apt-pkg/cdrom.cc:586 #, c-format msgid "Using CD-ROM mount point %s\n" msgstr "" -#: apt-pkg/cdrom.cc:603 +#: apt-pkg/cdrom.cc:604 msgid "Unmounting CD-ROM\n" msgstr "" -#: apt-pkg/cdrom.cc:607 +#: apt-pkg/cdrom.cc:608 msgid "Waiting for disc...\n" msgstr "" #. Mount the new CDROM -#: apt-pkg/cdrom.cc:615 +#: apt-pkg/cdrom.cc:616 msgid "Mounting CD-ROM...\n" msgstr "" -#: apt-pkg/cdrom.cc:633 +#: apt-pkg/cdrom.cc:634 msgid "Scanning disc for index files..\n" msgstr "" -#: apt-pkg/cdrom.cc:673 +#: apt-pkg/cdrom.cc:674 #, c-format msgid "" "Found %zu package indexes, %zu source indexes, %zu translation indexes and %" "zu signatures\n" msgstr "" -#: apt-pkg/cdrom.cc:684 +#: apt-pkg/cdrom.cc:685 msgid "" "Unable to locate any package files, perhaps this is not a Debian Disc or the " "wrong architecture?" msgstr "" -#: apt-pkg/cdrom.cc:710 +#: apt-pkg/cdrom.cc:711 #, c-format msgid "Found label '%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:739 +#: apt-pkg/cdrom.cc:740 msgid "That is not a valid name, try again.\n" msgstr "" -#: apt-pkg/cdrom.cc:755 +#: apt-pkg/cdrom.cc:756 #, c-format msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -#: apt-pkg/cdrom.cc:759 +#: apt-pkg/cdrom.cc:760 msgid "Copying package lists..." msgstr "" -#: apt-pkg/cdrom.cc:785 +#: apt-pkg/cdrom.cc:786 msgid "Writing new source list\n" msgstr "" -#: apt-pkg/cdrom.cc:794 +#: apt-pkg/cdrom.cc:795 msgid "Source list entries for this disc are:\n" msgstr "" @@ -2718,12 +2748,12 @@ msgstr "" msgid "Installing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 +#: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:724 #, c-format msgid "Configuring %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 +#: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:731 #, c-format msgid "Removing %s" msgstr "" @@ -2738,56 +2768,61 @@ msgstr "" msgid "Running post-installation trigger %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:558 +#: apt-pkg/deb/dpkgpm.cc:569 #, c-format msgid "Directory '%s' missing" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:654 +#: apt-pkg/deb/dpkgpm.cc:584 apt-pkg/deb/dpkgpm.cc:597 +#, c-format +msgid "Could not open file '%s'" +msgstr "" + +#: apt-pkg/deb/dpkgpm.cc:717 #, c-format msgid "Preparing %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:655 +#: apt-pkg/deb/dpkgpm.cc:718 #, c-format msgid "Unpacking %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:660 +#: apt-pkg/deb/dpkgpm.cc:723 #, c-format msgid "Preparing to configure %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:662 +#: apt-pkg/deb/dpkgpm.cc:725 #, c-format msgid "Installed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:667 +#: apt-pkg/deb/dpkgpm.cc:730 #, c-format msgid "Preparing for removal of %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:669 +#: apt-pkg/deb/dpkgpm.cc:732 #, c-format msgid "Removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:674 +#: apt-pkg/deb/dpkgpm.cc:737 #, c-format msgid "Preparing to completely remove %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:675 +#: apt-pkg/deb/dpkgpm.cc:738 #, c-format msgid "Completely removed %s" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:879 +#: apt-pkg/deb/dpkgpm.cc:942 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -#: apt-pkg/deb/dpkgpm.cc:909 +#: apt-pkg/deb/dpkgpm.cc:972 msgid "Running dpkg" msgstr "" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -151,7 +151,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -247,7 +247,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "تعذرت الكتابة إلى %s" @@ -343,7 +343,7 @@ msgstr "قاعدة البيانات قديمة، محاولة ترقية %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -358,11 +358,11 @@ msgstr "تعذر فتح ملف قاعدة البيانات %s: %s" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -427,26 +427,26 @@ msgstr "*** فشل ربط %s بـ%s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -550,7 +550,7 @@ msgstr "فشل تغيير اسم %s إلى %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -711,11 +711,11 @@ msgstr "حزم بحاجة للإزالة لكن الإزالة مُعطّلة." msgid "Internal error, Ordering didn't finish" msgstr "خطأ داخلي، لم تنته عملية الترتيب" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "تعذر قَفْل دليل التنزيل" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "تعذرت قراءة قائمة المصادر." @@ -744,8 +744,8 @@ msgstr "بعد الاستخراج %sب من المساحة الإضافيّة س msgid "After this operation, %sB disk space will be freed.\n" msgstr "بعد الاستخراج %sب من المساحة ستفرّغ.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "تعذر حساب المساحة الحرة في %s" @@ -782,7 +782,7 @@ msgstr "إجهاض." msgid "Do you want to continue [Y/n]? " msgstr "هل تريد الاستمرار [Y/n]؟" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "فشل إحضار %s %s\n" @@ -791,7 +791,7 @@ msgstr "فشل إحضار %s %s\n" msgid "Some files failed to download" msgstr "فشل تنزيل بعض الملفات" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "اكتمل التنزيل وفي وضع التنزيل فقط" @@ -885,51 +885,51 @@ msgstr "تعذر العثور على النسخة '%s' للحزمة '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "النسخة المحددة %s (%s) للإصدارة %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "لا يقبل الأمر update أية مُعطيات" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "تعذر قفل دليل القائمة" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "سيتم تثبيت الحزم الجديدة التالية:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -945,51 +945,51 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "قد تساعد المعلومات التالية في حل المشكلة:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "خطأ داخلي، عطب AllUpgrade بعض الأشياء" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "تعذر العثور على الحزمة %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "لاحظ، تحديد %s بسبب صيغة regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "إلا أنه سيتم تثبيت %s" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "قد ترغب بتشغيل `apt-get -f install' لتصحيح هذه:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "مُعتمدات غير مستوفاة. جرب 'apt-get -f install' بدون أسماء حزم (أو حدّد حلاً)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -997,152 +997,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "حزم معطوبة" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "سيتم تثبيت الحزم الإضافيّة التالية:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "الحزم المقترحة:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "الحزم المستحسنة:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "حساب الترقية..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "فشل" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "تمّ" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "يجب تحديد حزمة واحدة على الأقل لجلب مصدرها" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "تعذر العثور على مصدر الحزمة %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "تخطي الملف '%s' المنزل مسبقاً\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "ليس هناك مساحة كافية في %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "يجب جلب %sب/%sب من الأرشيفات المصدرية.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "يجب جلب %sب من الأرشيفات المصدريّة.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "إحضار المصدر %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "فشل إحضار بعض الأرشيفات." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "أمر فك الحزمة '%s' فشل.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "أمر البناء '%s' فشل.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, 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:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "الوحدات المدعومة:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1186,7 +1186,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1421,11 +1421,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "تعذرت قراءة %s" @@ -1455,9 +1454,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "قراءة قوائم الحزم" @@ -1588,11 +1587,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 "فشل تعيين وقت التعديل" @@ -1654,7 +1653,7 @@ msgstr "انتهى وقت الاتصال" msgid "Server closed the connection" msgstr "أغلق الخادم الاتصال" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "خطأ في القراءة" @@ -1666,7 +1665,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "خطأ في الكتابة" @@ -1720,7 +1719,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "تعذر قبول الاتصال" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1784,58 +1783,63 @@ msgstr "تعذر الاتصال بـ%s:%s (%s)." msgid "Connecting to %s" msgstr "الاتصال بـ%s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "تعذر الاتصال بـ%s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "إجهاض التثبيت." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1884,48 +1888,48 @@ msgstr "خادم http له دعم مدى معطوب" msgid "Unknown date format" msgstr "نسق تاريخ مجهول" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "فشل التحديد" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "انتهى وقت الاتصال" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "خطأ في الكتابة إلى ملف المُخرجات" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "خطأ في الكتابة إلى الملف" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "خطأ في القراءة من الخادم. أقفل الطرف الآخر الاتصال" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "خطأ في القراءة من الخادم" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "فشلت كتابة الملف %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "بيانات ترويسة سيئة" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "فشل الاتصال" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "خطأ داخلي" @@ -1933,18 +1937,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 @@ -1974,52 +1985,52 @@ msgstr "" msgid "Selection %s not found" msgstr "تعذر العثور على التحديد %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "اختصار نوع مجهول: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "فتح ملف التهيئة %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2095,75 +2106,75 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "مشكلة في إغلاق الملف" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "مشكلة في مزامنة الملف" @@ -2281,52 +2292,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "فتح %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2443,17 +2454,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "قد يساعدك تنفيذ الأمر apt-get update في تصحيح هذه المشاكل" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2537,16 +2548,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2555,40 +2566,40 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "فشل إعادة التسمية ، %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum غير متطابقة" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, 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:1319 #, 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:1360 #, 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:1447 msgid "Size mismatch" msgstr "الحجم غير متطابق" @@ -2720,7 +2731,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "فتح ملف التهيئة %s" @@ -2751,7 +2761,6 @@ msgstr "إزالة %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "تمت إزالة %s بالكامل" @@ -2835,8 +2844,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 @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-07-01 18:09+0100\n" "Last-Translator: Marcos Alvarez Costales <marcos.alvarez.costales@gmail." "com>\n" @@ -143,7 +143,7 @@ msgstr " Tabla de versiones:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pa %s compilu en %s %s\n" @@ -299,7 +299,7 @@ msgstr "" "-o=? Afita una opcin de configuracin arbitraria, p. ej. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nun se pue escribir en %s" @@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "La DB ye antigua, tentando actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "El formatu de la base de datos nun ye vlidu. Si anovaste dende una versin " @@ -451,11 +452,11 @@ msgstr "Nun pudo abrise'l ficheru de BD %s: %s" msgid "Failed to stat %s" msgstr "Nun pudo lleese %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "L'archivu nun tien rexistru de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nun pudo algamase un cursor" @@ -520,26 +521,26 @@ msgstr "*** Fall enllazar enllazr %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Alcanzose'l llmite of %sB de desenllaz.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "L'archivu nun tien el campu paquetes" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nun tien la entrada saltos\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el curiador de %s ye %s y non %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nun tien la entrada saltos de fonte\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco nun tiene una entrada binaria de saltos\n" @@ -643,7 +644,7 @@ msgstr "Nun pudo renomase %s como %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin d'espresin regular - %s" @@ -804,11 +805,11 @@ msgstr "Fai falta desaniciar los paquetes pero desaniciar ta torgu." msgid "Internal error, Ordering didn't finish" msgstr "Error internu, ordenar nun fin" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nun pue bloquiase'l direutoriu de descarga" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nun pudo lleese la llista de fontes." @@ -837,8 +838,8 @@ msgstr "Tres d'esta operacin, van usase %sB d'espaciu de discu adicional.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Tres d'esta operacin, van lliberase %sB d'espaciu de discu.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nun pue determinase l'espaciu llibre de %s" @@ -875,7 +876,7 @@ msgstr "Encaboxar." msgid "Do you want to continue [Y/n]? " msgstr "Quies continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fall algamar %s %s\n" @@ -884,7 +885,7 @@ msgstr "Fall algamar %s %s\n" msgid "Some files failed to download" msgstr "Dellos ficheros nun pudieron descargase" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descarga completa y en mou de slo descarga" @@ -981,35 +982,35 @@ msgstr "Nun s'alcontr la versin '%s' pa '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "Escoyida la versin %s (%s) pa %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "La orde update nun lleva argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nun pudo bloquiase'l direutoriu de llista" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1017,18 +1018,18 @@ msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Los siguientes paquetes instalaronse de manera automtica y ya nun se " "necesiten:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Usa 'apt-get autoremove' pa desinstalalos." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,43 +1047,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin pue aidar a resolver la situacin:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error internu, AutoRemover rompi coses" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error internu, AllUpgrade rompi coses" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nun pudo alcontrase la tarea %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nun pudo alcontrase'l paquete %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, escoyendo %s pa la espresin regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s axustu como instalu manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Habres d'executar `apt-get -f install' para iguar estos:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1090,7 +1091,7 @@ msgstr "" "Dependencies ensin cubrir. Tenta 'apt-get -f install' ensin paquetes (o " "consea una solucin)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1102,117 +1103,117 @@ msgstr "" "inestable, que dellos paquetes necesarios nun se crearon o que\n" "s'allugaron fuera d'Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquetes fraaos" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Instalarnse los siguientes paquetes extra:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquetes afalaos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquetes encamentaos" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculando l'autualizacin... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Fecho" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Error internu, l'iguador de problemes fra coses" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Has de consear polo menos un paquete p'algamar so fonte" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nun pudo alcontrase un paquete fonte pa %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Saltando'l ficheru y descargu '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nun hai espaciu llibre bastante en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Hai falta descargar %sB d'archivos fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Fonte descargada %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Fall la descarga de dellos archivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Saltando'l desempaquetu de la fonte y desempaquetada en %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orde de desempaquetu '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Comprueba qu'el paquete 'dpkg-dev' ta instalu.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orde build '%s'.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Fall el procesu fu" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Hai que consear polo menos un paquete pa verificar les dependencies de " "construccin" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nun pudo algamase informacin de dependencies de construccin pa %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nun tien dependencies de construccin.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1221,7 +1222,7 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque nun se puede atopar el " "paquete %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1230,32 +1231,32 @@ msgstr "" "La dependencia %s en %s nun puede satisfacese porque denguna versin " "disponible del paquete %s satisfaz los requisitos de versin" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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 instalu %s ye " "demasiao nuevu" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Les dependencies de construccin de %s nun pudieron satisfacese." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Fallu al procesar les dependencies de construccin" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mdulos sofitaos:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1341,7 +1342,7 @@ msgstr "" "pa ms informacin y opciones.\n" " Esti APT tien Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1595,11 +1596,10 @@ msgstr "El ficheru %s/%s sobreescribe al que ta nel paquete %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nun ye a lleer %s" @@ -1630,9 +1630,9 @@ msgstr "" "Los direutorios info y temp tienen de tar nel mesmu sistema de ficheros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Lleendo llista de paquetes" @@ -1766,11 +1766,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 modificacin" @@ -1832,7 +1832,7 @@ msgstr "Gandi'l tiempu de conexn" msgid "Server closed the connection" msgstr "El sirvidor zarr la conexn" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Fallu de llectura" @@ -1844,7 +1844,7 @@ msgstr "Una rempuesta revirti'l buffer." msgid "Protocol corruption" msgstr "Corrupcin del protocolu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Fallu d'escritura" @@ -1898,7 +1898,7 @@ msgstr "Gandi'l tiempu de conexn col zcalu de datos" msgid "Unable to accept connection" msgstr "Nun se pudo aceptar la conexn" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hebo un problema al xenerar el hash del ficheru" @@ -1962,60 +1962,65 @@ msgstr "Nun se pudo coneutar a %s:%s (%s)." msgid "Connecting to %s" msgstr "Coneutando a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nun se pudo resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallu temporal al resolver '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Daqu raru pas resolviendo '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nun se pudo coneutar a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nun se pudo acceder al aniellu de claves '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Encaboxando la instalacin." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Llista d'argumentos d'Acquire::gpgv::Options demasiao llarga. Colando." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Fallu internu: Robla bona, pero nun se pudo determinar la so gella dixital?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Atopse polo menos una robla mala." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Nun se pudo executar '%s' pa verificar la robla (ta instalu gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Fallu desconocu al executar gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Les siguientes robles nun valieron:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2066,47 +2071,47 @@ msgstr "Esti sirvidor HTTP tien rotu'l soporte d'alcance" msgid "Unknown date format" msgstr "Formatu de data desconocu" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Fall la escoyeta" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Gandi'l tiempu de conexn" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fallu al escribir nel ficheru de salida" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fallu al escribir nel ficheru" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Fallu al lleer nel sirvidor. El llau remotu zarr la conexn." -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fallu al lleer nel sirvidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Fall al francer el ficheru" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Datos de testera incorreutos" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Fallo la conexn" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Fallu internu" @@ -2114,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. " @@ -2128,6 +2133,13 @@ msgstr "" "Dynamic MMap escos l'espaciu. Por favor aumenta'l tamau 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 @@ -2157,53 +2169,53 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "Escoyeta %s que nun s'atopa" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Triba d'abreviatura que nun se reconoz: %c" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo ficheros de configuracin %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Fallu de sintaxis %s:%u: Nun hai un nome al entamu del bloque." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Fallu de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Fallu de sintaxis %s:%u: Puxarra extra dempus del valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Les directives pueden facese slo nel nivel cimeru" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Fallu de sintaxis %s:%u: Demasiaes inclusiones aeraes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Fallu de sintaxis %s:%u: Incluyendo dende equ" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: La directiva '%s' nun ta sofitada" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Fallu de sintaxis %s:%u: Puxarra extra al final del ficheru" @@ -2279,75 +2291,75 @@ msgstr "Nun se pudo cambiar a %s" msgid "Failed to stat the cdrom" msgstr "Nun se pudo montar el CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nun ta usndose bloquu pal ficheru de bloquu de slo llectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nun puede abrise'l ficheru de bloquu %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nun ta usndose bloquu pal ficheru de bloquu %s montu per nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nun se pudo torgar %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero nun taba ell" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subprocesu %s recibi un fallu de segmentacin." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "El subprocesu %s recibi un fallu de segmentacin." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subprocesu %s devolvi un cdigu d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subprocesu %s termin de manera inesperada" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nun se pudo abrir el ficheru %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lleos, ent tena de lleer %lu pero nun queda nada" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, ent tena d'escribir %lu pero nun pudo facerse" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problemes zarrando'l ficheru" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Hai problemes desvenceyando'l ficheru %s" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Hai problemes al sincronizar el ficheru" @@ -2464,52 +2476,52 @@ msgstr "Nun se pudo tratar el ficheru de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nun se pudo tratar el ficheru de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals d'URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Llinia %lu mal formada na llista d'orxenes %s (anals de dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinia %u demasiao llarga na llista d'orgenes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinia %u mal formada na llista d'orxenes %s (triba)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Triba '%s' desconocida na llinia %u de la llista d'orxenes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinia %u mal formada na llista d'orxenes %s (id del proveedor)" @@ -2635,18 +2647,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Has d'executar apt-get update pa iguar estos problemes" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Rexistru invlidu nel ficheru de preferencies, nun hai cabecera Paquete" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nun s'entiende'l tipu de pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nun hai priorid (o ye cero) conseada pa pin" @@ -2731,16 +2743,16 @@ msgstr "Hebo un error al procesar %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Al procesar dependencies de ficheros nun s'alcontr el paquete %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nun se puede lleer la llista de paquetes d'orxenes %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Recoyendo ficheros qu'apurren" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Fallu de E/S al grabar cach d'orxenes" @@ -2749,19 +2761,19 @@ msgstr "Fallu de E/S al grabar cach d'orxenes" 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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "La suma hash nun concasa" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Nun hai clave pblica denguna disponible pa les IDs de clave darru:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2770,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2779,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:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2787,7 +2799,7 @@ msgstr "" "Los ficheros d'indiz de paquetes tan corrompos. Nun hai campu Filename: pal " "paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "El tamau nun concasa" @@ -2924,7 +2936,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Abriendo ficheros de configuracin %s" @@ -2935,7 +2946,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "La suma hash nun concasa" @@ -2956,7 +2966,6 @@ msgstr "Desinstalando %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Desinstalse dafechu %s" @@ -3042,14 +3051,30 @@ msgstr "" msgid "Not locked" msgstr "Non bloquiu" -#: 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 "Conexn encaboxada prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nun se pudo acceder al aniellu de claves '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Nun fui quien a parchiar el ficheru" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -151,7 +151,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s за %s компилиран на %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -o=? Настройване на произволна конфигурационна опция, т.е. -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Неуспех при записа на %s" @@ -446,8 +446,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "БД е стара, опит за актуализиране на %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Форматът на БД е невалиден. Ако сте обновили от стара версия на apt, " @@ -464,11 +465,11 @@ msgstr "Неуспех при отварянето на файл %s от БД: % msgid "Failed to stat %s" msgstr "Грешка при получаването на атрибути за %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архива няма поле „control“" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Неуспех при получаването на курсор" @@ -533,26 +534,26 @@ msgstr "*** Неуспех при създаването на връзка %s к msgid " DeLink limit of %sB hit.\n" msgstr "Превишен лимит на DeLink от %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Архивът няма поле „package“" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s няма запис „override“\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " поддържащия пакета %s е %s, а не %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s няма запис „source override“\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s няма също и запис „binary override“\n" @@ -656,7 +657,7 @@ msgstr "Неуспех при преименуването на %s на %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Грешка при компилирането на регулярния израз - %s" @@ -819,11 +820,11 @@ msgstr "Трябва да бъдат премахнати пакети, но п msgid "Internal error, Ordering didn't finish" msgstr "Вътрешна грешка, „Ordering“ не завърши" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Неуспех при заключването на директорията за изтегляне" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Списъкът с източници не можа да бъде прочетен." @@ -855,8 +856,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "След тази операция ще бъде освободено %sB дисково пространство.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Неуспех при определянето на свободното пространство в %s" @@ -893,7 +894,7 @@ msgstr "Прекъсване." msgid "Do you want to continue [Y/n]? " msgstr "Искате ли да продължите [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Неуспех при изтеглянето на %s %s\n" @@ -902,7 +903,7 @@ msgstr "Неуспех при изтеглянето на %s %s\n" msgid "Some files failed to download" msgstr "Някои файлове не можаха да бъдат изтеглени" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Изтеглянето завърши в режим само на изтегляне" @@ -999,53 +1000,53 @@ msgstr "Не е намерена версия „%s“ на „%s“" msgid "Selected version %s (%s) for %s\n" msgstr "Избрана е версия %s (%s) за %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Командата „update“ не възприема аргументи" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Неуспех при заключването на директорията със списъка на пакетите" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не би трябвало да се изтрива. AutoRemover няма да бъде стартиран" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Следните пакети са били инсталирани автоматично и вече не са необходими:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Използвайте „apt-get autoremove“ за да ги премахнете." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1063,44 +1064,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" "Следната информация може да помогне за намиране на изход от ситуацията:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Вътрешна грешка, AutoRemover счупи нещо в системата" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Вътрешна грешка, „AllUpgrade“ счупи нещо в системата" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Неуспех при намирането на задача %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Неуспех при намирането на пакет %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Забележете, избиране на %s за регулярен израз „%s“\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s е отбелязан като ръчно инсталиран.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Възможно е да изпълните „apt-get -f install“, за да коригирате:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1108,7 +1109,7 @@ msgstr "" "Неудовлетворени зависимости. Опитайте „apt-get -f install“ без пакети (или " "укажете разрешение)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1120,118 +1121,118 @@ msgstr "" "дистрибуция, че някои необходими пакети още не са създадени или пък\n" "са били преместени от Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Счупени пакети" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Следните допълнителни пакети ще бъдат инсталирани:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Предложени пакети:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Препоръчвани пакети:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Изчисляване на актуализацията..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Неуспех" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Вътрешна грешка, „problem resolver“ счупи нещо в системата" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Трябва да укажете поне един пакет за изтегляне на изходния му код" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Неуспех при намирането на изходен код на пакет %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускане на вече изтегления файл „%s“\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Нямате достатъчно свободно пространство в %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB/%sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо е да се изтеглят %sB архиви изходен код.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Изтегляне на изходен код %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Неуспех при изтеглянето на някои архиви." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Пропускане на разпакетирането на вече разпакетирания изходен код в %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Командата за разпакетиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверете дали имате инсталиран пакета „dpkg-dev“.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Командата за компилиране „%s“ пропадна.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Процесът-потомък пропадна" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Трябва да укажете поне един пакет за проверка на зависимости за компилиране" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Неуспех при получаването на информация за зависимостите за компилиране на %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s няма зависимости за компилиране.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1240,7 +1241,7 @@ msgstr "" "Зависимост %s за пакета %s не може да бъде удовлетворена, понеже пакета %s " "не може да бъде намерен" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1250,32 +1251,32 @@ msgstr "" "налични версии на пакета %s, които могат да удовлетворят изискването за " "версия" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Неуспех при удовлетворяването на зависимост %s за пакета %s: Инсталираният " "пакет %s е твърде нов" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неуспех при удовлетворяването на зависимост %s за пакета %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимостите за компилиране на %s не можаха да бъдат удовлетворени." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Неуспех при обработката на зависимостите за компилиране" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Поддържани модули:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1362,7 +1363,7 @@ msgstr "" "информация и опции.\n" " Това APT има Върховни Сили.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1609,11 +1610,10 @@ msgstr "Файл %s/%s заменя този в пакет %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Неуспех при четенето на %s" @@ -1644,9 +1644,9 @@ msgstr "" "Директориите info и temp трябва да бъдат на една и съща файлова система" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Четене на списъците с пакети" @@ -1780,11 +1780,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 "Неуспех при задаването на време на промяна" @@ -1846,7 +1846,7 @@ msgstr "Допустимото време за свързването изтеч msgid "Server closed the connection" msgstr "Сървърът разпадна връзката" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Грешка при четене" @@ -1858,7 +1858,7 @@ msgstr "Отговорът препълни буфера." msgid "Protocol corruption" msgstr "Развален протокол" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Грешка при запис" @@ -1914,7 +1914,7 @@ msgstr "Времето за установяване на връзка с гне msgid "Unable to accept connection" msgstr "Невъзможно е да се приеме свързването" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблем при хеширане на файла" @@ -1978,64 +1978,69 @@ msgstr "Неуспех при свързване с %s:%s (%s)." msgid "Connecting to %s" msgstr "Свързване с %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временен неуспех при намирането на IP адреса на „%s“" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Нещо лошо се случи при намирането на IP адреса на „%s:%s“ (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Неуспех при свързването с %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Неуспех при достъпа до набор на ключове: „%s“" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Прекъсване на инсталирането." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Списъкът с аргументи от Acquire::gpgv::Options е твърде дълъг. Завършване " "на работа." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Вътрешна грешка: Валиден подпис, но не може да се провери отпечатъка на " "ключа?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Намерен е поне един невалиден подпис." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Неуспех при изпълнението на „%s“ за проверка на подписа (инсталиран ли е " "gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Неизвестна грешка при изпълнението на gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Следните подписи са невалидни:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2086,47 +2091,47 @@ msgstr "HTTP сървърът няма поддръжка за прехвърл msgid "Unknown date format" msgstr "Неизвестен формат на дата" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Неуспех на избора" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Допустимото време за свързване изтече" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Грешка при записа на изходен файл" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Грешка при записа на файл" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Грешка при записа на файла" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Грешка при четене от сървъра. Отдалеченият сървър прекъсна връзката" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Грешка при четене от сървъра" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Неуспех при отрязване на края на файла" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Невалидни данни на заглавната част" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Неуспех при свързването" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Вътрешна грешка" @@ -2134,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 @@ -2175,54 +2187,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Изборът %s не е намерен" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестен тип на абревиатура: „%c“" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Отваряне на конфигурационен файл %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтактична грешка %s:%u: В началото на блока няма име." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтактична грешка %s:%u: Лошо форматиран таг" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтактична грешка %s:%u: Излишни символи след стойността" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтактична грешка %s:%u: Директиви могат да се задават само в най-горното " "ниво" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтактична грешка %s:%u: Твърде много вложени „include“" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтактична грешка %s:%u: Извикан „include“ оттук" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтактична грешка %s:%u: Неподдържана директива „%s“" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтактична грешка %s:%u: Излишни символи в края на файла" @@ -2298,78 +2310,78 @@ msgstr "Неуспех при преминаването в %s" msgid "Failed to stat the cdrom" msgstr "Неуспех при намирането на атрибутите на cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е само за четене" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Неуспех при отварянето на файл за заключване %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Не се използва заключване за файл за заключване %s, който е монтиран по NFS" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Неуспех при достъпа до заключване %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Изчака се завършването на %s, но той не беше пуснат" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Нарушение на защитата на паметта (segmentation fault) в подпроцеса %s." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Подпроцесът %s върна код за грешка (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Подпроцесът %s завърши неочаквано" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Неуспех при отварянето на файла %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "грешка при четене, все още има %lu за четене, но няма нито един останал" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "грешка при запис, все още име %lu за запис, но не успя" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Проблем при затварянето на файла" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Проблем при премахването на връзка към файла" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Проблем при синхронизиране на файла" @@ -2486,54 +2498,54 @@ msgstr "Неуспех при анализирането на пакетен ф msgid "Unable to parse package file %s (2)" msgstr "Неуспех при анализирането на пакетен файл %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (адрес-URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (дистрибуция)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Лошо форматиран ред %lu в списъка с източници %s (анализ на адрес-URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (неограничена дистрибуция)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Лошо форматиран ред %lu в списъка с източници %s (анализ на дистрибуция)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Отваряне на %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Ред %u в списъка с източници %s е твърде дълъг." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Лошо форматиран ред %u в списъка с източници %s (тип)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Типът „%s“ на ред %u в списъка с източници %s е неизвестен." -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2666,17 +2678,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Може да искате да изпълните „apt-get update“, за да коригирате тези проблеми" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Невалиден запис във файла с настройки, няма заглавна част Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестен тип за отбиване %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Няма указан приоритет (или е нула) на отбиването" @@ -2764,17 +2776,17 @@ msgstr "Възникна грешка при обработката на %s (Col msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакетът %s %s не беше открит при обработката на файла със зависимости" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" "Неуспех при получаването на атрибути на списъка с пакети с изходен код %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Събиране на информация за „Осигурява“" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Входно/изходна грешка при запазването на кеша на пакети с изходен код" @@ -2783,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:432 msgid "MD5Sum mismatch" msgstr "Несъответствие на контролна сума MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Несъответствие на контролната сума" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2804,7 +2816,7 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет (поради пропусната архитектура)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2813,14 +2825,14 @@ msgstr "" "Неуспех при намирането на файл за пакет %s. Това може да означава, че трябва " "ръчно да оправите този пакет." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "Несъответствие на размера" @@ -2955,7 +2967,6 @@ msgstr "Записани са %i записа с %i липсващи и %i не #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Отваряне на конфигурационен файл %s" @@ -2966,7 +2977,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Несъответствие на контролната сума" @@ -2987,7 +2997,6 @@ msgstr "Премахване на %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s е напълно премахнат" @@ -3073,14 +3082,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Неуспех при достъпа до набор на ключове: „%s“" + +#~ msgid "Could not patch file" +#~ msgstr "Неуспех при закърпване на файла" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -147,7 +147,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -254,7 +254,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Ne mogu zapisati na %s" @@ -351,7 +351,7 @@ msgstr "DB je stara, pokušavam nadogradnju %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -366,11 +366,11 @@ msgstr "Ne mogu otvoriti DB datoteku %s" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nema kontrolnog zapisa" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -435,26 +435,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -558,7 +558,7 @@ msgstr "" msgid "Y" msgstr "" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -719,11 +719,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -752,8 +752,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "" @@ -788,7 +788,7 @@ msgstr "Odustani." msgid "Do you want to continue [Y/n]? " msgstr "Da li želite nastaviti? [Y/n]" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "" @@ -797,7 +797,7 @@ msgstr "" msgid "Some files failed to download" msgstr "" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "" @@ -889,51 +889,51 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, 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:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -949,49 +949,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ali se %s treba instalirati" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -999,152 +999,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Oštećeni paketi" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Predloženi paketi:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Preporučeni paketi:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Računam nadogradnju..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Neuspješno" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Urađeno" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, 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:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Podržani moduli:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1188,7 +1188,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1418,11 +1418,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ne mogu čitati %s" @@ -1452,9 +1451,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Čitam spiskove paketa" @@ -1585,11 +1584,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 "" @@ -1649,7 +1648,7 @@ msgstr "" msgid "Server closed the connection" msgstr "Server je zatvorio vezu" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Greška pri čitanju" @@ -1662,7 +1661,7 @@ msgstr "" msgid "Protocol corruption" msgstr "Oštećenje protokola" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Greška pri pisanju" @@ -1716,7 +1715,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1780,59 +1779,64 @@ msgstr "" msgid "Connecting to %s" msgstr "Povezujem se sa %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ne mogu se povezati sa %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Odustajem od instalacije." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Slijedeći dodatni paketi će biti instalirani:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1881,48 +1885,48 @@ msgstr "" msgid "Unknown date format" msgstr "Nepoznat oblik datuma" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Ne mogu ukloniti %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Povezivanje neuspješno" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Unutrašnja greška" @@ -1930,18 +1934,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 @@ -1971,52 +1982,52 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2092,75 +2103,75 @@ msgstr "" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "" @@ -2279,52 +2290,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otvaram %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2441,17 +2452,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2535,16 +2546,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2553,39 +2564,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, 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:1319 #, 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:1360 #, 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:1447 msgid "Size mismatch" msgstr "" @@ -2830,8 +2841,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 @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.22\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -148,7 +148,7 @@ msgstr " Taula de versió:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -302,7 +302,7 @@ msgstr "" " -c=? Llegeix aquest fitxer de configuració\n" " -o=? Estableix una opció de conf arbitrària, p.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "No es pot escriure en %s" @@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "La BD és vella, s'està intentant actualitzar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "El format de la base de dades és invàlid. Si heu actualitzat des d'una " @@ -454,11 +455,11 @@ msgstr "No es pot obrir el fitxer de DB %s: %s" msgid "Failed to stat %s" msgstr "No es pot determinar l'estat de %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arxiu sense registre de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No es pot aconseguir un cursor" @@ -523,26 +524,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arxiu sense el camp paquet" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s no té una entrada dominant\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el mantenidor de %s és %s, no %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s no té una entrada dominant de font\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s no té una entrada dominant de binari\n" @@ -646,7 +647,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:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "S'ha produït un error de compilació de l'expressió regular - %s" @@ -810,11 +811,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 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:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: 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." @@ -845,8 +846,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "No s'ha pogut determinar l'espai lliure en %s" @@ -883,7 +884,7 @@ msgstr "Avortat." msgid "Do you want to continue [Y/n]? " msgstr "Voleu continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "No s'ha pogut obtenir %s %s\n" @@ -892,7 +893,7 @@ msgstr "No s'ha pogut obtenir %s %s\n" msgid "Some files failed to download" msgstr "Alguns fitxers no s'han pogut baixar" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descàrrega completa i en mode de només descàrrega" @@ -990,54 +991,54 @@ msgstr "No s'ha trobat la versió «%s» per a «%s»" msgid "Selected version %s (%s) for %s\n" msgstr "Versió seleccionada %s (%s) per a %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "L'ordre update no pren arguments" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "No es pot blocar el directori de la llista" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 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:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empreu «apt-get autoremove» per a suprimir-los." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1055,43 +1056,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 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:1528 +#: cmdline/apt-get.cc:1538 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:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error intern, AllUpgrade ha trencat coses" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "No s'ha pogut trobar la tasca %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "No s'ha pogut trobar el paquet %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, 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:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "S'ha marcat %s com instal·lat manualment.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1099,7 +1100,7 @@ msgstr "" "Dependències insatisfetes. Intenteu 'apt-get -f install' sense paquets (o " "especifiqueu una solució)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,120 +1112,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:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquets trencats" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "S'instal·laran els següents paquets extres:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquets suggerits:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquets recomanats:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "S'està calculant l'actualització... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Ha fallat" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Fet" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 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:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, 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:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "S'està ometent el fitxer ja baixat «%s»\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "No teniu prou espai lliure en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Es necessita baixar %sB d'arxius font.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obté el font %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "No s'ha pogut baixar alguns arxius." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "L'ordre de desempaquetar «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "L'ordre de construir «%s» ha fallat.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Ha fallat el procés fill" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, 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:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s no té dependències de construcció.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1233,7 +1234,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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1242,32 +1243,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:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, 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:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "No es poden processar les dependències de construcció" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mòduls suportats:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1353,7 +1354,7 @@ msgstr "" "per a obtenir més informació i opcions.\n" " Aquest APT té superpoders bovins\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1603,11 +1604,10 @@ msgstr "El fitxer %s/%s sobreescriu al que està en el paquet %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "No es pot llegir %s" @@ -1639,9 +1639,9 @@ msgstr "" "fitxers" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "S'està llegint la llista de paquets" @@ -1775,11 +1775,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ó" @@ -1841,7 +1841,7 @@ msgstr "Temps de connexió finalitzat" msgid "Server closed the connection" msgstr "El servidor ha tancat la connexió" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1853,7 +1853,7 @@ msgstr "Una resposta ha desbordat la memòria temporal." msgid "Protocol corruption" msgstr "Protocol corromput" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Error d'escriptura" @@ -1908,7 +1908,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:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema escollint el fitxer" @@ -1972,64 +1972,69 @@ msgstr "No s'ha pogut connectar amb %s:%s (%s)." msgid "Connecting to %s" msgstr "S'està connectant amb %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "No s'ha pogut resoldre '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "S'ha produït un error temporal en resoldre '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "No es pot connectar amb %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "S'està avortant la instal·lació." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: La llista d'arguments d'Acquire::gpgv::Options és massa llarga. S'està " "sortint." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error intern: La signatura és correcta, però no s'ha pogut determinar " "l'emprempta digital de la clau!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "S'ha trobat almenys una signatura invàlida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "No s'ha pogut executar «%s» per a verificar la signatura (està instal·lat el " "gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "S'ha produït un error desconegut en executar el gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Les signatures següents són invàlides:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2080,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:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Ha fallat la selecció" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Connexió finalitzada" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "S'ha produït un error en escriure al fitxer de sortida" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "S'ha produït un error en escriure al fitxer" -#: methods/http.cc:891 +#: methods/http.cc:892 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "S'ha produït un error en llegir des del servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "No s'ha pogut truncar el fitxer %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Capçalera de dades no vàlida" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Ha fallat la connexió" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Error intern" @@ -2129,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. " @@ -2143,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 @@ -2172,52 +2184,52 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "No s'ha trobat la selecció %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreujament de tipus no reconegut: «%c»" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "S'està obrint el fitxer de configuració %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error sintàctic %s:%u: No comença el camp amb un nom." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error sintàctic %s:%u: Etiqueta malformada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error sintàctic %s:%u Text extra després del valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Error sintàctic %s:%u: Es permeten directrius només al nivell més alt" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error sintàctic %s:%u: Hi ha masses fitxers include niats" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error sintàctic %s:%u: Inclusió des d'aquí" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error sintàctic %s:%u: Directriu no suportada «%s»" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error sintàctic %s:%u: Text extra al final del fitxer" @@ -2293,76 +2305,76 @@ msgstr "No es pot canviar a %s" msgid "Failed to stat the cdrom" msgstr "No s'ha pogut fer «stat» del cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "No s'empren blocats per a llegir el fitxer de blocat de sols lectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "No es pot resoldre el fitxer de blocat %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No s'empren blocats per al fitxer de blocat %s de muntar nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "No s'ha pogut blocar %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperava %s però no hi era" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-procés %s ha rebut una violació de segment." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-procés %s ha retornat un codi d'error (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El sub-procés %s ha sortit inesperadament" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "No s'ha pogut obrir el fitxer %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "llegits, falten %lu per llegir, però no queda res" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrits, falten %lu per escriure però no s'ha pogut" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Ha hagut un problema en tancar el fitxer" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Ha hagut un problema en desenllaçar el fitxer" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Ha hagut un problema en sincronitzar el fitxer" @@ -2479,52 +2491,52 @@ msgstr "No es pot analitzar el fitxer del paquet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No es pot analitzar el fitxer del paquet %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Línia %lu malformada en la llista de fonts %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Línia %lu malformada en la llista de fonts %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Línia %lu malformada en la llista de fonts %s (analitzant dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "S'està obrint %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "La línia %u és massa llarga en la llista de fonts %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "La línia %u és malformada en la llista de fonts %s (tipus)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "El tipus «%s» no és conegut en la línia %u de la llista de fonts %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format 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)" @@ -2654,17 +2666,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Potser voldreu executar apt-get update per a corregir aquests problemes" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registre no vàlid al fitxer de preferències, paquet sense capçalera" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "No s'ha entès el pin de tipus %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "No hi ha prioritat especificada per al pin (o és zero)" @@ -2756,16 +2768,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "No s'ha trobat el paquet %s %s en processar les dependències del fitxer" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "No s'ha pogut llegir la llista de paquets font %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "S'estan recollint els fitxers que proveeixen" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Error d'E/S en desar la memòria cau de la font" @@ -2774,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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "La suma resum no concorda" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2796,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2805,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:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2813,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:1447 msgid "Size mismatch" msgstr "La mida no concorda" @@ -2950,7 +2962,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "S'està obrint el fitxer de configuració %s" @@ -2961,7 +2972,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "La suma resum no concorda" @@ -2982,7 +2992,6 @@ msgstr "S'està suprimint el paquet %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "S'ha suprimit completament el paquet %s" @@ -3068,14 +3077,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 "Couldn't access keyring: '%s'" +#~ msgstr "No s'ha pogut accedir a l'anell de claus: «%s»" + +#~ msgid "Could not patch file" +#~ msgstr "No s'ha pogut aplicar el pedaç al fitxer" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -146,7 +146,7 @@ msgstr " Tabulka verzí:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -298,7 +298,7 @@ msgstr "" " -c=? Načte tento konfigurační soubor\n" " -o=? Nastaví libovolnou volbu, např. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nemohu zapsat do %s" @@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB je stará, zkouším aktualizovat %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Formát databáze je neplatný. Pokud jste přešli ze starší verze apt, databázi " @@ -449,11 +450,11 @@ msgstr "Nemohu otevřít DB soubor %s: %s" msgid "Failed to stat %s" msgstr "Nemohu vyhodnotit %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiv nemá kontrolní záznam" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nemohu získat kurzor" @@ -518,26 +519,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archiv nemá pole Package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nemá žádnou položku pro override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " správce %s je %s, ne %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nemá žádnou zdrojovou položku pro override\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nemá ani žádnou binární položku pro override\n" @@ -641,7 +642,7 @@ msgstr "Selhalo přejmenování %s na %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Chyba při kompilaci regulárního výrazu - %s" @@ -802,11 +803,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nemohu zamknout adresář pro stahování" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nelze přečíst seznam zdrojů." @@ -836,8 +837,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nemohu určit volné místo v %s" @@ -874,7 +875,7 @@ msgstr "Přerušeno." msgid "Do you want to continue [Y/n]? " msgstr "Chcete pokračovat [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Selhalo stažení %s %s\n" @@ -883,7 +884,7 @@ msgstr "Selhalo stažení %s %s\n" msgid "Some files failed to download" msgstr "Některé soubory nemohly být staženy" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Stahování dokončeno v režimu pouze stáhnout" @@ -980,52 +981,52 @@ msgstr "Verze „%s“ pro „%s“ nebyla nalezena" msgid "Selected version %s (%s) for %s\n" msgstr "Vybraná verze %s (%s) pro %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Příkaz update neakceptuje žádné argumenty" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nemohu uzamknout list adresář" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 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:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Pro jejich odstranění použijte „apt-get autoremove“." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1043,43 +1044,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 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:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Vnitřní chyba, AutoRemover pokazil věci" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Vnitřní chyba, AllUpgrade pokazil věci" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nemohu najít úlohu %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nemohu najít balík %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, 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:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nastaven jako instalovaný ručně.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1087,7 +1088,7 @@ msgstr "" "Nesplněné závislosti. Zkuste spustit „apt-get -f install“ bez balíků (nebo " "navrhněte řešení)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1098,124 +1099,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:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Poškozené balíky" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Následující extra balíky budou instalovány:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Navrhované balíky:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Doporučované balíky:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Propočítávám aktualizaci... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Selhalo" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Hotovo" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Vnitřní chyba, řešitel problémů pokazil věci" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nemohu najít zdrojový balík pro %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Přeskakuji dříve stažený soubor „%s“\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, 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:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Stáhnout zdroj %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Stažení některých archivů selhalo." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Příkaz pro rozbalení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Příkaz pro sestavení „%s“ selhal.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Synovský proces selhal" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nemohu získat závislosti pro sestavení %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nemá žádné závislosti pro sestavení.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, 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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1224,31 +1225,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:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, 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:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Chyba při zpracování závislostí pro sestavení" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Podporované moduly:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1332,7 +1333,7 @@ msgstr "" "a apt.conf(5).\n" " Tato APT má schopnosti svaté krávy.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1577,11 +1578,10 @@ msgstr "Soubor %s/%s přepisuje ten z balíku %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nemohu číst %s" @@ -1611,9 +1611,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Adresáře info a temp musí být na stejném souborovém systému" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Čtu seznamy balíků" @@ -1747,11 +1747,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" @@ -1813,7 +1813,7 @@ msgstr "Čas spojení vypršel" msgid "Server closed the connection" msgstr "Server uzavřel spojení" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Chyba čtení" @@ -1825,7 +1825,7 @@ msgstr "Odpověď přeplnila buffer." msgid "Protocol corruption" msgstr "Porušení protokolu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Chyba zápisu" @@ -1879,7 +1879,7 @@ msgstr "Spojení datového socketu vypršelo" msgid "Unable to accept connection" msgstr "Nemohu přijmout spojení" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problém s hashováním souboru" @@ -1943,59 +1943,64 @@ msgstr "Nemohu se připojit k %s:%s (%s)." msgid "Connecting to %s" msgstr "Připojuji se k %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nemohu zjistit „%s“" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Dočasné selhání při zjišťování „%s“" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nemohu se připojit k %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nemohu přistoupit ke klíčence: „%s“" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Přerušuji instalaci." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Seznam argumentů Acquire::gpgv::Options je příliš dlouhý. Končím." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Vnitřní chyba: Dobrý podpis, ale nemohu zjistit otisk klíče?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Byl zaznamenán nejméně jeden neplatný podpis. " -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Nepodařilo se spustit „%s“ pro ověření podpisu (je gpgv nainstalováno?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Neznámá chyba při spouštění gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Následující podpisy jsou neplatné:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2046,47 +2051,47 @@ msgstr "Tento HTTP server má porouchanou podporu rozsahů" msgid "Unknown date format" msgstr "Neznámý formát data" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Výběr selhal" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Čas spojení vypršel" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Chyba zápisu do výstupního souboru" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Chyba zápisu do souboru" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Chyba čtení ze serveru. Druhá strana zavřela spojení" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Chyba čtení ze serveru" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Nelze zmenšit soubor" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Špatné datové záhlaví" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Spojení selhalo" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Vnitřní chyba" @@ -2094,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 @@ -2135,53 +2147,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Výběr %s nenalezen" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nerozpoznaná zkratka typu: „%c“" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Otevírám konfigurační soubor %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaktická chyba %s:%u: Blok nezačíná jménem." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaktická chyba %s:%u: Zkomolená značka" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaktická chyba %s:%u: Za hodnotou následuje zbytečné smetí" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaktická chyba %s:%u: Direktivy je možné provádět pouze na nejvyšší úrovni" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaktická chyba %s:%u: Příliš mnoho vnořených propojení (include)" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaktická chyba %s:%u: Zahrnuto odtud" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaktická chyba %s:%u: Nepodporovaná direktiva „%s“" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaktická chyba %s:%u: Na konci souboru je zbytečné smetí" @@ -2257,75 +2269,75 @@ msgstr "Nemohu přejít do %s" msgid "Failed to stat the cdrom" msgstr "Nezdařilo se vyhodnotit cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s, který je pouze pro čtení" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nešlo otevřít zámkový soubor %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nepoužívám zamykání pro zámkový soubor %s připojený přes nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nemohu získat zámek %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Čekal jsem na %s, ale nebyl tam" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s obdržel chybu segmentace." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s vrátil chybový kód (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s neočekávaně skončil" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nemohu otevřít soubor %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "čtení, stále mám k přečtení %lu, ale už nic nezbývá" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "zápis, stále mám %lu k zápisu, ale nejde to" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problém při zavírání souboru" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problém při odstraňování souboru" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problém při synchronizování souboru" @@ -2442,52 +2454,52 @@ msgstr "Nelze zpracovat soubor %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nelze zpracovat soubor %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (Absolutní dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Zkomolený řádek %lu v seznamu zdrojů %s (zpracování dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otevírám %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Řádek %u v seznamu zdrojů %s je příliš dlouhý." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (typ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ „%s“ na řádce %u v seznamu zdrojů %s není známý" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Zkomolený řádek %u v seznamu zdrojů %s (id výrobce)" @@ -2612,17 +2624,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Pro nápravu těchto problémů můžete zkusit spustit apt-get update" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Neplatný záznam v souboru preferencí, žádné záhlaví balíku" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nerozumím vypíchnutí typu %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Pro vypíchnutí nebyla zadána žádná (nebo nulová) priorita" @@ -2706,16 +2718,16 @@ msgstr "Při zpracování %s se objevila chyba (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Při zpracování závislostí nebyl nalezen balík %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nešlo vyhodnotit seznam zdrojových balíků %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Collecting File poskytuje" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Chyba IO při ukládání zdrojové cache" @@ -2724,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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Neshoda kontrolních součtů" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2745,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2754,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:1360 #, 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:1447 msgid "Size mismatch" msgstr "Velikosti nesouhlasí" @@ -2897,7 +2909,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Otevírám konfigurační soubor %s" @@ -2908,7 +2919,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Neshoda kontrolních součtů" @@ -2929,7 +2939,6 @@ msgstr "Odstraňuji %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Kompletně odstraněn %s" @@ -3013,14 +3022,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Nemohu přistoupit ke klíčence: „%s“" + +#~ msgid "Could not patch file" +#~ msgstr "Nemohu záplatovat soubor" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: APT\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -164,7 +164,7 @@ msgstr " Tabl Fersiynnau:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -324,7 +324,7 @@ msgstr "" " -c=? Darllen y ffeil cyfluniad hwn\n" " -o=? Gosod opsiwn cyfluniad mympwyol e.e. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Ni ellir ysgrifennu i %s" @@ -461,7 +461,7 @@ msgstr "Hen gronfa data, yn ceisio uwchraddio %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -476,11 +476,11 @@ msgstr "Ni ellir agor y ffeil DB2 %s: %s" msgid "Failed to stat %s" msgstr "Methodd stat() o %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Does dim cofnod rheoli gan yr archif" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni ellir cael cyrchydd" @@ -546,26 +546,26 @@ msgstr "*** Methwyd cysylltu %s at %s" msgid " DeLink limit of %sB hit.\n" msgstr " Tarwyd y terfyn cyswllt %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Doedd dim maes pecyn gan yr archif" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Cynaliwr %s yw %s nid %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " Does dim cofnod gwrthwneud gan %s\n" @@ -670,7 +670,7 @@ msgstr "Methwyd ailenwi %s at %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Gwall crynhoi patrwm - %s" @@ -840,11 +840,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Ni ellir cloi'r cyfeiriadur lawrlwytho" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Methwyd darllen y rhestr ffynhonellau." @@ -873,8 +873,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Does dim digon o le rhydd yn %s gennych" @@ -912,7 +912,7 @@ msgstr "Erthylu." msgid "Do you want to continue [Y/n]? " msgstr "Ydych chi eisiau mynd ymlaen? [Y/n] " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Methwyd cyrchu %s %s\n" @@ -921,7 +921,7 @@ msgstr "Methwyd cyrchu %s %s\n" msgid "Some files failed to download" msgstr "Methodd rhai ffeiliau lawrlwytho" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Lawrlwytho yn gyflawn ac yn y modd lawrlwytho'n unig" @@ -1021,51 +1021,51 @@ msgstr "Ni chanfuwyd y fersiwn '%s' o '%s' " msgid "Selected version %s (%s) for %s\n" msgstr "Dewiswyd fersiwn %s (%s) ar gyfer %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Nid yw'r gorchymyn diweddaru yn derbyn ymresymiadau" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Ni ellir cloi'r cyfeiriadur rhestr" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, 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:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1081,46 +1081,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Gall y wybodaeth canlynol gynorthwyo'n datrys y sefyllfa:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 #, fuzzy msgid "Internal error, AllUpgrade broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Methwyd canfod pecyn %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, 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:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ond mae %s yn mynd i gael ei sefydlu" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1129,7 +1129,7 @@ msgstr "" "pecyn (neu penodwch ddatrys)" # FIXME: needs commas -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1141,118 +1141,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:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pecynnau wedi torri" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pecynnau a awgrymmir:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pecynnau a argymhellir:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 #, fuzzy msgid "Calculating upgrade... " msgstr "Yn Cyfrifo'r Uwchraddiad... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Methwyd" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Wedi Gorffen" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Gwall Mewnol, torrodd AllUpgrade bethau" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Ni ellir canfod pecyn ffynhonell ar gyfer %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, 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:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Rhaid cyrchu %sB o archifau ffynhonell.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, fuzzy, c-format msgid "Fetch source %s\n" msgstr "Cyrchu Ffynhonell %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Methwyd cyrchu rhai archifau." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Methodd y gorchymyn dadbacio '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Methodd y gorchymyn adeiladu '%s'.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Methodd proses plentyn" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, 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:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Nid oes dibyniaethau adeiladu gan %s.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1261,7 +1261,7 @@ msgstr "" "Ni ellir bodloni dibyniaeth %s ar gyfer %s oherwydd ni ellir canfod y pecyn %" "s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1270,34 +1270,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:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Methwyd bodloni dibyniaeth %s am %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Methwyd bodloni'r dibyniaethau adeiladu ar gyfer %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Methwyd prosesu dibyniaethau adeiladu" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 #, fuzzy msgid "Supported modules:" msgstr "Modylau a Gynhelir:" # FIXME: split -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1382,7 +1382,7 @@ msgstr "" "\n" " Mae gan yr APT hwn bŵerau buwch hudol.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1636,11 +1636,10 @@ msgstr "Mae'r ffeil %s/%s yn trosysgrifo'r un yn y pecyn %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ni ellir darllen %s" @@ -1670,9 +1669,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Rhaid i'r cyfeiriaduron 'info' a 'temp' for ar yr un system ffeiliau" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 #, fuzzy msgid "Reading package lists" msgstr "Yn Darllen Rhestrau Pecynnau" @@ -1820,11 +1819,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" @@ -1887,7 +1886,7 @@ msgstr "Goramser cysylltu" msgid "Server closed the connection" msgstr "Caeodd y gweinydd y cysylltiad" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Gwall darllen" @@ -1899,7 +1898,7 @@ msgstr "Gorlifodd ateb y byffer." msgid "Protocol corruption" msgstr "Llygr protocol" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Gwall ysgrifennu" @@ -1955,7 +1954,7 @@ msgstr "Goramserodd cysylltiad y soced data" msgid "Unable to accept connection" msgstr "Methwyd derbyn cysylltiad" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem wrth stwnshio ffeil" @@ -2020,59 +2019,64 @@ msgstr "Methwyd cysylltu i %s:%s (%s)." msgid "Connecting to %s" msgstr "Yn cysylltu i %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Methwyd datrys '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Methiant dros dro yn datrys '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Methwyd cysylltu i %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Methwyd datrys '%s'" +msgid "No keyring installed in %s." +msgstr "Yn Erthylu'r Sefydliad." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Caiff y pecynnau canlynol ychwanegol eu sefydlu:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2125,50 +2129,50 @@ msgstr "Mae cynaliaeth amrediad y gweinydd hwn wedi torri" msgid "Unknown date format" msgstr "Fformat dyddiad anhysbys" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Methwyd dewis" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Goramserodd y cysylltiad" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Gwall wrth ysgrifennu i ffeil allbwn" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Gwall wrth ysgrifennu at ffeil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Gwall wrth ysgrifennu at y ffeil" -#: methods/http.cc:891 +#: methods/http.cc:892 #, 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Gwall wrth ddarllen o'r gweinydd" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Methwyd ysgrifennu ffeil %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 #, fuzzy msgid "Bad header data" msgstr "Data pennawd gwael" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Methodd y cysylltiad" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Gwall mewnol" @@ -2176,18 +2180,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 @@ -2217,54 +2228,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Ni chanfuwyd y dewis %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Talgryniad math anhysbys: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Yn agor y ffeil cyfluniad %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gwall cystrawen %s:%u: Mae bloc yn cychwyn efo dim enw." # FIXME -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, fuzzy, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gwall cystrawen %s:%u: Tag wedi camffurfio" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ôl y gwerth" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Gwall cystrawen %s:%u: Ceir defnyddio cyfarwyddyd ar y lefel dop yn unig" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gwall cystrawen %s:%u: Gormod o gynhwysion nythol" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gwall cystrawen %s:%u: Cynhwyswyd o fan hyn" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gwall cystrawen %s:%u: Cyfarwyddyd ni gynhelir '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gwall cystrawen %s:%u: Sbwriel ychwanegol ar ddiwedd y ffeil" @@ -2342,77 +2353,77 @@ msgstr "Ni ellir newid i %s" msgid "Failed to stat the cdrom" msgstr "Methwyd gwneud stat() o'r CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Ddim yn cloi'r ffeil clo darllen-yn-unig %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Methwyd agor y ffeil clo %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Ddim yn cloi'r ffeil clo ar NFS %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Methwyd cael y clo %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, fuzzy, c-format msgid "Waited for %s but it wasn't there" msgstr "Arhoswyd am %s ond nid oedd e yna" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Derbyniodd is-broses %s wall segmentu." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Dychwelodd is-broses %s gôd gwall (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Gorffenodd is-broses %s yn annisgwyl" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Methwyd agor ffeil %s" # FIXME -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "o hyd %lu i ddarllen ond dim ar ôl" # FIXME -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "o hyd %lu i ysgrifennu ond methwyd" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Gwall wrth gau'r ffeil" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Gwall wrth dadgysylltu'r ffeil" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Gwall wrth gyfamseru'r ffeil" @@ -2535,53 +2546,53 @@ msgstr "Ni ellir gramadegu ffeil becynnau %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni ellir gramadegu ffeil becynnau %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, fuzzy, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad llwyr)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (gramadegu dosranniad)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Yn agor %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Llinell %u yn rhy hir yn y rhestr ffynhonell %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Llinell camffurfiol %u yn y rhestr ffynhonell %s (math)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Mae'r math '%s' yn anhysbys ar linell %u yn y rhestr ffynhonell %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, fuzzy, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Llinell camffurfiol %lu yn y rhestr ffynhonell %s (dosranniad)" @@ -2715,18 +2726,18 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Efallai hoffech rhedege apt-get update er mwyn cywiro'r problemau hyn." # FIXME: literal -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Cofnod annilys yn y ffeil hoffterau, dim pennawd 'Package'" # FIXME: tense -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Methwyd daeall y math pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Dim blaenoriath (neu sero) wedi ei benodi ar gyfer pin" @@ -2813,16 +2824,16 @@ msgstr "Digwyddod gwall wrth brosesu %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Ni chanfuwyd pecyn %s %s wrth brosesu dibyniaethau ffeil" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Methwyd stat() o'r rhestr pecyn ffynhonell %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Yn Casglu Darpariaethau Ffeil" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Gwall M/A wrth gadw'r storfa ffynhonell" @@ -2831,21 +2842,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:432 msgid "MD5Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Camgyfatebiaeth swm MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2854,7 +2865,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2863,14 +2874,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:1360 #, 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:1447 msgid "Size mismatch" msgstr "Camgyfatebiaeth maint" @@ -3004,7 +3015,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Yn agor y ffeil cyfluniad %s" @@ -3118,15 +3128,32 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Methwyd datrys '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Methwyd agor ffeil %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-da\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -152,7 +152,7 @@ msgstr " Versionstabel:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -306,7 +306,7 @@ msgstr "" " -c=? Ls denne opstningsfil\n" " -o=? Angiv et opstningstilvalg. F.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kunne ikke skrive til %s" @@ -439,8 +439,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB er gammel, forsger at opgradere %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Databaseformatet er ugyldigt. Hvis du har opgraderet fra en tidligere " @@ -457,11 +458,11 @@ msgstr "Kunne ikke bne DB-filen %s: %s" msgid "Failed to stat %s" msgstr "Kunne ikke finde %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrolindgang" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunne skaffe en markr" @@ -526,26 +527,26 @@ msgstr "*** Kunne ikke lnke %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " Nede DeLink-begrnsningen p %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet havde intet package-felt" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen tvangs-post\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " pakkeansvarlig for %s er %s, ikke %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen linje med tilsidesttelse af standard for kildefiler\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -650,7 +651,7 @@ msgstr "Kunne ikke omdbe %s til %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Fejl ved tolkning af regulrt udtryk - %s" @@ -811,11 +812,11 @@ msgstr "Pakker skal afinstalleres, men Remove er deaktiveret." msgid "Internal error, Ordering didn't finish" msgstr "Intern fejl. Sortering blev ikke fuldfrt" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Kunne ikke lse nedhentningsmappen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listen med kilder kunne ikke lses." @@ -844,8 +845,8 @@ msgstr "Efter udpakning vil %sB yderligere diskplads vre brugt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter udpakning vil %sB diskplads blive frigjort.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunne ikke bestemme ledig plads i %s" @@ -882,7 +883,7 @@ msgstr "Afbryder." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortstte [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Kunne ikke hente %s %s\n" @@ -891,7 +892,7 @@ msgstr "Kunne ikke hente %s %s\n" msgid "Some files failed to download" msgstr "Nedhentningen af filer mislykkedes" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nedhentning afsluttet i 'hent-kun'-tilstand" @@ -990,52 +991,52 @@ msgstr "Versionen '%s' for '%s' blev ikke fundet" msgid "Selected version %s (%s) for %s\n" msgstr "Valgte version %s (%s) af %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kunne ikke finde kildepakkelisten %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "'update'-kommandoen benytter ingen parametre" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kunne ikke lse listemappen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Flgende pakker blev installeret automatisk, og behves ikke lngere:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Brug 'apt-get autoremove' til at fjerne dem." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1053,43 +1054,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Flgende oplysninger kan hjlpe dig med at klare situationen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern fejl. AutoRemover delagde noget" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern fejl, AllUpgrade delagde noget" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Kunne ikke finde opgaven %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Kunne ikke finde pakken %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Bemrk, vlger %s som regulrt udtryk '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "%s sat til manuelt installeret.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du kan muligvis rette det ved at kre 'apt-get -f install':" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1097,7 +1098,7 @@ msgstr "" "Uopfyldte afhngigheder. Prv 'apt-get -f install' uden pakker (eller angiv " "en lsning)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,115 +1109,115 @@ msgstr "" "en umulig situation eller bruger den ustabile distribution, hvor enkelte\n" "pakker endnu ikke er lavet eller gjort tilgngelige." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Flgende yderligere pakker vil blive installeret:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Foreslede pakker:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Anbefalede pakker:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Beregner opgraderingen... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislykkedes" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Frdig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Intern fejl. Problemlseren delagde noget" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunne ikke finde kildetekstpakken for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Overspringer allerede hentet fil '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB skal hentes fra kildetekst-arkiverne.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Henter kildetekst %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nogle arkiver kunne ikke hentes." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Udpakningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Opbygningskommandoen '%s' fejlede.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barneprocessen fejlede" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Skal angive mindst n pakke at tjekke opbygningsafhngigheder for" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunne ikke hente oplysninger om opbygningsafhngigheder for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen opbygningsafhngigheder.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgid "" msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da pakken %s ikke blev fundet" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,32 @@ msgstr "" "%s-afhngigheden for %s kan ikke opfyldes, da ingen af de tilgngelige " "udgaver af pakken %s kan tilfredsstille versions-kravene" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Kunne ikke opfylde %s-afhngigheden for %s: Den installerede pakke %s er for " "ny" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Kunne ikke opfylde %s-afhngigheden for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Opbygningsafhngigheden for %s kunne ikke opfyldes." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Kunne ikke behandler opbygningsafhngighederne" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Understttede moduler:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1343,7 @@ msgstr "" "for flere oplysninger og tilvalg.\n" " Denne APT har \"Super Cow Powers\".\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1592,11 +1593,10 @@ msgstr "File %s/%s overskriver filen i pakken %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Kunne ikke lse %s" @@ -1626,9 +1626,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Mapperne info og temp skal ligge i samme filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Indlser pakkelisterne" @@ -1764,11 +1764,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" @@ -1830,7 +1830,7 @@ msgstr "Tidsudlb p forbindelsen" msgid "Server closed the connection" msgstr "Serveren lukkede forbindelsen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lsefejl" @@ -1842,7 +1842,7 @@ msgstr "Mellemlageret blev overfyldt af et svar." msgid "Protocol corruption" msgstr "Protokolfejl" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefejl" @@ -1896,7 +1896,7 @@ msgstr "Tidsudlb p datasokkel-forbindelse" msgid "Unable to accept connection" msgstr "Kunne ikke acceptere forbindelse" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved \"hashing\" af fil" @@ -1960,60 +1960,65 @@ msgstr "Kunne ikke forbinde til %s:%s (%s)." msgid "Connecting to %s" msgstr "Forbinder til %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Kunne ikke omstte navnet '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig fejl ved omstning af navnet '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Der skete noget underligt under navneomstning af '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunne ikke forbinde til %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Kunne ikke tilg ngleringent '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Afbryder installationen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "F: Argumentlisten fra Acquire::gpgv::Options er for lang. Afslutter." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Intern fejl: Gyldig signatur, men kunne ikke afgre ngle-fingeraftryk?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Stdte p mindst n ugyldig signatur." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Kunne ikke kre '%s' for at verificere signaturen (er gpgv installeret?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Ukendt fejl ved krsel af gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Flgende signaturer var ugyldige:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2065,48 +2070,48 @@ msgstr "" msgid "Unknown date format" msgstr "Ukendt datoformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Valg mislykkedes" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Tidsudlb p forbindelsen" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fejl ved skrivning af uddatafil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fejl ved skrivning til fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fejl ved skrivning til filen" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Fejl ved lsning fra serveren. Den fjerne ende lukkede forbindelsen" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fejl ved lsning fra server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Kunne ikke skrive filen %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Ugyldige hoved-data" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Forbindelsen mislykkedes" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Intern fejl" @@ -2114,18 +2119,25 @@ msgstr "Intern fejl" msgid "Can't mmap an empty file" msgstr "Kan ikke udfre 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 udfre 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 @@ -2155,52 +2167,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Det valgte %s blev ikke fundet" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukendt type-forkortelse: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "bner konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfejl %s:%u: Blokken starter uden navn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfejl %s:%u: Forkert udformet mrke" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfejl %s:%u: Overskydende affald efter vrdien" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfejl %s:%u: Direktiver kan kun angives i topniveauet" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfejl %s:%u: For mange sammenkdede inkluderinger" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfejl %s:%u: Inkluderet herfra" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfejl %s:%u: Ikke-understttet direktiv '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfejl %s:%u: Overskydende affald i slutningen af filen" @@ -2276,75 +2288,75 @@ msgstr "Kunne ikke skifte til %s" msgid "Failed to stat the cdrom" msgstr "Kunne ikke finde cdrommen" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Benytter ikke lsning for skrivebeskyttet lsefil %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke bne lsefilen %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Benytter ikke lsning for nfs-monteret lsefil %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Kunne ikke opn lsen %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventede p %s, men den var der ikke" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s modtog en segmenteringsfejl." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s returnerede en fejlkode (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s afsluttedes uventet" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke bne filen %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "ls, mangler stadig at lse %lu men der er ikke flere" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skriv, mangler stadig at skrive %lu men kunne ikke" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem under lukning af fil" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Fejl ved frigivelse af filen" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem under synkronisering af fil" @@ -2461,52 +2473,52 @@ msgstr "Kunne ikke tolke pakkefilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunne ikke tolke pakkefilen %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Ugyldig linje %lu i kildelisten %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Ugyldig linje %lu i kildelisten %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Ugyldig linje %lu i kildelisten %s (absolut dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Ugyldig linje %lu i kildelisten %s (tolkning af dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "bner %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linjen %u er for lang i kildelisten %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Ugyldig linje %u i kildelisten %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen '%s' er ukendt p linje %u i kildelisten %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Ugyldig linje %u i kildelisten %s (producent-id)" @@ -2633,17 +2645,17 @@ msgstr "Pakkelisterne eller statusfilen kunne ikke tolkes eller bnes." msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan muligvis rette problemet ved at kre 'apt-get update'" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig indgang i indstillingsfilen. Pakkehovedet mangler" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Kunne ikke forst pin-type %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller prioritet nul) angivet ved pin" @@ -2729,16 +2741,16 @@ msgstr "Der skete en fejl under behandlingen af %s (CollectfileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakken %s %s blev ikke fundet under behandlingen af filafhngigheder" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finde kildepakkelisten %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samler filudbud" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO-fejl ved gemning af kilde-mellemlageret" @@ -2747,21 +2759,21 @@ msgstr "IO-fejl ved gemning af kilde-mellemlageret" msgid "rename failed, %s (%s -> %s)." msgstr "omdbning mislykkedes, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Der er ingen tilgngelige offentlige ngler for flgende ngle-ID'er:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2770,7 +2782,7 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke. (grundet manglende arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2779,13 +2791,13 @@ msgstr "" "Jeg kunne ikke lokalisere filen til %s-pakken. Det betyder muligvis at du er " "ndt til manuelt at reparere denne pakke." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "Strrelsen stemmer ikke" @@ -2921,7 +2933,6 @@ msgstr "Skrev %i poster med %i manglende filer og %i ikke-trufne filer\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "bner konfigurationsfilen %s" @@ -2952,7 +2963,6 @@ msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Fjernede %s helt" @@ -3036,14 +3046,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunne ikke pfre 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 "Couldn't access keyring: '%s'" +#~ msgstr "Kunne ikke tilg ngleringent '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pfre filen %s en lap" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -1,6 +1,6 @@ # German messages for the apt suite. # Copyright (C) 1997, 1998, 1999 Jason Gunthorpe and others. -# Holger Wansing <linux@wansing-online.de>, 2008, 2009. +# Holger Wansing <linux@wansing-online.de>, 2008, 2009, 2010. # Jens Seidel <jensseidel@users.sf.net>, 2008. # Michael Piefel <piefel@informatik.hu-berlin.de>, 2001, 2002, 2003, 2004, 2006. # Rüdiger Kuhlmann <Uebersetzung@ruediger-kuhlmann.de>, 2002. @@ -10,8 +10,8 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.21\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" -"PO-Revision-Date: 2009-10-20 21:55+0200\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" +"PO-Revision-Date: 2010-02-27 13:17+0100\n" "Last-Translator: Holger Wansing <linux@wansing-online.de>\n" "Language-Team: Debian German <debian-l10n-german@lists.debian.org>\n" "MIME-Version: 1.0\n" @@ -85,7 +85,7 @@ msgstr "Gesamtzahl an Mustern: " #: cmdline/apt-cache.cc:328 msgid "Total dependency version space: " -msgstr "Gesamtmenge an Abhängigkeits-/Versionsspeicher: " +msgstr "Gesamtmenge des Abhängigkeits-/Versionsspeichers: " #: cmdline/apt-cache.cc:333 msgid "Total slack space: " @@ -114,12 +114,12 @@ msgstr "Paketdateien:" #: cmdline/apt-cache.cc:1535 cmdline/apt-cache.cc:1622 msgid "Cache is out of sync, can't x-ref a package file" -msgstr "Cache ist nicht sychron, Querverweisen einer Paketdatei nicht möglich" +msgstr "Cache ist nicht synchron, Querverweisen einer Paketdatei nicht möglich" #. Show any packages have explicit pins #: cmdline/apt-cache.cc:1549 msgid "Pinned packages:" -msgstr "Per Pinning verwaltete Pakete:" +msgstr "Mit Pinning verwaltete Pakete:" #: cmdline/apt-cache.cc:1561 cmdline/apt-cache.cc:1602 msgid "(not found)" @@ -146,11 +146,11 @@ msgstr " Paket-Pinning: " #. Show the priority tables #: cmdline/apt-cache.cc:1608 msgid " Version table:" -msgstr " Versions-Tabelle:" +msgstr " Versionstabelle:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -203,21 +203,21 @@ msgstr "" "\n" "Befehle:\n" " add – Paket-Datei dem Quell-Cache hinzufügen\n" -" gencaches – Paket- und Quell-Cache neu erzeugen\n" -" showpkg – grundsätzliche Informationen für ein einzelnes Paket zeigen\n" -" showsrc – Aufzeichnungen zu Quellen zeigen\n" -" stats – einige grundlegenden Statistiken zeigen\n" -" dump – gesamte Datei in Kurzform zeigen\n" -" dumpavail – gesamte Datei verfügbarer Pakete ausgeben\n" -" unmet – unerfüllte Abhängigkeiten zeigen\n" -" search – in der Paketliste mittels regulären Ausdrucks suchen\n" -" show – einen lesbaren Datensatz für das Paket zeigen\n" -" depends – normale Abhängigkeitsinformationen für ein Paket zeigen\n" -" rdepends – umgekehrte Abhängigkeitsinformationen für ein Paket zeigen\n" +" gencaches – Paket- und Quell-Cache erzeugen\n" +" showpkg – grundsätzliche Informationen eines einzelnen Pakets ausgeben\n" +" showsrc – Aufzeichnungen zu Quellen ausgeben\n" +" stats – einige grundlegenden Statistiken ausgeben\n" +" dump – gesamte Datei in Kurzform ausgeben\n" +" dumpavail – Datei »available« mit allen verfügbaren Paketen ausgeben\n" +" unmet – unerfüllte Abhängigkeiten ausgeben\n" +" search – die Paketliste mittels regulärem Ausdruck durchsuchen\n" +" show – einen lesbaren Datensatz für das Paket ausgeben\n" +" depends – rohe Abhängigkeitsinformationen eines Pakets ausgeben\n" +" rdepends – umgekehrte Abhängigkeitsinformationen eines Pakets ausgeben\n" " pkgnames – die Namen aller Pakete im System auflisten\n" -" dotty – einen Paketgraph zur Verwendung mit GraphViz erzeugen\n" -" xvcg – einen Paketgraph zur Verwendung mit xvcg erzeugen\n" -" policy – »policy«-Einstellungen zeigen\n" +" dotty – Paketgraph zur Verwendung mit GraphViz erzeugen\n" +" xvcg – Paketgraph zur Verwendung mit xvcg erzeugen\n" +" policy – »policy«-Einstellungen ausgeben\n" "\n" "Optionen:\n" " -h dieser Hilfe-Text.\n" @@ -226,24 +226,25 @@ msgstr "" " -q Fortschrittsanzeige abschalten\n" " -i nur wichtige Abhängigkeiten für den »unmet«-Befehl zeigen\n" " -c=? diese Konfigurationsdatei lesen\n" -" -o=? eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/tmp\n" +" -o=? eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" "Weitere Informationen finden Sie unter apt-cache(8) und apt.conf(5).\n" #: cmdline/apt-cdrom.cc:77 msgid "Please provide a name for this Disc, such as 'Debian 5.0.3 Disk 1'" msgstr "" -"Bitte geben Sie einen Namen für diese Disk an, wie zum Beispiel »Debian " +"Bitte geben Sie einen Namen für dieses Medium an, wie zum Beispiel »Debian " "5.0.3 Disk 1«" #: cmdline/apt-cdrom.cc:92 msgid "Please insert a Disc in the drive and press enter" msgstr "" "Bitte legen Sie ein Medium in das Laufwerk ein und drücken Sie die " -"Eingabetaste" +"Eingabetaste (Enter)" #: cmdline/apt-cdrom.cc:114 msgid "Repeat this process for the rest of the CDs in your set." -msgstr "Wiederholen Sie dieses Prozedere für die restlichen CDs Ihres Satzes." +msgstr "" +"Wiederholen Sie dieses Prozedere für die restlichen Disks Ihres Satzes." #: cmdline/apt-config.cc:41 msgid "Arguments not in pairs" @@ -276,8 +277,7 @@ msgstr "" "Optionen:\n" " -h Dieser Hilfetext\n" " -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" -"tmp\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" #: cmdline/apt-extracttemplates.cc:98 #, c-format @@ -299,18 +299,16 @@ msgid "" msgstr "" "Aufruf: apt-extracttemplates datei1 [datei2 ...]\n" "\n" -"apt-extracttemplates ist ein Werkzeug zum Extrahieren von Konfigurations- " -"und\n" -"Template-Informationen aus Debian-Paketen.\n" +"apt-extracttemplates ist ein Werkzeug, um Informationen zu Konfiguration\n" +"und Vorlagen (Templates) aus Debian-Paketen zu extrahieren.\n" "\n" "Optionen:\n" " -h Dieser Hilfetext\n" " -t Das temporäre Verzeichnis setzen\n" " -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/" -"tmp\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Schreiben nach %s nicht möglich" @@ -318,7 +316,7 @@ msgstr "Schreiben nach %s nicht möglich" #: cmdline/apt-extracttemplates.cc:310 msgid "Cannot get debconf version. Is debconf installed?" msgstr "" -"debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" +"Debconf-Version konnte nicht ermittelt werden. Ist debconf installiert?" #: ftparchive/apt-ftparchive.cc:164 ftparchive/apt-ftparchive.cc:338 msgid "Package extension list is too long" @@ -342,7 +340,7 @@ msgstr "Fehler beim Schreiben der Kopfzeilen in die Inhaltsdatei" #: ftparchive/apt-ftparchive.cc:398 #, c-format msgid "Error processing contents %s" -msgstr "Fehler beim Verarbeiten der Inhaltsdatei %s" +msgstr "Fehler beim Verarbeiten der Inhalte %s" #: ftparchive/apt-ftparchive.cc:553 msgid "" @@ -393,29 +391,29 @@ msgstr "" " generate Konfigurationsdatei [Gruppen]\n" " clean Konfigurationsdatei\n" "\n" -"apt-ftparchive generiert Indexdateien für Debian-Archive. Es unterstützt " +"apt-ftparchive erstellt Indexdateien für Debian-Archive. Es unterstützt " "viele\n" -"verschiedene Arten der Generierung, von vollautomatisch bis hin zu den\n" +"verschiedene Arten der Erstellung, von vollautomatisch bis hin zu den\n" "funktionalen Äquivalenten von dpkg-scanpackages und dpkg-scansources.\n" "\n" -"apt-ftparchive generiert Package-Dateien aus einem Baum von .debs. Die " +"apt-ftparchive erstellt Package-Dateien aus einem Baum von .debs. Die " "Package-\n" -"Datei enthält den Inhalt aller Kontrollfelder aus jedem Paket sowie einen " +"Datei enthält den Inhalt aller Steuerfelder aus jedem Paket sowie einen " "MD5-\n" "Hashwert und die Dateigröße. Eine Override-Datei wird unterstützt, um Werte " "für\n" -"Priorität und Sektion zu erzwingen.\n" +"Priorität und Bereich (Section) zu erzwingen.\n" "\n" -"Auf ganz ähnliche Weise erzeugt apt-ftparchive Sources-Dateien aus einem " +"Auf ganz ähnliche Weise erstellt apt-ftparchive Sources-Dateien aus einem " "Baum\n" "von .dscs. Die Option --source-override kann benutzt werden, um eine " "Override-\n" "Datei für Quellen anzugeben.\n" "\n" -"Die Befehle »packages« und »source« sollten in der Wurzel des Baumes " -"aufgerufen\n" -"werden. Binärpfad sollte auf die Basis der rekursiven Suche zeigen und\n" -"Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" +"Die Befehle »packages« und »source« sollten von der Wurzel des Baums aus\n" +"aufgerufen werden. Binärpfad sollte auf die Basis der rekursiven Suche " +"zeigen\n" +"und Override-Datei sollte die Override-Flags enthalten. Pfadpräfix wird, so\n" "vorhanden, jedem Dateinamen vorangestellt. Beispielaufruf im Debian-Archiv:\n" " apt-ftparchive packages dists/potato/main/binary-i386/ > \\\n" " dists/potato/main/binary-i386/Packages\n" @@ -426,14 +424,14 @@ msgstr "" " -s=? Override-Datei für Quellen\n" " -q ruhig\n" " -d=? optionale Cache-Datenbank auswählen\n" -" --no-delink Debug-Modus für Delinking setzen\n" +" --no-delink Debug-Modus für Delinking aktivieren\n" " --contents Inhaltsdatei erzeugen\n" " -c=? diese Konfigurationsdatei lesen\n" " -o=? eine beliebige Konfigurationsoption setzen" #: ftparchive/apt-ftparchive.cc:759 msgid "No selections matched" -msgstr "Keine Auswahl passend" +msgstr "Keine Auswahl traf zu" #: ftparchive/apt-ftparchive.cc:832 #, c-format @@ -448,35 +446,35 @@ msgstr "Datenbank wurde beschädigt, Datei umbenannt in %s.old" #: ftparchive/cachedb.cc:61 #, c-format msgid "DB is old, attempting to upgrade %s" -msgstr "Datenbank ist veraltet, versuche %s zu erneuern" +msgstr "Datenbank ist veraltet; es wird versucht, %s zu erneuern" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" -"Datenbank-Format ist ungültig. Wenn Sie ein Update basierend auf einer " -"älteren Version von apt gemacht haben, entfernen Sie bitte die Datenbank und " -"erstellen Sie sie neu." +"Datenbankformat ist ungültig. Wenn Sie ein Upgrade (Paketaktualisierung) von " +"einer älteren apt-Version gemacht haben, entfernen Sie bitte die Datenbank " +"und erstellen Sie sie neu." #: ftparchive/cachedb.cc:77 #, c-format msgid "Unable to open DB file %s: %s" -msgstr "Datenbank-Datei %s kann nicht geöffnet werden: %s" +msgstr "Datenbankdatei %s kann nicht geöffnet werden: %s" #: ftparchive/cachedb.cc:123 apt-inst/extract.cc:178 apt-inst/extract.cc:190 #: apt-inst/extract.cc:207 apt-inst/deb/dpkgdb.cc:117 #, c-format msgid "Failed to stat %s" -msgstr "Ausführen von »stat« auf %s fehlgeschlagen." +msgstr "Ausführen von »stat« auf %s fehlgeschlagen" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" -msgstr "Archiv hat keinen Steuerungs-Datensatz" +msgstr "Archiv hat keinen Steuerungsdatensatz" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" -msgstr "Bekommen eines Cursors nicht möglich" +msgstr "Unmöglich, einen Cursor zu bekommen" #: ftparchive/writer.cc:76 #, c-format @@ -507,7 +505,7 @@ msgstr "%s konnte nicht aufgelöst werden" #: ftparchive/writer.cc:170 msgid "Tree walking failed" -msgstr "Verzeichniswechsel im Verzeichnisbaum fehlgeschlagen" +msgstr "Durchlaufen des Verzeichnisbaums fehlgeschlagen" #: ftparchive/writer.cc:195 #, c-format @@ -522,7 +520,7 @@ msgstr " DeLink %s [%s]\n" #: ftparchive/writer.cc:262 #, c-format msgid "Failed to readlink %s" -msgstr "readlink auf %s fehlgeschlagen" +msgstr "readlink von %s fehlgeschlagen" #: ftparchive/writer.cc:266 #, c-format @@ -537,28 +535,28 @@ msgstr "*** Erzeugen einer Verknüpfung von %s zu %s fehlgeschlagen" #: ftparchive/writer.cc:283 #, c-format msgid " DeLink limit of %sB hit.\n" -msgstr " DeLink-Limit von %sB erreicht.\n" +msgstr " DeLink-Limit von %s B erreicht.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" -msgstr "Archiv hatte kein Paket-Feld" +msgstr "Archiv hatte kein Feld »package«" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s hat keinen Eintrag in der Override-Liste.\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" -msgstr " %s-Betreuer ist %s und nicht %s\n" +msgstr " %s-Betreuer ist %s und nicht %s.\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s hat keinen Eintrag in der Source-Override-Liste.\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s hat keinen Eintrag in der Binary-Override-Liste.\n" @@ -570,7 +568,7 @@ msgstr "Interner Fehler, Bestandteil %s konnte nicht gefunden werden" #: ftparchive/contents.cc:358 ftparchive/contents.cc:389 msgid "realloc - Failed to allocate memory" -msgstr "realloc – Speicheranforderung fehlgeschlagen" +msgstr "realloc - Speicheranforderung fehlgeschlagen" #: ftparchive/override.cc:34 ftparchive/override.cc:142 #, c-format @@ -595,7 +593,7 @@ msgstr "Missgestaltetes Override %s Zeile %lu #3" #: ftparchive/override.cc:127 ftparchive/override.cc:201 #, c-format msgid "Failed to read the override file %s" -msgstr "Override-Datei %s konnte nicht gelesen werden." +msgstr "Override-Datei %s konnte nicht gelesen werden" #: ftparchive/multicompress.cc:72 #, c-format @@ -636,7 +634,7 @@ msgstr "" #: ftparchive/multicompress.cc:321 msgid "Failed to exec compressor " -msgstr "Komprimierer konnte nicht ausgeführt werden" +msgstr "Fehler beim Ausführen von Komprimierer " #: ftparchive/multicompress.cc:360 msgid "decompressor" @@ -653,7 +651,7 @@ msgstr "Lesevorgang während der MD5-Berechnung fehlgeschlagen" #: ftparchive/multicompress.cc:472 #, c-format msgid "Problem unlinking %s" -msgstr "Problem beim Unlinking von %s" +msgstr "Problem beim Entfernen (unlink) von %s" #: ftparchive/multicompress.cc:487 apt-inst/extract.cc:185 #, c-format @@ -664,14 +662,14 @@ msgstr "%s konnte nicht in %s umbenannt werden" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" -msgstr "Fehler beim Kompilieren eines regulären Ausdrucks – %s" +msgstr "Fehler beim Kompilieren eines regulären Ausdrucks - %s" #: cmdline/apt-get.cc:244 msgid "The following packages have unmet dependencies:" -msgstr "Die folgenden Pakete haben nicht-erfüllte Abhängigkeiten:" +msgstr "Die folgenden Pakete haben nicht erfüllte Abhängigkeiten:" #: cmdline/apt-get.cc:334 #, c-format @@ -717,7 +715,7 @@ msgstr "Die folgenden Pakete sind zurückgehalten worden:" #: cmdline/apt-get.cc:451 msgid "The following packages will be upgraded:" -msgstr "Die folgenden Pakete werden aktualisiert:" +msgstr "Die folgenden Pakete werden aktualisiert (Upgrade):" #: cmdline/apt-get.cc:472 msgid "The following packages will be DOWNGRADED:" @@ -826,11 +824,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Das Downloadverzeichnis konnte nicht gesperrt werden." -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Die Liste der Quellen konnte nicht gelesen werden." @@ -839,30 +837,30 @@ msgstr "Die Liste der Quellen konnte nicht gelesen werden." msgid "How odd.. The sizes didn't match, email apt@packages.debian.org" msgstr "" "Wie merkwürdig ... die Größen haben nicht übereingestimmt; schreiben Sie " -"eine E-Mail an apt@packages.debian.org" +"eine E-Mail an apt@packages.debian.org (auf Englisch bitte)." #: cmdline/apt-get.cc:841 #, c-format msgid "Need to get %sB/%sB of archives.\n" -msgstr "Es müssen noch %sB von %sB an Archiven heruntergeladen werden.\n" +msgstr "Es müssen noch %s B von %s B an Archiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:844 #, c-format msgid "Need to get %sB of archives.\n" -msgstr "Es müssen %sB an Archiven heruntergeladen werden.\n" +msgstr "Es müssen %s B an Archiven heruntergeladen werden.\n" #: cmdline/apt-get.cc:849 #, c-format msgid "After this operation, %sB of additional disk space will be used.\n" -msgstr "Nach dieser Operation werden %sB Plattenplatz zusätzlich benutzt.\n" +msgstr "Nach dieser Operation werden %s B Plattenplatz zusätzlich benutzt.\n" #: cmdline/apt-get.cc:852 #, c-format msgid "After this operation, %sB disk space will be freed.\n" -msgstr "Nach dieser Operation werden %sB Plattenplatz freigegeben.\n" +msgstr "Nach dieser Operation werden %s B Plattenplatz freigegeben.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Freier Platz in %s konnte nicht bestimmt werden" @@ -887,7 +885,7 @@ msgid "" "To continue type in the phrase '%s'\n" " ?] " msgstr "" -"Sie sind im Begriff, etwas potenziell Schädliches zu tun.\n" +"Sie sind im Begriff, etwas potentiell Schädliches zu tun.\n" "Zum Fortfahren geben Sie bitte »%s« ein.\n" " ?] " @@ -899,7 +897,7 @@ msgstr "Abbruch." msgid "Do you want to continue [Y/n]? " msgstr "Möchten Sie fortfahren [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Fehlschlag beim Holen von %s %s\n" @@ -908,7 +906,7 @@ msgstr "Fehlschlag beim Holen von %s %s\n" msgid "Some files failed to download" msgstr "Einige Dateien konnten nicht heruntergeladen werden" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Herunterladen abgeschlossen; Nur-Herunterladen-Modus aktiv" @@ -997,7 +995,7 @@ msgstr "%s ist schon die neueste Version.\n" #: 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" +msgstr "Veröffentlichung »%s« für »%s« konnte nicht gefunden werden" #: cmdline/apt-get.cc:1229 #, c-format @@ -1009,36 +1007,36 @@ msgstr "Version »%s« für »%s« konnte nicht gefunden werden" msgid "Selected version %s (%s) for %s\n" msgstr "Gewählte Version %s (%s) für %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" -msgstr "" +msgstr "Nicht verfügbare Veröffentlichung »%s« von Paket »%s« wird ignoriert" -#: cmdline/apt-get.cc:1342 -#, fuzzy, c-format +#: cmdline/apt-get.cc:1352 +#, 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." +msgstr "Als Quellpaket wird »%s« statt »%s« gewählt\n" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "Nicht verfügbare Version »%s« von Paket »%s« wird ignoriert" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Der Befehl »update« akzeptiert keine Argumente" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Das Listenverzeichnis kann nicht gesperrt werden" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1046,24 +1044,24 @@ msgstr "" "Die folgenden Pakete wurden automatisch installiert und werden nicht länger " "benötigt:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Verwenden Sie »apt-get autoremove«, um sie zu entfernen." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." msgstr "" -"Hmm, es sieht so aus, als ob der AutoRemover etwas zerstört hat, was\n" +"Hmm, es sieht so aus, als ob der AutoRemover etwas beschädigt hat, was\n" "wirklich nicht geschehen sollte. Bitte erstellen Sie einen Fehlerbericht\n" -"gegen apt." +"über apt." #. #. if (Packages == 1) @@ -1075,52 +1073,52 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 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:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" -msgstr "Interner Fehler, AutoRemover hat was kaputt gemacht" +msgstr "Interner Fehler, AutoRemover hat etwas beschädigt" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" -msgstr "Interner Fehler, AllUpgrade hat was kaputt gemacht" +msgstr "Interner Fehler, AllUpgrade hat etwas beschädigt" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Task %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Paket %s konnte nicht gefunden werden" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" -msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt\n" +msgstr "Hinweis: %s wird für regulären Ausdruck »%s« gewählt.\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s wurde als manuell installiert festgelegt.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne " -"jegliche Pakete (oder geben Sie eine Lösung an)." +"Nicht erfüllte Abhängigkeiten. Versuchen Sie »apt-get -f install« ohne Angabe " +"eines Pakets (oder geben Sie eine Lösung an)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1128,124 +1126,125 @@ msgid "" "or been moved out of Incoming." msgstr "" "Einige Pakete konnten nicht installiert werden. Das kann bedeuten, dass\n" -"Sie eine unmögliche Situation angefordert haben oder dass, wenn Sie die\n" -"Unstable-Distribution verwenden, einige erforderliche Pakete noch nicht\n" -"erstellt wurden oder Incoming noch nicht verlassen haben." +"Sie eine unmögliche Situation angefordert haben oder, wenn Sie die\n" +"Unstable-Distribution verwenden, dass einige erforderliche Pakete noch\n" +"nicht erstellt wurden oder Incoming noch nicht verlassen haben." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" -msgstr "Kaputte Pakete" +msgstr "Beschädigte Pakete" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Die folgenden zusätzlichen Pakete werden installiert:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Vorgeschlagene Pakete:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Empfohlene Pakete:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " -msgstr "Berechne Upgrade (Paketaktualisierung) ..." +msgstr "Paketaktualisierung (Upgrade) wird berechnet... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fehlgeschlagen" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Fertig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" -msgstr "Interner Fehler, der Problem-Löser hat was kaputt gemacht" +msgstr "Interner Fehler, der Problemlöser hat etwas beschädigt" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Quellpaket für %s kann nicht gefunden werden" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" -msgstr "Überspringe schon heruntergeladene Datei »%s«\n" +msgstr "Bereits heruntergeladene Datei »%s« wird übersprungen.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" -msgstr "Sie haben nicht genug freien Platz in %s" +msgstr "Sie haben nicht genügend freien Speicherplatz in %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, 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" +msgstr "" +"Es müssen noch %s B von %s B an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" -msgstr "Es müssen %sB an Quellarchiven heruntergeladen werden.\n" +msgstr "Es müssen %s B an Quellarchiven heruntergeladen werden.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" -msgstr "Quelle %s wird heruntergeladen\n" +msgstr "Quelle %s wird heruntergeladen.\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Einige Archive konnten nicht heruntergeladen werden." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" -msgstr "Überspringe Entpacken der schon entpackten Quelle in %s\n" +msgstr "Das Entpacken der bereits entpackten Quelle in %s wird übersprungen.\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" -msgstr "Entpack-Befehl »%s« fehlgeschlagen.\n" +msgstr "Entpackbefehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build-Befehl »%s« fehlgeschlagen.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Kindprozess fehlgeschlagen" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -"Es muss zumindest ein Paket angegeben werden, dessen Bau-Abhängigkeiten\n" +"Es muss mindestens ein Paket angegeben werden, dessen Bauabhängigkeiten " "überprüft werden sollen." -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -"Informationen zu Bau-Abhängigkeiten für %s konnten nicht gefunden werden." +"Informationen zu Bauabhängigkeiten für %s konnten nicht gefunden werden." -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" -msgstr "%s hat keine Bau-Abhängigkeiten.\n" +msgstr "%s hat keine Bauabhängigkeiten.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1254,7 +1253,7 @@ msgstr "" "»%s«-Abhängigkeit für %s kann nicht erfüllt werden, da Paket %s nicht " "gefunden werden kann." -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1263,32 +1262,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:2590 +#: cmdline/apt-get.cc:2600 #, 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." +"»%s«-Abhängigkeit für %s kann nicht erfüllt werden: Installiertes Paket %s " +"ist zu neu." -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, 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" +msgstr "»%s«-Abhängigkeit für %s konnte nicht erfüllt werden: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." -msgstr "Bau-Abhängigkeiten für %s konnten nicht erfüllt werden." +msgstr "Bauabhängigkeiten für %s konnten nicht erfüllt werden." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" -msgstr "Verarbeitung der Bau-Abhängigkeiten fehlgeschlagen" +msgstr "Verarbeitung der Bauabhängigkeiten fehlgeschlagen" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Unterstützte Module:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1340,37 +1339,35 @@ msgstr "" "sind update und install.\n" "\n" "Befehle:\n" -" update – neue Paketinformationen einlesen\n" -" upgrade – ein Upgrade (Paketaktualisierung) durchführen\n" +" update – neue Paketinformationen holen\n" +" upgrade – Upgrade (Paketaktualisierung) durchführen\n" " install – neue Pakete installieren (paket ist libc6, nicht libc6." "deb)\n" " remove – Pakete entfernen\n" " autoremove – alle nicht mehr verwendeten Pakete automatisch " "entfernen\n" -" purge – entferne Pakete restlos (inkl. Konfigurationsdateien)\n" +" purge – Pakete vollständig entfernen (inkl. " +"Konfigurationsdateien)\n" " source – Quellarchive herunterladen\n" -" build-dep – die Bau-Abhängigkeiten für Quellpakete konfigurieren\n" -" dist-upgrade – spezielles Upgrade (Paketaktualisierung) für die " -"komplette\n" +" build-dep – Bauabhängigkeiten für Quellpakete konfigurieren\n" +" dist-upgrade – Upgrade (Paketaktualisierung) für die komplette\n" " Distribution durchführen, siehe apt-get(8)\n" " dselect-upgrade – der Auswahl von »dselect« folgen\n" " clean – heruntergeladene Archive löschen\n" " autoclean – veraltete heruntergeladene Archive löschen\n" -" check – überprüfen, dass es keine nicht-erfüllten " -"Abhängigkeiten\n" -" gibt\n" +" check – überprüfen, ob es nicht erfüllte Abhängigkeiten gibt\n" "\n" "Optionen:\n" " -h dieser Hilfetext\n" " -q protokollierbare Ausgabe – keine Fortschrittsanzeige\n" " -qq keine Ausgabe außer bei Fehlern\n" " -d nur herunterladen – Archive NICHT installieren oder entpacken\n" -" -s nichts tun; nur eine Simulation der Vorgänge durchführen\n" +" -s nichts tun, nur eine Simulation der Aktionen durchführen\n" " -y für alle Antworten »Ja« annehmen und nicht nachfragen\n" " -f versuchen, ein System mit defekten Abhängigkeiten zu korrigieren\n" " -m versuchen fortzufahren, wenn Archive nicht auffindbar sind\n" -" -u auch eine Liste der aktualisierten Pakete mit anzeigen\n" -" -b ein Quellpaket nach dem Herunterladen übersetzen\n" +" -u auch eine Liste der aktualisierten Pakete anzeigen\n" +" -b ein Quellpaket nach dem Herunterladen bauen\n" " -V ausführliche Versionsnummern anzeigen\n" " -c=? Diese Konfigurationsdatei benutzen\n" " -o=? Beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" @@ -1379,7 +1376,7 @@ msgstr "" "weitergehende Informationen und Optionen.\n" " Dieses APT hat Super-Kuh-Kräfte.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1389,8 +1386,8 @@ msgstr "" "HINWEIS: Dies ist nur eine Simulation!\n" " apt-get benötigt root-Privilegien für die reale Ausführung.\n" " Behalten Sie ebenfalls in Hinterkopf, dass die Sperren deaktiviert\n" -" sind, verlassen Sie sich also bezüglich des realen aktuellen\n" -" Status' der Sperre nicht darauf!" +" sind, verlassen Sie sich also bezüglich des reellen aktuellen\n" +" Status der Sperre nicht darauf!" #: cmdline/acqprogress.cc:55 msgid "Hit " @@ -1411,7 +1408,7 @@ msgstr "Fehl " #: cmdline/acqprogress.cc:135 #, c-format msgid "Fetched %sB in %s (%sB/s)\n" -msgstr "Es wurden %sB in %s geholt (%sB/s)\n" +msgstr "Es wurden %s B in %s geholt (%s B/s)\n" #: cmdline/acqprogress.cc:225 #, c-format @@ -1427,7 +1424,7 @@ msgid "" msgstr "" "Medienwechsel: Bitte legen Sie das Medium mit dem Namen\n" " »%s«\n" -"in Laufwerk »%s« ein und drücken Sie die Eingabetaste.\n" +"in Laufwerk »%s« ein und drücken Sie die Eingabetaste (Enter).\n" #: cmdline/apt-sortpkgs.cc:86 msgid "Unknown package record!" @@ -1456,7 +1453,7 @@ msgstr "" " -h Dieser Hilfetext\n" " -s Quelldateisortierung benutzen\n" " -c=? Diese Konfigurationsdatei lesen\n" -" -o=? Eine beliebige Konfigurationsoption setzen, z. B. -o dir::cache=/tmp\n" +" -o=? Eine beliebige Konfigurationsoption setzen, z.B. -o dir::cache=/tmp\n" #: dselect/install:32 msgid "Bad default setting!" @@ -1465,7 +1462,7 @@ msgstr "Fehlerhafte Voreinstellung!" #: dselect/install:51 dselect/install:83 dselect/install:87 dselect/install:94 #: dselect/install:105 dselect/update:45 msgid "Press enter to continue." -msgstr "Zum Fortfahren Enter drücken." +msgstr "Zum Fortfahren die Eingabetaste (Enter) drücken." #: dselect/install:91 msgid "Do you want to erase any previously downloaded .deb files?" @@ -1494,7 +1491,7 @@ msgstr "" #: dselect/update:30 msgid "Merging available information" -msgstr "Führe verfügbare Information zusammen" +msgstr "Verfügbare Informationen werden zusammengeführt" #: apt-inst/contrib/extracttar.cc:114 msgid "Failed to create pipes" @@ -1515,7 +1512,7 @@ msgstr "Tar-Prüfsumme fehlgeschlagen, Archiv beschädigt" #: apt-inst/contrib/extracttar.cc:296 #, c-format msgid "Unknown TAR header type %u, member %s" -msgstr "Unbekannter Tar-Header-Typ %u, Bestandteil %s" +msgstr "Unbekannter Tar-Kopfzeilen-Typ %u, Bestandteil %s" #: apt-inst/contrib/arfile.cc:70 msgid "Invalid archive signature" @@ -1591,7 +1588,7 @@ msgstr "Der Pfad %s ist zu lang" #: apt-inst/extract.cc:124 #, c-format msgid "Unpacking %s more than once" -msgstr "%s mehr als einmal ausgepackt" +msgstr "%s mehr als einmal entpackt" #: apt-inst/extract.cc:134 #, c-format @@ -1601,7 +1598,7 @@ msgstr "Das Verzeichnis %s ist umgeleitet" #: apt-inst/extract.cc:144 #, c-format msgid "The package is trying to write to the diversion target %s/%s" -msgstr "Vom Paket wird versucht, auf das Umleitungsziel %s/%s zu schreiben" +msgstr "Schreibversuch vom Paket auf das Umleitungsziel %s/%s" #: apt-inst/extract.cc:154 apt-inst/extract.cc:297 msgid "The diversion path is too long" @@ -1623,7 +1620,7 @@ msgstr "Der Pfad ist zu lang" #: apt-inst/extract.cc:414 #, c-format msgid "Overwrite package match with no version for %s" -msgstr "Paket-Treffer ohne Version für %s wird überschrieben" +msgstr "Pakettreffer ohne Version für %s wird überschrieben" #: apt-inst/extract.cc:431 #, c-format @@ -1632,11 +1629,10 @@ msgstr "Durch die Datei %s/%s wird die Datei in Paket %s überschrieben" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s kann nicht gelesen werden" @@ -1667,9 +1663,9 @@ msgstr "" "Die »info«- und »temp«-Verzeichnisse müssen in demselben Dateisystem liegen" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Paketlisten werden gelesen" @@ -1681,11 +1677,11 @@ msgstr "Wechsel in das Administrationsverzeichnis %sinfo fehlgeschlagen" #: apt-inst/deb/dpkgdb.cc:197 apt-inst/deb/dpkgdb.cc:351 #: apt-inst/deb/dpkgdb.cc:444 msgid "Internal error getting a package name" -msgstr "Interner Fehler beim Holen des Paketnamens" +msgstr "Interner Fehler beim Holen eines Paketnamens" #: apt-inst/deb/dpkgdb.cc:201 apt-inst/deb/dpkgdb.cc:382 msgid "Reading file listing" -msgstr "Paketlisten werden gelesen" +msgstr "Paketauflistung wird gelesen" #: apt-inst/deb/dpkgdb.cc:212 #, c-format @@ -1694,14 +1690,14 @@ msgid "" "then make it empty and immediately re-install the same version of the " "package!" msgstr "" -"Fehler beim Öffnen der Listendatei »%sinfo/%s«. Wenn Sie diese Datei nicht " +"Öffnen der Listendatei »%sinfo/%s« fehlgeschlagen. Wenn Sie diese Datei nicht " "wiederherstellen können, dann leeren Sie sie und installieren Sie sofort " "dieselbe Version des Paketes erneut!" #: apt-inst/deb/dpkgdb.cc:225 apt-inst/deb/dpkgdb.cc:238 #, c-format msgid "Failed reading the list file %sinfo/%s" -msgstr "Fehler beim Lesen der Listendatei »%sinfo/%s«." +msgstr "Fehler beim Lesen der Listendatei %sinfo/%s" #: apt-inst/deb/dpkgdb.cc:262 msgid "Internal error getting a node" @@ -1799,7 +1795,7 @@ msgstr "" #: methods/cdrom.cc:250 msgid "Disk not found." -msgstr "Disk nicht gefunden." +msgstr "Medium nicht gefunden." #: methods/cdrom.cc:258 methods/file.cc:79 methods/rsh.cc:264 msgid "File not found" @@ -1807,11 +1803,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." +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" @@ -1835,17 +1831,17 @@ msgstr "Lokaler Name kann nicht bestimmt werden" #: methods/ftp.cc:210 methods/ftp.cc:238 #, c-format msgid "The server refused the connection and said: %s" -msgstr "Verbindung durch Server abgelehnt: %s" +msgstr "Verbindung durch Server abgelehnt; Server meldet: %s" #: methods/ftp.cc:216 #, c-format msgid "USER failed, server said: %s" -msgstr "Befehl USER fehlgeschlagen: %s" +msgstr "Befehl USER fehlgeschlagen, Server meldet: %s" #: methods/ftp.cc:223 #, c-format msgid "PASS failed, server said: %s" -msgstr "Befehl PASS fehlgeschlagen: %s" +msgstr "Befehl PASS fehlgeschlagen, Server meldet: %s" #: methods/ftp.cc:243 msgid "" @@ -1858,7 +1854,7 @@ msgstr "" #: methods/ftp.cc:271 #, c-format msgid "Login script command '%s' failed, server said: %s" -msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen: %s" +msgstr "Befehl »%s« des Login-Skriptes fehlgeschlagen, Server meldet: %s" #: methods/ftp.cc:297 #, c-format @@ -1873,7 +1869,7 @@ msgstr "Zeitüberschreitung der Verbindung" msgid "Server closed the connection" msgstr "Verbindung durch Server geschlossen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefehler" @@ -1885,7 +1881,7 @@ msgstr "Durch eine Antwort wurde der Puffer zum Überlaufen gebracht." msgid "Protocol corruption" msgstr "Protokoll beschädigt" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Schreibfehler" @@ -1935,29 +1931,29 @@ msgstr "Befehl EPRT fehlgeschlagen: %s" #: methods/ftp.cc:824 msgid "Data socket connect timed out" -msgstr "Datenverbindungsaufbau erlitt Zeitüberschreitung" +msgstr "Zeitüberschreitung bei Datenverbindungsaufbau" #: methods/ftp.cc:831 msgid "Unable to accept connection" msgstr "Verbindung konnte nicht angenommen werden" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Bei Bestimmung des Hashwertes einer Datei trat ein Problem auf" #: methods/ftp.cc:883 #, c-format msgid "Unable to fetch file, server said '%s'" -msgstr "Datei konnte nicht heruntergeladen werden; Antwort vom Server: »%s«" +msgstr "Datei konnte nicht heruntergeladen werden; Server meldet: »%s«" #: methods/ftp.cc:898 methods/rsh.cc:322 msgid "Data socket timed out" -msgstr "Datenverbindung erlitt Zeitüberschreitung" +msgstr "Zeitüberschreitung bei Datenverbindung" #: methods/ftp.cc:928 #, c-format msgid "Data transfer failed, server said '%s'" -msgstr "Datenübertragung fehlgeschlagen; Antwort vom Server: »%s«" +msgstr "Datenübertragung fehlgeschlagen; Server meldet: »%s«" #. Get the files information #: methods/ftp.cc:1005 @@ -1966,7 +1962,7 @@ msgstr "Abfrage" #: methods/ftp.cc:1117 msgid "Unable to invoke " -msgstr "Kann nicht aufgerufen werden: " +msgstr "Aufruf nicht möglich: " #: methods/connect.cc:70 #, c-format @@ -2007,62 +2003,67 @@ msgstr "Verbindung mit %s:%s nicht möglich (%s)." msgid "Connecting to %s" msgstr "Verbindung mit %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "»%s« konnte nicht aufgelöst werden" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärer Fehlschlag beim Auflösen von »%s«" -#: methods/connect.cc:193 -#, fuzzy, c-format +#: methods/connect.cc:194 +#, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" -msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i)" +msgstr "Beim Auflösen von »%s:%s« ist etwas Schlimmes passiert (%i - %s)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Verbindung mit %s:%s nicht möglich:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Zugriff auf Schlüsselring nicht möglich: »%s«" +msgid "No keyring installed in %s." +msgstr "Kein Schlüsselring in %s installiert." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "F: Zu viele Schlüsselringe sollten an gpgv übergeben werden. Abbruch." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." -msgstr "F: Argumentliste von Acquire::gpgv::Options zu lang. Abbruch." +msgstr "F: Argumentenliste von Acquire::gpgv::Options zu lang. Abbruch." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interner Fehler: Gültige Signatur, Fingerabdruck des Schlüssels konnte " "jedoch nicht ermittelt werden?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Mindestens eine ungültige Signatur wurde entdeckt." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "»%s« zur Überprüfung der Signatur konnte nicht ausgeführt werden (ist gpgv " "installiert?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Unbekannter Fehler beim Ausführen von gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Die folgenden Signaturen waren ungültig:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2096,7 +2097,7 @@ msgstr "Ungültige Kopfzeile" #: methods/http.cc:558 methods/http.cc:565 msgid "The HTTP server sent an invalid reply header" -msgstr "Vom·HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt" +msgstr "Vom HTTP-Server wurde eine ungültige Antwort-Kopfzeile gesandt" #: methods/http.cc:594 msgid "The HTTP server sent an invalid Content-Length header" @@ -2109,55 +2110,55 @@ msgstr "Vom HTTP-Server wurde eine ungültige »Content-Range«-Kopfzeile gesand #: methods/http.cc:611 msgid "This HTTP server has broken range support" msgstr "" -"Teilweise Dateiübertragung·wird vom HTTP-Server nur fehlerhaft unterstützt." +"Teilweise Dateiübertragung wird vom HTTP-Server nur fehlerhaft unterstützt." #: methods/http.cc:635 msgid "Unknown date format" msgstr "Unbekanntes Datumsformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Auswahl fehlgeschlagen" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" -msgstr "Verbindung erlitt Zeitüberschreitung" +msgstr "Zeitüberschreitung bei Verbindung" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fehler beim Schreiben der Ausgabedatei" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" -msgstr "Fehler beim Schreiben einer Datei" +msgstr "Fehler beim Schreiben in Datei" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fehler beim Schreiben der Datei" -#: methods/http.cc:891 +#: methods/http.cc:892 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fehler beim Lesen vom Server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Datei konnte nicht eingekürzt werden" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Fehlerhafte Kopfzeilendaten" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Verbindung fehlgeschlagen" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Interner Fehler" @@ -2165,99 +2166,108 @@ 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. " "Current value: %lu. (man 5 apt.conf)" msgstr "" -"Nicht genügend Platz für Dynamic MMap. Bitte erhöhen Sie den Wert von APT::" +"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 "" +"Die MMap-Größe hat bereits das festgelegte Limit von %lu Byte erreicht. Der " +"Versuch, die MMap zu vergrößern, wird abgebrochen." + #. d means days, h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:346 #, c-format msgid "%lid %lih %limin %lis" -msgstr "%liT %liS %liMin %lis" +msgstr "%li d %li h %li min %li s" #. h means hours, min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:353 #, c-format msgid "%lih %limin %lis" -msgstr "%liS %liMin %lis" +msgstr "%li h %li min %li s" #. min means minutes, s means seconds #: apt-pkg/contrib/strutl.cc:360 #, c-format msgid "%limin %lis" -msgstr "%liMin %lis" +msgstr "%li min %li s" #. s means seconds #: apt-pkg/contrib/strutl.cc:365 #, c-format msgid "%lis" -msgstr "%lis" +msgstr "%li s" #: apt-pkg/contrib/strutl.cc:1040 #, c-format msgid "Selection %s not found" msgstr "Auswahl %s nicht gefunden" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nicht erkannte Typabkürzung: »%c«" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" -msgstr "Öffne Konfigurationsdatei %s" +msgstr "Konfigurationsdatei %s wird geöffnet" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfehler %s:%u: Block beginnt ohne Namen." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" -msgstr "Syntaxfehler %s:%u: Missgestaltetes Tag" +msgstr "Syntaxfehler %s:%u: Missgestaltete Markierung" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" -msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll nach Wert" +msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn nach Wert" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfehler %s:%u: Direktiven können nur auf oberster Ebene benutzt werden" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfehler %s:%u: Zu viele verschachtelte Einbindungen (includes)" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfehler %s:%u: Eingefügt von hier" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfehler %s:%u: Nicht unterstützte Direktive »%s«" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" -msgstr "Syntaxfehler %s:%u: Zusätzlicher Müll am Dateiende" +msgstr "Syntaxfehler %s:%u: Zusätzlicher Unsinn am Dateiende" #: apt-pkg/contrib/progress.cc:153 #, c-format @@ -2293,7 +2303,7 @@ msgstr "Option %s erfordert ein Argument." #: apt-pkg/contrib/cmndline.cc:198 apt-pkg/contrib/cmndline.cc:204 #, c-format msgid "Option %s: Configuration item specification must have an =<val>." -msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<wert>«." +msgstr "Option %s: Konfigurationswertspezifikation benötigt ein »=<Wert>«." #: apt-pkg/contrib/cmndline.cc:234 #, c-format @@ -2314,12 +2324,12 @@ msgstr "Der Sinn von »%s« ist nicht klar, versuchen Sie »true« oder »false #: apt-pkg/contrib/cmndline.cc:348 #, c-format msgid "Invalid operation %s" -msgstr "Ungültige Operation %s." +msgstr "Ungültige Operation %s" #: apt-pkg/contrib/cdromutl.cc:52 #, c-format msgid "Unable to stat the mount point %s" -msgstr "»stat« konnte nicht auf den Einhängepunkt %s ausgeführt werden." +msgstr "»stat« konnte nicht auf den Einbindungspunkt %s ausgeführt werden" #: apt-pkg/contrib/cdromutl.cc:153 apt-pkg/contrib/cdromutl.cc:187 #: apt-pkg/acquire.cc:425 apt-pkg/acquire.cc:450 apt-pkg/clean.cc:39 @@ -2331,77 +2341,77 @@ msgstr "Es konnte nicht nach %s gewechselt werden" msgid "Failed to stat the cdrom" msgstr "»stat« konnte nicht auf die CD-ROM ausgeführt werden" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" -msgstr "Es wird keine Sperre für schreibgeschützte Lockdatei %s verwendet" +msgstr "Es wird keine Sperre für schreibgeschützte Sperrdatei %s verwendet" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" -msgstr "Lockdatei %s konnte nicht geöffnet werden" +msgstr "Sperrdatei %s konnte nicht geöffnet werden" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" -msgstr "Es wird keine Sperre für per NFS eingebundene Lockdatei %s verwendet" +msgstr "Es wird keine Sperre für per NFS eingebundene Sperrdatei %s verwendet" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" -msgstr "Konnte Lock %s nicht bekommen" +msgstr "Konnte Sperre %s nicht bekommen" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Es wurde auf %s gewartet, war jedoch nicht vorhanden" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Unterprozess %s hat einen Speicherzugriffsfehler empfangen." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." -msgstr "Unterprozess %s hat Signal %u empfangen." +msgstr "Unterprozess %s hat das Signal %u empfangen." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Unterprozess %s hat Fehlercode zurückgegeben (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Unterprozess %s unerwartet beendet" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Datei %s konnte nicht geöffnet werden" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "Lesevorgang: es verbleiben noch %lu zu lesen, jedoch nichts mehr übrig" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" "Schreibvorgang: es verbleiben noch %lu zu schreiben, jedoch Schreiben nicht " "möglich" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Beim Schließen der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" -msgstr "Beim Unlinking der Datei trat ein Problem auf" +msgstr "Beim Entfernen (unlink) der Datei trat ein Problem auf" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Beim Synchronisieren der Datei trat ein Problem auf" @@ -2420,7 +2430,7 @@ msgstr "Die Paket-Cache-Datei liegt in einer inkompatiblen Version vor" #: apt-pkg/pkgcache.cc:149 #, c-format msgid "This APT does not support the versioning system '%s'" -msgstr "Das·Versionssystem·»%s« wird durch dieses APT nicht unterstützt" +msgstr "Das Versionssystem »%s« wird durch dieses APT nicht unterstützt" #: apt-pkg/pkgcache.cc:154 msgid "The package cache was built for a different architecture" @@ -2428,11 +2438,11 @@ msgstr "Der Paket-Cache wurde für eine andere Architektur aufgebaut" #: apt-pkg/pkgcache.cc:225 msgid "Depends" -msgstr "Hängt ab" +msgstr "Hängt ab von" #: apt-pkg/pkgcache.cc:225 msgid "PreDepends" -msgstr "Hängt ab (vorher)" +msgstr "Hängt ab von (vorher)" #: apt-pkg/pkgcache.cc:225 msgid "Suggests" @@ -2444,7 +2454,7 @@ msgstr "Empfiehlt" #: apt-pkg/pkgcache.cc:226 msgid "Conflicts" -msgstr "Kollidiert" +msgstr "Kollidiert mit" #: apt-pkg/pkgcache.cc:226 msgid "Replaces" @@ -2492,21 +2502,21 @@ msgstr "Mögliche Versionen" #: apt-pkg/depcache.cc:153 msgid "Dependency generation" -msgstr "Abhängigkeits-Generierung" +msgstr "Abhängigkeitsgenerierung" #: apt-pkg/depcache.cc:173 apt-pkg/depcache.cc:193 apt-pkg/depcache.cc:197 msgid "Reading state information" -msgstr "Status-Informationen einlesen" +msgstr "Statusinformationen werden eingelesen" #: apt-pkg/depcache.cc:223 #, c-format msgid "Failed to open StateFile %s" -msgstr "Statusdatei %s konnte nicht geöffnet werden" +msgstr "StateFile %s konnte nicht geöffnet werden" #: apt-pkg/depcache.cc:229 #, c-format msgid "Failed to write temporary StateFile %s" -msgstr "Temporäre Statusdatei %s konnte nicht geschrieben werden" +msgstr "Temporäres StateFile %s konnte nicht geschrieben werden" #: apt-pkg/tagfile.cc:102 #, c-format @@ -2518,52 +2528,52 @@ msgstr "Paketdatei %s konnte nicht verarbeitet werden (1)" msgid "Unable to parse package file %s (2)" msgstr "Paketdatei %s konnte nicht verarbeitet werden (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI«)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist«)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»URI parse«)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»absolute dist«)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Missgestaltete Zeile %lu in Quellliste %s (»dist parse«)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wird geöffnet" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." -msgstr "Zeile %u zu lang in der Quellliste %s." +msgstr "Zeile %u in Quellliste %s zu lang." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»type«)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" -msgstr "Typ »%s« ist unbekannt in Zeile %u der Quellliste %s" +msgstr "Typ »%s« in Zeile %u der Quellliste %s ist unbekannt" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Missgestaltete Zeile %u in Quellliste %s (»vendor id«)" @@ -2574,6 +2584,8 @@ msgid "" "Could not perform immediate configuration on '%s'.Please see man 5 apt.conf " "under APT::Immediate-Configure for details. (%d)" msgstr "" +"»%s« konnte nicht unmittelbar konfiguriert werden. Lesen Sie »man 5 apt.conf« " +"unter APT::Immediate-Configure bezüglich weiterer Details. (%d)" #: apt-pkg/packagemanager.cc:440 #, c-format @@ -2593,6 +2605,9 @@ msgid "" "Could not perform immediate configuration on already unpacked '%s'.Please " "see man 5 apt.conf under APT::Immediate-Configure for details." msgstr "" +"»%s« (bereits entpackt) konnte nicht unmittelbar konfiguriert werden. Lesen " +"Sie »man 5 apt.conf« unter APT::Immediate-Configure bezüglich weiterer " +"Details." #: apt-pkg/pkgrecords.cc:32 #, c-format @@ -2612,8 +2627,8 @@ msgid "" "Error, pkgProblemResolver::Resolve generated breaks, this may be caused by " "held packages." msgstr "" -"Fehler: Unterbrechungen hervorgerufen durch pkgProblemResolver::Resolve; " -"dies könnte durch gehaltene Pakete hervorgerufen worden sein." +"Fehler: Unterbrechungen durch pkgProblemResolver::Resolve hervorgerufen; " +"dies könnte durch gehaltene Pakete verursacht worden sein." #: apt-pkg/algorithms.cc:1140 msgid "Unable to correct problems, you have held broken packages." @@ -2665,7 +2680,7 @@ msgstr "Methode %s ist nicht korrekt gestartet" msgid "Please insert the disc labeled: '%s' in the drive '%s' and press enter." msgstr "" "Bitte legen Sie das Medium mit dem Namen »%s« in Laufwerk »%s« ein und drücken " -"Sie die Eingabetaste." +"Sie die Eingabetaste (Enter)." #: apt-pkg/init.cc:133 #, c-format @@ -2674,7 +2689,7 @@ msgstr "Paketierungssystem »%s« wird nicht unterstützt" #: apt-pkg/init.cc:149 msgid "Unable to determine a suitable packaging system type" -msgstr "Bestimmung eines passenden Paketierungssystem-Typs nicht möglich" +msgstr "Bestimmung eines passenden Paketierungssystemtyps nicht möglich" #: apt-pkg/clean.cc:56 #, c-format @@ -2685,7 +2700,7 @@ msgstr "»stat« kann nicht auf %s ausgeführt werden." msgid "You must put some 'source' URIs in your sources.list" msgstr "" "Sie müssen einige »source«-URIs für Quellpakete in die sources.list-Datei " -"eintragen." +"eintragen" #: apt-pkg/cachefile.cc:71 msgid "The package lists or status file could not be parsed or opened." @@ -2695,19 +2710,20 @@ msgstr "" #: apt-pkg/cachefile.cc:75 msgid "You may want to run apt-get update to correct these problems" -msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren." +msgstr "Probieren Sie »apt-get update«, um diese Probleme zu korrigieren" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" -msgstr "Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeilen" +msgstr "" +"Ungültiger Eintrag in Einstellungsdatei %s, keine »Package«-Kopfzeile(n)" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" -msgstr "Pinning-Typ (pin type) %s nicht verständlich" +msgstr "Pinning-Typ %s kann nicht interpretiert werden" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Keine Priorität (oder Null) für Pin angegeben" @@ -2718,98 +2734,98 @@ msgstr "Cache hat ein inkompatibles Versionssystem" #: apt-pkg/pkgcachegen.cc:117 #, c-format msgid "Error occurred while processing %s (NewPackage)" -msgstr "Ein Fehler trat beim Verarbeiten von %s auf (NewPackage)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewPackage)" #: apt-pkg/pkgcachegen.cc:132 #, c-format msgid "Error occurred while processing %s (UsePackage1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage1)" #: apt-pkg/pkgcachegen.cc:166 #, c-format msgid "Error occurred while processing %s (NewFileDesc1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileDesc1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileDesc1)" #: apt-pkg/pkgcachegen.cc:191 #, c-format msgid "Error occurred while processing %s (UsePackage2)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage2)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage2)" #: apt-pkg/pkgcachegen.cc:195 #, c-format msgid "Error occurred while processing %s (NewFileVer1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileVer1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileVer1)" #: apt-pkg/pkgcachegen.cc:226 #, c-format msgid "Error occurred while processing %s (NewVersion1)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion1)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion1)" #: apt-pkg/pkgcachegen.cc:230 #, c-format msgid "Error occurred while processing %s (UsePackage3)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (UsePackage3)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (UsePackage3)" #: apt-pkg/pkgcachegen.cc:234 #, c-format msgid "Error occurred while processing %s (NewVersion2)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewVersion2)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewVersion2)" #: apt-pkg/pkgcachegen.cc:258 #, c-format msgid "Error occurred while processing %s (NewFileDesc2)" -msgstr "Ein Fehler trat beim Bearbeiten von %s auf (NewFileDesc2)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (NewFileDesc2)" #: apt-pkg/pkgcachegen.cc:264 msgid "Wow, you exceeded the number of package names this APT is capable of." msgstr "" -"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen APT " -"umgehen kann." +"Na so was, Sie haben die Anzahl an Paketen überschritten, mit denen diese " +"APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:267 msgid "Wow, you exceeded the number of versions this APT is capable of." msgstr "" -"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen APT " -"umgehen kann." +"Na so was, Sie haben die Anzahl an Versionen überschritten, mit denen diese " +"APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:270 msgid "Wow, you exceeded the number of descriptions this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Beschreibungen überschritten, mit denen " -"APT umgehen kann." +"diese APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:273 msgid "Wow, you exceeded the number of dependencies this APT is capable of." msgstr "" "Na so was, Sie haben die Anzahl an Abhängigkeiten überschritten, mit denen " -"APT umgehen kann." +"diese APT-Version umgehen kann." #: apt-pkg/pkgcachegen.cc:301 #, c-format msgid "Error occurred while processing %s (FindPkg)" -msgstr "Fehler trat beim Bearbeiten von %s auf (FindPkg)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (FindPkg)" #: apt-pkg/pkgcachegen.cc:314 #, c-format msgid "Error occurred while processing %s (CollectFileProvides)" -msgstr "Fehler trat beim Bearbeiten von %s auf (CollectFileProvides)" +msgstr "Ein Fehler trat auf beim Verarbeiten von %s (CollectFileProvides)" #: apt-pkg/pkgcachegen.cc:320 #, c-format msgid "Package %s %s was not found while processing file dependencies" msgstr "" -"Paket %s %s wurde nicht gefunden beim Verarbeiten der Dateiabhängigkeiten" +"Paket %s %s wurde beim Verarbeiten der Dateiabhängigkeiten nicht gefunden" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" -msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden." +msgstr "»stat« konnte nicht auf die Liste %s der Quellpakete ausgeführt werden" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" -msgstr "Sammle Datei-Provides" +msgstr "Sammeln der angebotenen Funktionalitäten (Provides) aus den Dateien" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "E/A-Fehler beim Speichern des Quell-Caches" @@ -2818,30 +2834,29 @@ 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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash-Summe stimmt nicht überein" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, 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 "" "Es konnte keine Datei für Paket %s gefunden werden. Das könnte heißen, dass " -"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender " -"Architektur)." +"Sie dieses Paket von Hand korrigieren müssen (aufgrund fehlender Architektur)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2850,14 +2865,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:1360 #, 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:1447 msgid "Size mismatch" msgstr "Größe stimmt nicht überein" @@ -2869,7 +2884,7 @@ msgstr "Release-Datei %s kann nicht verarbeitet werden" #: apt-pkg/indexrecords.cc:47 #, c-format msgid "No sections in Release file %s" -msgstr "Keine Abschnitte in Release-Datei %s" +msgstr "Keine Bereiche (Sections) in Release-Datei %s" #: apt-pkg/indexrecords.cc:81 #, c-format @@ -2887,8 +2902,8 @@ msgid "" "Using CD-ROM mount point %s\n" "Mounting CD-ROM\n" msgstr "" -"Verwendeter CD-ROM-Einhängepunkt: %s\n" -"CD-ROM wird eingehangen\n" +"Verwendeter CD-ROM-Einbindungspunkt: %s\n" +"CD-ROM wird eingebunden\n" #: apt-pkg/cdrom.cc:534 apt-pkg/cdrom.cc:622 msgid "Identifying.. " @@ -2901,29 +2916,29 @@ msgstr "Gespeicherte Kennzeichnung: %s\n" #: apt-pkg/cdrom.cc:566 apt-pkg/cdrom.cc:836 msgid "Unmounting CD-ROM...\n" -msgstr "CD-ROM wird ausgehangen ...\n" +msgstr "Einbindung der CD-ROM wird gelöst ...\n" #: apt-pkg/cdrom.cc:585 #, c-format msgid "Using CD-ROM mount point %s\n" -msgstr "Verwendeter CD-ROM-Einhängepunkt: %s\n" +msgstr "Verwendeter CD-ROM-Einbindungspunkt: %s\n" #: apt-pkg/cdrom.cc:603 msgid "Unmounting CD-ROM\n" -msgstr "CD-ROM wird ausgehangen\n" +msgstr "Lösen der CD-ROM-Einbindung\n" #: apt-pkg/cdrom.cc:607 msgid "Waiting for disc...\n" -msgstr "Warten auf Disk ...\n" +msgstr "Warten auf Medium ...\n" #. Mount the new CDROM #: apt-pkg/cdrom.cc:615 msgid "Mounting CD-ROM...\n" -msgstr "CD-ROM wird eingehangen ...\n" +msgstr "CD-ROM wird eingebunden ...\n" #: apt-pkg/cdrom.cc:633 msgid "Scanning disc for index files..\n" -msgstr "Durchsuchung der CD nach Index-Dateien ...\n" +msgstr "Durchsuchen des Mediums nach Index-Dateien ...\n" #: apt-pkg/cdrom.cc:673 #, c-format @@ -2940,7 +2955,7 @@ msgid "" "wrong architecture?" msgstr "" "Es konnten keine Paketdateien gefunden werden; möglicherweise ist dies keine " -"Debian-CD oder eine für die falsche Architektur?" +"Debian-Disk oder eine für die falsche Architektur?" #: apt-pkg/cdrom.cc:710 #, c-format @@ -2957,12 +2972,12 @@ msgid "" "This disc is called: \n" "'%s'\n" msgstr "" -"Diese Disk heißt: \n" +"Dieses Medium heißt: \n" "»%s«\n" #: apt-pkg/cdrom.cc:759 msgid "Copying package lists..." -msgstr "Kopieren der Paketlisten..." +msgstr "Kopieren der Paketlisten ..." #: apt-pkg/cdrom.cc:785 msgid "Writing new source list\n" @@ -2970,7 +2985,7 @@ msgstr "Schreiben der neuen Quellliste\n" #: apt-pkg/cdrom.cc:794 msgid "Source list entries for this disc are:\n" -msgstr "Quelllisteneinträge für diese Disk sind:\n" +msgstr "Quelllisteneinträge für dieses Medium sind:\n" #: apt-pkg/indexcopy.cc:263 apt-pkg/indexcopy.cc:835 #, c-format @@ -2995,31 +3010,29 @@ msgstr "" "geschrieben.\n" #: apt-pkg/indexcopy.cc:530 -#, fuzzy, c-format -#| msgid "Opening configuration file %s" +#, c-format msgid "Skipping nonexistent file %s" -msgstr "Öffne Konfigurationsdatei %s" +msgstr "Nicht vorhandene Datei %s wird übersprungen" #: apt-pkg/indexcopy.cc:536 #, c-format msgid "Can't find authentication record for: %s" -msgstr "" +msgstr "Authentifizierungs-Datensatz konnte nicht gefunden werden für: %s" #: apt-pkg/indexcopy.cc:542 -#, fuzzy, c-format -#| msgid "Hash Sum mismatch" +#, c-format msgid "Hash mismatch for: %s" -msgstr "Hash-Summe stimmt nicht überein" +msgstr "Hash-Summe stimmt nicht überein für: %s" #: apt-pkg/deb/dpkgpm.cc:49 #, c-format msgid "Installing %s" -msgstr "Installieren von %s" +msgstr "%s wird installiert" #: apt-pkg/deb/dpkgpm.cc:50 apt-pkg/deb/dpkgpm.cc:661 #, c-format msgid "Configuring %s" -msgstr "Konfigurieren von %s" +msgstr "%s wird konfiguriert" #: apt-pkg/deb/dpkgpm.cc:51 apt-pkg/deb/dpkgpm.cc:668 #, c-format @@ -3027,10 +3040,9 @@ msgid "Removing %s" msgstr "%s wird entfernt" #: apt-pkg/deb/dpkgpm.cc:52 -#, fuzzy, c-format -#| msgid "Completely removed %s" +#, c-format msgid "Completely removing %s" -msgstr "%s vollständig entfernt" +msgstr "%s wird vollständig entfernt" #: apt-pkg/deb/dpkgpm.cc:53 #, c-format @@ -3085,8 +3097,8 @@ msgstr "%s vollständig entfernt" #: apt-pkg/deb/dpkgpm.cc:879 msgid "Can not write log, openpty() failed (/dev/pts not mounted?)\n" msgstr "" -"Schreiben des Protokolls nicht möglich, openpty() schlug fehl (/dev/pts " -"nicht eingehangen?)\n" +"Schreiben des Protokolls nicht möglich, openpty() fehlgeschlagen (/dev/pts " +"nicht eingebunden?)\n" #: apt-pkg/deb/dpkgpm.cc:909 msgid "Running dpkg" @@ -3112,23 +3124,31 @@ msgid "" "dpkg was interrupted, you must manually run 'dpkg --configure -a' to correct " "the problem. " msgstr "" -"Der dpkg-Prozess wurde abgebrochen; Sie müssen »dpkg --configure -a« manuell " +"Der dpkg-Prozess wurde unterbrochen; Sie müssen »dpkg --configure -a« manuell " "ausführen, um das Problem zu beheben." #: apt-pkg/deb/debsystem.cc:100 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 "" +"Patch konnte nicht mit mmap und unter Verwendung von Dateioperationen auf %s " +"angewendet werden - der Patch scheint beschädigt zu sein." + +#: 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 "" +"Patch konnte nicht mit mmap auf %s angewendet werden (es ist jedoch nichts " +"mmap-spezifisches fehlgeschlagen) - der Patch scheint beschädigt zu sein." #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Verbindung vorzeitig beendet" - -#~ msgid " %4i %s\n" -#~ msgstr " %4i %s\n" - -#~ msgid "No source package '%s' picking '%s' instead\n" -#~ msgstr "Kein Quellpaket »%s«, wähle stattdessen »%s«\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po.pot\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -308,7 +308,7 @@ msgstr "" " -o=? འདི་གིས་མཐུན་སྒྲིག་རིམ་སྒྲིག་གདམ་ཁ་ཅིག་གཞི་སྒྲིག་འབདཝ་ཨིན་ དཔེར་ན་-o dir::cache=/tmp་" "བཟུམ།\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr " %sལུ་འབྲི་མ་ཚུགས།" @@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "ཌི་བི་འདི་རྙིངམ་ཨིན་པས་ %s་ཡར་བསྐྱེད་འབད་ནིའི་དོན་ལུ་དཔའ་བཅམ་དོ།" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "ཌི་བི་རྩ་སྒྲིག་འདི་ ནུས་མེད་ཨིན་པས། ཁྱོད་ཀྱི་ apt་ གྱི་འཐོན་རིམ་རྙིངམ་ཅིག་ནང་ལས་ ཡར་བསྐྱེད་འབད་ཡོད་" @@ -463,11 +464,11 @@ msgstr "%s: %s་ཌི་བི་ཡིག་སྣོད་འདི་ཁ་ msgid "Failed to stat %s" msgstr "%s་སིཊེཊི་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ།" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "ཡིག་མཛོད་འདི་ལུ་ཚད་འཛིན་དྲན་ཐོ་མིན་འདུག" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "འོད་རྟགས་ལེན་མ་ཚུགས།" @@ -532,26 +533,26 @@ msgstr "*** %s་ལས་%sལུ་འབྲེལ་འཐུད་འབད msgid " DeLink limit of %sB hit.\n" msgstr "%sB་ཧེང་བཀལ་བཀྲམ་ནིའི་འབྲེལ་མེད་བཅད་མཚམས།\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "ཡིག་མཛོད་ལུ་ཐུམ་སྒྲིལ་ཅི་ཡང་འཐུས་ཤོར་མ་བྱུང་།" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %sལུ་ཟུར་བཞག་ཐོ་བཀོད་མེད།\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ་རྒྱུན་སྐྱོང་པ་འདི་ %s ཨིན་ %s མེན།\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s ལུ་འབྱུང་ཁུངས་མེདཔ་གཏང་ནིའི་ཐོ་བཀོད་འདི་མེད།\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %sལུ་ཟུང་ལྡན་མེདཔ་གཏང་ནིའི་་ཐོ་བཀོད་གང་རུང་ཡང་མིན་འདུག།\n" @@ -655,7 +656,7 @@ msgstr "%s་ལུ་%s་བསྐྱར་མིང་བཏགས་ནི msgid "Y" msgstr "ཝའི།" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "རི་ཇེགསི་ཕྱོགས་སྒྲིག་འཛོལ་བ་- %s" @@ -818,11 +819,11 @@ msgstr "ཐུམ་སྒྲིལ་ཚུ་རྩ་བསྐྲད་བཏ msgid "Internal error, Ordering didn't finish" msgstr "ནང་འཁོད་འཛོལ་བ་ གོ་རིམ་བཟོ་ནི་ཚུ་མཇུག་མ་བསྡུ་བས།" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "ཕབ་ལེན་འབད་ནིའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "འབྱུང་ཁུངས་ཚུ་ཀྱི་ཐོ་ཡིག་དེ་ལྷག་མི་ཚུགས་པས།" @@ -853,8 +854,8 @@ msgstr "ཁ་སྐོང་གི་%sB་འདི་བཤུབ་པའི msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB་འདི་ཤུབ་པའི་ཤུལ་ལས་ཀྱི་བར་སྟོང་དེ་དལཝ་སྦེ་ལུས་འོང་།\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s་ནང་བར་སྟོང་" @@ -891,7 +892,7 @@ msgstr "བར་བཤོལ་འབད།" msgid "Do you want to continue [Y/n]? " msgstr "ཁྱོན་ཀྱི་འཕྲོ་མཐུད་ནི་འབད་ནི་ཨིན་ན་[Y/n]?" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།\n" @@ -900,7 +901,7 @@ msgstr "%s %s་ ལེན་ནི་ལུ་འཐུས་ཤོར་བ msgid "Some files failed to download" msgstr "ཡིག་སྣོད་ལ་ལུ་ཅིག་ཕབ་ལེན་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "ཕབ་ལེན་ཐབས་ལམ་རྐྱངམ་གཅིག་ནང་མཇུག་བསྡུཝ་སྦེ་རང་ཕབ་ལེན་འབད།" @@ -999,51 +1000,51 @@ msgstr "'%s'་གི་དོན་ལུ་འཐོན་རིམ་'%s'་ msgid "Selected version %s (%s) for %s\n" msgstr "(%s)གི་དོན་ལུ་སེལ་འཐུ་འབད་ཡོད་པའི་འཐོན་རིམ་'%s'(%s)\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "དུས་མཐུན་བཟོ་བའི་བརྡ་བཀོད་འདི་གིས་སྒྲུབ་རྟགས་ཚུ་མི་འབག་འབད།" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "ཐོ་བཀོད་འབད་ཡོད་པའི་སྣོད་ཡིག་འདི་ལྡེ་མིག་རྐྱབ་མ་ཚུགས།" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "འོག་གི་ཐུམ་སྒྲིས་གསརཔ་འདི་ཚུ་ཁཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1059,44 +1060,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "འོག་གི་བརྡ་དོན་དེ་གིས་དུས་སྐབས་འདི་མོས་མཐུན་བཟོ་ནི་ལུ་གྲོགས་རམ་འབད་འོང་:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "ནང་འགོད་འཛོལ་བ་ ཡར་བསྐྱེད་ཀྱི་ཅ་ཆས་ཆ་མཉམ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "%s་ཐུམ་སྒྲིལ་འཚོལ་མ་ཐོབ།" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "དྲན་འཛིན་ རི་ཇེགསི་'%s'གི་དོན་ལུ་%s་སེལ་འཐུ་འབད་དོ།\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "འདི་འབདཝ་ད་%sའདི་གཞི་བཙུགས་འབད་ནི་ཨིན།" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "འདི་ཚུ་ནོར་བཅོས་འབད་ནིའི་དོན་ལུ་ཁྱོད་ཀྱི་`apt-get -f install'དེ་གཡོག་བཀོལ་དགོཔ་འོང་:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1104,7 +1105,7 @@ msgstr "" "མ་ཚང་བའི་རྟེན་འབྲེལ་ ཐུས་སྒྲིལ་མེད་མི་ཚུ་དང་གཅིག་ཁར་ 'apt-get -f install'དེ་འབཐ་རྩོལ་བསྐྱེདཔ།" "(ཡང་ན་ཐབས་ཤེས་ཅིག་གསལ་བཀོད་འབད།)" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1115,122 +1116,122 @@ msgstr "" "འབད་འབདཝ་འོང་ནི་མས་ ཡང་ན་ད་ལྟོ་ཡང་གསར་བསྐྲུན་མ་འབད་བར་ཡོད་པའི་ཐུམ་སྒྲིལ་ལ་ལུ་ཅིག་ཡང་ན་ནང་" "འབྱོར་གྱི་ཕྱི་ཁར་རྩ་བསྐྲད་བཏང་ཡོད་པའི་རྩ་བརྟན་མེད་པའི་བགོ་འགྲེམ་ཚུ་ལག་ལེན་འཐབ་དོ་ཡོདཔ་འོང་ནི་ཨིན་པས།" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "ཆད་པ་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ།" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "འོག་གི་ཐུམ་སྒྲིལ་ཐེབས་ཚུ་གཞི་བཙུགས་འབད་འོང་:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "བསམ་འཆར་བཀོད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "འོས་སྦྱོར་འབད་ཡོད་པའི་ཐུམ་སྒྲིལ་ཚུ:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "ཡར་བསྐྱེད་རྩིས་བཏོན་དོ་... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "འབད་ཚར་ཡི།" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "ནང་འཁོད་འཛོལ་བ་ དཀའ་ངལ་མོས་མཐུན་འབད་མི་ཅ་ཆས་ཚུ་མེདཔ་ཐལ་ཡོད།" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "གི་དོན་ལུ་འབྱུང་ཁུངས་ལེན་ནི་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་ལེན་དགོ" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s་གི་དོན་ལུ་འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་ཅིག་འཚོལ་མ་འཐོབ" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "གོམ་འགྱོ་གིས་ཧེ་མ་ལས་རང་'%s'་ཡིག་སྣོད་དེ་ཕབ་ལེན་འབད་ནུག\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr " %s་ནང་ཁྱོད་ལུ་བར་སྟོང་ཚུ་ལངམ་སྦེ་མིན་འདུག་" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%sB་ལེན་དགོཔ་འདུག་ འབྱུང་ཁུངས་ཡིག་མཛོད་ཀྱི་%sB།\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "འབྱུང་ཁུངས་ཡིག་མཛོད་ཚུ་ཀྱི་%sB་ལེན་དགོ་པསས།\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "%s་འབྱུང་ཁུངས་ལེན།\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "ཡིག་མཛོད་ལ་ལུ་ཅིག་ལེན་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s་ནང་ཧེ་མ་ལས་སྦུང་ཚན་བཟོ་བཤོལ་ཨིན་མའི་སྦུང་ཚན་བཟོ་བཤོལ་གོམ་འགྱོ་འབད་དོ།\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s'སྦུང་ཚན་བཟོ་བཤོལ་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev'་ཐུམ་སྒྲིལ་དེ་གཞི་བཙུགས་འབད་ཡོད་པ་ཅིན་ཨེབ་གཏང་འབད།\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s'་བཟོ་བརྩིགས་བརྡ་བཀོད་འཐུས་ཤོར་བྱུང་ཡོད།\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "ཆ་ལག་ལས་སྦྱོར་དེ་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "builddeps ཞིབ་དཔྱད་འབད་ནིའི་དོན་ལུ་ཉུང་མཐའ་རང་ཐུམ་སྒྲིལ་གཅིག་གསལ་བཀོད་འབད་དགོ" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་བརྡ་དོན་དེ་ལེན་མ་ཚུགས།" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s ལུ་བཟོ་བརྩིགས་རྟེན་འབྲེལ་མིན་འདུག\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, 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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1239,32 +1240,32 @@ msgstr "" "%s གི་དོན་ལུ་%s་རྟེན་འབྲེལ་འདི་གི་རེ་བ་སྐོང་མི་ཚུགས་ནུག་ག་ཅི་འབད་ཟེར་བ་ཅིན་ཐུམ་སྒརིལ་%s་གི་འཐོན་རིམ་" "ཚུ་འཐོབ་མ་ཚུགསཔ་ལས་བརྟེན་འཐོན་རིམ་དགོས་མཁོ་ཚུ་གི་རེ་བ་དོ་སྐོང་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "%s:གི་དོན་ལུ་%s་རྟེན་འབྲེལ་དེ་གི་རེ་བ་སྐོང་ནི་འདི་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན་ གཞི་བཙུགས་འབད་ཡོད་པའི་ཐུམ་" "སྒྲིལ་%s་དེ་གནམ་མེད་ས་མེད་གསརཔ་ཨིན་པས།" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s: %s་གི་དོན་ལུ་་%s་རྟེན་འབྲེལ་འདི་ངལ་རངས་འབད་ནི་འཐུས་ཤོར་བྱུང་ནུག" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr " %s་གི་དོན་ལུ་བཟོ་བརྩིགས་-རྟེན་འབྲེལ་འདི་ངལ་རངས་མ་ཚུགས་པས།" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "བཟོ་བརྩིགས་རྟེན་འབྲེལ་འདི་ལས་སྦྱོར་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོདཔ་ཨིན།" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "རྒྱབ་སྐྱོར་འབད་ཡོད་པའི་ཚད་གཞི་ཚུ:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1351,7 +1352,7 @@ msgstr "" "ཤོག་ལེབ་ཚུ་ལུ་བལྟ།\n" " འ་ནི་ ཨེ་ཊི་པི་འདི་ལུ་ཡང་དག་ ཀའུ་ ནུས་ཤུགས་ཚུ་ཡོད།\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1602,11 +1603,10 @@ msgstr "ཐུམ་སྒྲིལ་%s་ནང་ལུ་་ཡིག་ས #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s་འདི་ལུ་ལྷག་མ་ཚུགས།" @@ -1636,9 +1636,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info ་དང་ temp་སྣོད་ཐོ་ཚུ་ཡིག་སྣོད་རིམ་ལུགས་གཅིག་གུར་ལུ་བཞག་དགོཔ་ཨིན།" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "ཐུམ་སྒྲིལ་ཐོ་ཡིག་ཚུ་ལྷག་དོ།" @@ -1772,11 +1772,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 "ཆུ་ཚོད་ལེགས་བཅོས་གཞི་སྒྲིག་འབཐ་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" @@ -1838,7 +1838,7 @@ msgstr "མཐུད་ལམ་ངལ་མཚམས" msgid "Server closed the connection" msgstr "སར་བར་གྱིས་མཐུད་ལམ་འདི་ཁ་བསྡམས་ཏེ་ཡོདཔ་ཨིན།" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "འཛོལ་བ་ལྷབ།" @@ -1850,7 +1850,7 @@ msgstr "ལན་གྱིས་ གནད་ཁོངས་གུར་ལས msgid "Protocol corruption" msgstr "གནད་སྤེལ་ལམ་ལུགས་ ངན་ཅན།" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "འཛོལ་བ་འབྲི།" @@ -1904,7 +1904,7 @@ msgstr "གནད་སྡུད་སོ་ཀེཊི་ མཐུད་ན msgid "Unable to accept connection" msgstr "མཐུད་ལམ་འདི་དང་ལེན་འབད་མ་ཚུགས།" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ཡིག་སྣོད་ལུ་་དྲྭ་རྟགས་བཀལ་བའི་བསྒང་དཀའ་ངལ།" @@ -1968,63 +1968,68 @@ msgstr " %s:%s (%s)ལུ་མཐུད་མ་ཚུགས།" msgid "Connecting to %s" msgstr "%s་ལུ་མཐུད་དོ།" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'མོས་མཐུན་འབད་མ་ཚུགས།" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'མོས་མཐུན་འབད་ནི་ལུ་གནས་སྐབས་ཀྱི་འཐུས་ཤོར།" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i)་མོས་མཐུན་འབདཝ་ད་ངན་པ་ཅིག་བྱུང་ཡི།" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s:ལུ་མཐུད་མ་ཚུགས།" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "གཞི་བཙུགས་བར་བཤོལ་འབད་དོ།" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Acquire::gpgv::Options་ནང་ལས་ཀྱི་སྒྲུབ་རྟགས་ཀྱི་ཐོ་ཡིག་དེ་གནམ་མེད་ས་མེད་རིངམ་འདུག ཕྱིར་" "འཐོན་དོ།" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "ནང་འཁོད་འཛོལ་བ: མིང་རྟགས་འདི་ལེགས་ཤོམ་ཅིག་འདུག་ འདི་འབདཝ་ད་མཛུབ་རྗེས་ལྡེ་མིག་དེ་གཏན་འབེབས་བཟོ་" "མ་ཚུགས?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "ཉུང་མཐའ་རང་ནུས་མེད་ཀྱི་མིང་རྟགས་ཅིག་གདོང་ཐུག་བྱུང་སྟེ་ཡོདཔ་ཨིན།" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "མིང་རྟགས་བདེན་སྦྱོར་འབད་ནི་ལུ་'%s'འདི་ལག་ལེན་འཐབ་མ་ཚུགས། (gpgv་དེ་ཁཞི་བཙུགས་འབད་ཡོདཔ་ཨིན་ན།?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv་ལག་ལེན་འཐབ་ནི་ལུ་མ་ཤེས་པའི་འཛོལ་བ་།" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "འོག་གི་མིང་རྟགས་ཚུ་ནུས་མེད་ཨིན་པས།:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2074,48 +2079,48 @@ msgstr "འ་ནི་ ཨེཆི་ཊི་ཊི་པི་ སར་བ msgid "Unknown date format" msgstr "མ་ཤེས་པའི་ཚེས་རྩ་སྒྲིག" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "སེལ་འཐུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "མཐུད་ལམ་ངལ་མཚམས་འབད་ཡོད།" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "ཨའུཊི་པུཊི་ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "ཡིག་སྣོད་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "ཡིག་སྣོད་འདི་ལུ་འབྲིཝ་ད་འཛོལ་བ།" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ། ཐག་རིང་མཇུག་གི་མཐུད་ལམ་དེ་ཁ་བསྡམས།" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "སར་བར་ནང་ལས་ལྷག་པའི་བསྒང་འཛོལ་བ།" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "%s་ཡིག་སྣོད་འདི་འབྲི་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "མགོ་ཡིག་གནད་སྡུད་བྱང་ཉེས།" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "བཐུད་ལམ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "ནང་འཁོད་འཛོལ་བ།" @@ -2123,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 @@ -2164,52 +2176,52 @@ msgstr "" msgid "Selection %s not found" msgstr "སེལ་འཐུ་%s ་མ་འཐོབ།" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "ངོ་མ་ཤེས་པའི་སྡུད་ཚིག་གི་དབྱེ་བ:'%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "་ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: སྡེབ་ཚན་གྱིས་མིང་མེད་མི་དང་གཅིག་ཁར་འགོ་བཙུགསཔ་ཨིན" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཟོ་ཉེས་འགྱུར་བའི་ངོ་རྟགས།" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:གནས་གོང་གི་ཤུལ་ལས་མཁོ་མེད་ཐེབས།" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:བཀོད་རྒྱ་ཚུ་ཆེ་རིམ་ནང་རྐྱངམ་ཅིག་བྱིན་ཚུགས།" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u:འདུ་འཛོམས་འབད་འབདཝ་ལེ་ཤཱ་གྲངས་སུ་བཙུགསཔ་ཨིན།" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ནཱ་ལས་རང་འགོ་བཙུགས་གྲངས་སུ་བཙུགས་ཏེ་ཡོད།" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: རྒྱབ་སྐྱོར་མ་འབད་བར་ཡོད་པའི་'%s'བཀོད་རྒྱ།" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ཚིག་སྦྱོར་འཛོལ་བ་%s:%u: ཡིག་སྣོད་ཀྱི་མཇུག་ལུ་མཁོ་མེད་ཐེབས།" @@ -2285,76 +2297,76 @@ msgstr "%s་ལུ་བསྒྱུར་བཅོས་འབད་མ་ཚ msgid "Failed to stat the cdrom" msgstr "སི་ཌི་རོམ་འདི་ངོ་བཤུས་འབད་ནི་ལུ་འཐུས་ཤོར་བྱུང་ཡོད།" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "%s ལྷག་ནི་རྐྱངམ་ཅིག་འབད་མི་ལྡེ་མིག་ཡིག་སྣོད་འདི་གི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ལྡེ་མིག་རྐྱབས་ཡོད་པའི་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "ཨེན་ཨེཕ་ཨེསི་ %s སྦྱར་བརྩེགས་འབད་ཡོད་པའི་ལྡེ་མིག་ཡིག་སྣོད་ཀྱི་དོན་ལུ་ལྡེ་མིག་རྐྱབ་ནི་ལག་ལེན་མི་འཐབ་པས།" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "%sལྡེ་མིག་རྐྱབ་ནི་ལེན་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s་གི་དོན་ལུ་བསྒུག་སྡོད་ཅི་ འདི་འབདཝ་ད་ཕར་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ཡན་ལག་ལས་སྦྱོར་%s་ལུ་ཆ་བགོས་ཀྱི་སྐྱོན་ཅིག་ཐོབ་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ཡན་ལག་ལས་སྦྱོར་%s་གིས་འཛོལ་བའི་ཨང་རྟགས་(%u)ཅིག་སླར་ལོག་འབད་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ཡན་ལག་ལས་སྦྱོར་་%s་གིས་རེ་བ་མེད་པར་ཕྱིར་ཐོན་ཡོདཔ་ཨིན།" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "ལྷག་ ད་ལྟོ་ཡང་ལྷག་ནི་ལུ་%lu་ཡོད་འདི་འབདཝ་ད་ཅི་ཡང་ལྷག་ལུས་མིན་འདུག" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "འབྲི་ ད་ལྟོ་ཡང་འབྲི་ནི་ལུ་%lu་ཡོད་འདི་འདབཝ་ད་འབད་མ་ཚུགས།" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "ཡིག་སྣོད་འདི་ཁ་བསྡམས་པའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "ཡིག་སྣོད་འདི་འབྲེལལམ་མེདཔ་བཟོ་བའི་བསྒང་དཀའ་ངལ།" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "ཡིག་སྣོད་མཉམ་བྱུང་འབདཝ་ད་དཀའ་ངལ།" @@ -2472,52 +2484,52 @@ msgstr "%s (༡་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་ msgid "Unable to parse package file %s (2)" msgstr "%s (༢་)་ཐུམ་སྒྲིལ་ཡིག་སྣོད་འདི་མིང་དཔྱད་འབད་མ་ཚུགས།" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu འབྱུང་ཁུངས་ཐོ་ཡིག་ %s (ཡུ་ཨར་ཨའི་)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་ %lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཐོ་ཡིག་ %s(ཡུ་ཨར་ཨའི་ མིང་དཔྱད་འབད་ནི)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(ཡང་དག་ dist)གི་ནང་ན།" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%lu་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(dist མིང་དཔྱད་འབད་ནི་)ནང་ན།" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s་ཁ་ཕྱེ་དོ།" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "གྲལ་ཐིག་%u་འདི་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་ནང་ལུ་གནམ་མེད་ས་མེད་རིངམོ་འདུག" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s (དབྱེ་བ)་ནང་ན།" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "དབྱེ་བ་'%s'་འདི་གྲལ་ཐིག་%u་གུར་ལུ་ཡོདཔ་འབྱུང་ཁུངས་ཐོ་ཡིག་%s་གི་ནང་ན་མ་ཤེས་པས།" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "བཟོ་ཉེས་འགྱུར་བའི་གྲལ་ཐིག་%u་ འབྱུང་ཁུངས་ཐོ་ཡིག་%s(སིལ་ཚོང་པ་ ཨའི་ཌི)གི་ནང་ན།" @@ -2645,17 +2657,17 @@ msgstr "ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་ཡང་ msgid "You may want to run apt-get update to correct these problems" msgstr "འ་ནི་དཀའ་ངལ་འདི་ཚུ་སེལ་ནིའི་ལུ་ ཁྱོད་ཀྱི་ apt-get update་དེ་གཡོག་བཀོལ་དགོཔ་འོང་།" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "དགའ་གདམ་ཡིག་སྣོད་ནང་ལུ་ནུས་མེད་ཀྱི་དྲན་ཐོ་ ཐུམ་སྒྲིལ་མགོ་ཡིག་མིན་འདུག" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "ངོ་རྟགས་ཨང་གི་དབྱེ་བ་ %s འདི་ཧ་གོ་མ་ཚུགས།" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "གོ་རྟགས་ཨང་གི་དོན་ལུ་ གཙོ་རིམ་(ཡང་ན་ ཀླད་ཀོར་)ཚུ་གསལ་བཀོད་མ་འབད་བས།" @@ -2740,16 +2752,16 @@ msgstr "%s (CollectFileProvides)དེ་བཟོ་སྦྱོར་འབད msgid "Package %s %s was not found while processing file dependencies" msgstr "ཡིག་སྣོད་རྟེན་འབྲེལ་འདི་ཚུ་བཟོ་སྦྱོར་འབད་བའི་བསྒང་ཐུམ་སྒྲིལ་ %s %s ་འདི་མ་ཐོབ་པས།" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "འབྱུང་ཁུངས་ཐུམ་སྒྲིལ་གྱི་ཐོ་ཡིག་%s་དེ་ངོ་བཤུས་འབད་མ་ཚུགས།" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "ཡིག་སྣོད་བྱིན་མི་ཚུ་བསྡུ་ལེན་འབད་དོ།" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO འཛོལ་བ་འབྱུང་ཁུངས་འདྲ་མཛོད་སྲུང་བཞག་འབད་དོ།" @@ -2758,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:432 msgid "MD5Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "ཨེམ་ཌི་༥་ ཁྱོན་བསྡོམས་མ་མཐུན་པ།" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2780,7 +2792,7 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག (arch འདི་བྱིག་སོངམ་ལས་བརྟེན།)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2789,14 +2801,14 @@ msgstr "" " %s་ཐུམ་སྒྲིལ་གི་དོན་ལུ་ང་་གི་ཡིག་སྣོད་ཅིག་ག་ཡོད་འཚོལ་མི་འཐོབ་པས། འདི་འབདཝ་ལས་ཁྱོད་ཀྱི་ལག་ཐོག་ལས་ " "འ་ནི་ཐུམ་སྒྲིལ་འདི་གི་དཀའ་ངལ་སེལ་དགོཔ་འདུག " -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "ཚད་མ་མཐུན།" @@ -2932,7 +2944,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "རིམ་སྒྲིག་ཡིག་སྣོད་%s་འདི་ཁ་ཕྱེ་དོ།" @@ -2963,7 +2974,6 @@ msgstr "%s་རྩ་བསྐྲད་གཏང་དོ།" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s མཇུག་བསྡུཝ་སྦེ་རང་རྩ་བསྐྲད་བཏང་ཡོད།" @@ -3047,15 +3057,31 @@ 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 "དུས་སུ་མ་འབབ་པ་རང་མཐུད་ལམ་འདི་ག་བསྡམས་ཡོད།" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "'%s'ལྡེ་འཁོར་འདི་འཛུལ་སྤྱོད་འབད་མ་ཚུགས།" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "%s་ཡིག་སྣོད་འདི་ཁ་ཕྱེ་མ་ཚུགས།" + #~ msgid " %4i %s\n" #~ msgstr "%4i %s\n" @@ -15,7 +15,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_el\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -158,7 +158,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s για %s είναι μεταγλωττισμένο σε %s %s\n" @@ -316,7 +316,7 @@ msgstr "" " -c=? Ανάγνωση αυτού του αρχείου ρυθμίσεων\n" " -o=? Καθορισμός αυθαίρετης επιλογής παραμέτρου, πχ -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Αδύνατη η εγγραφή στο %s" @@ -453,8 +453,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Η βάση δεν είναι ενημερωμένη, γίνεται προσπάθεια να αναβαθμιστεί το %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Το φορμά της βάσης δεν είναι έγκυρο. Εάν αναβαθμίσατε το apt σε νεότερη " @@ -471,11 +472,11 @@ msgstr "Το άνοιγμά του αρχείου της βάσης %s: %s απ msgid "Failed to stat %s" msgstr "Αποτυχία εύρεσης της κατάστασης του %s." -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο ελέγχου" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Αδύνατη η πρόσβαση σε δείκτη" @@ -540,26 +541,26 @@ msgstr " Αποτυχία σύνδεσης του %s με το %s" msgid " DeLink limit of %sB hit.\n" msgstr " Αποσύνδεση ορίου του %sB hit.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Η αρχειοθήκη δεν περιέχει πεδίο πακέτων" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s δεν περιέχει εγγραφή παράκαμψης\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s συντηρητής είναι ο %s όχι ο %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s δεν έχει εγγραφή πηγαίας παράκαμψης\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s δεν έχει ούτε εγγραφή δυαδικής παράκαμψης\n" @@ -663,7 +664,7 @@ msgstr "Αποτυχία μετονομασίας του %s σε %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "σφάλμα μεταγλωτισμου - %s" @@ -827,11 +828,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Εσωτερικό Σφάλμα, η Ταξινόμηση δεν ολοκληρώθηκε" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου μεταφόρτωσης" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Αδύνατη η ανάγνωση της λίστας πηγών." @@ -863,8 +864,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Μετά από αυτή τη λειτουργία, θα ελευθερωθούν %sB χώρου από το δίσκο.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Δεν μπόρεσα να προσδιορίσω τον ελεύθερο χώρο στο %s" @@ -901,7 +902,7 @@ msgstr "Εγκατάλειψη." msgid "Do you want to continue [Y/n]? " msgstr "Θέλετε να συνεχίσετε [Ν/ο]; " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Αποτυχία ανάκτησης του %s %s\n" @@ -910,7 +911,7 @@ msgstr "Αποτυχία ανάκτησης του %s %s\n" msgid "Some files failed to download" msgstr "Για μερικά αρχεία απέτυχε η μεταφόρτωση" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Ολοκληρώθηκε η μεταφόρτωση μόνο" @@ -1012,51 +1013,51 @@ msgstr "Η έκδοση %s για το %s δεν βρέθηκε" msgid "Selected version %s (%s) for %s\n" msgstr "Επιλέχθηκε η έκδοση %s (%s) για το%s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Η εντολή update δεν παίρνει ορίσματα" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Αδύνατο το κλείδωμα του καταλόγου" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Δεν επιτρέπεται οποιαδήποτε διαγραφή· αδυναμία εκκίνησης του AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Τα ακόλουθα πακέτα εγκαταστάθηκαν αυτόματα και δεν χρειάζονται πλέον:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Χρησιμοποιήστε 'apt-get autoremove' για να τα διαγράψετε." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1074,43 +1075,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Οι ακόλουθες πληροφορίες ίσως βοηθήσουν στην επίλυση του προβλήματος:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Εσωτερικό Σφάλμα, το AutoRemover δημιούργησε κάποιο πρόβλημα" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Εσωτερικό Σφάλμα, η διαδικασία αναβάθμισης χάλασε" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Αδύνατη η εύρεση του συνόλου πακέτων %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Αδύνατη η εύρεση του πακέτου %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Σημείωση, επιλέχτηκε το %s στη θέση του '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "το %s έχει εγκατασταθεί με το χέρι\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Aν τρέξετε 'apt-get -f install' ίσως να διορθώσετε αυτά τα προβλήματα:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1118,7 +1119,7 @@ msgstr "" "Ανεπίλυτες εξαρτήσεις. Δοκιμάστε 'apt-get -f install' χωρίς να ορίσετε " "πακέτο (ή καθορίστε μια λύση)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1130,120 +1131,120 @@ msgstr "" "διανομή, ότι μερικά από τα πακέτα δεν έχουν ακόμα δημιουργηθεί ή έχουν\n" "μετακινηθεί από τα εισερχόμενα." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Χαλασμένα πακέτα" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Τα ακόλουθα επιπλέον πακέτα θα εγκατασταθούν:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Προτεινόμενα πακέτα:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Συνιστώμενα πακέτα:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Υπολογισμός της αναβάθμισης... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Απέτυχε" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Ετοιμο" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "Εσωτερικό Σφάλμα, η προσπάθεια επίλυσης του προβλήματος \"έσπασε\" κάποιο " "υλικό" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για να μεταφορτώσετε τον " "κωδικάτου" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Αδυναμία εντοπισμού του κώδικά του πακέτου %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Παράκαμψη του ήδη μεταφορτωμένου αρχείου `%s`\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Δεν διαθέτετε αρκετό ελεύθερο χώρο στο %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB/%sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Χρειάζεται να μεταφορτωθούν %sB πηγαίου κώδικα.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Μεταφόρτωση Κωδικα %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Αποτυχία μεταφόρτωσης μερικών αρχειοθηκών." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Παράκαμψη της αποσυμπίεσης ήδη μεταφορτωμένου κώδικα στο %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Απέτυχε η εντολή αποσυμπίεσης %s\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Ελέγξτε αν είναι εγκαταστημένο το πακέτο 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Απέτυχε η εντολή χτισίματος %s.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Η απογονική διεργασία απέτυχε" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Θα πρέπει να καθορίσετε τουλάχιστον ένα πακέτο για έλεγχο των εξαρτήσεων του" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Αδύνατη η εύρεση πληροφοριών χτισίματος για το %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "το %s δεν έχει εξαρτήσεις χτισίματος.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1251,7 +1252,7 @@ msgid "" msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή το πακέτο %s δεν βρέθηκε" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1260,32 +1261,32 @@ msgstr "" "%s εξαρτήσεις για το %s δεν ικανοποιούνται επειδή δεν υπάρχουν διαθέσιμες " "εκδόσεις του πακέτου %s που να ικανοποιούν τις απαιτήσεις έκδοσης" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Αποτυχία ικανοποίησης %s εξαρτήσεων για το %s: Το εγκατεστημένο πακέτο %s " "είναι νεώτερο" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Αποτυχία ικανοποίησης %s εξάρτησης για το %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Οι εξαρτήσεις χτισίματος για το %s δεν ικανοποιούνται." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Αποτυχία επεξεργασίας εξαρτήσεων χτισίματος" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Υποστηριζόμενοι Οδηγοί:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1368,7 +1369,7 @@ msgstr "" "για περισσότερες πληροφορίες και επιλογές.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1618,11 +1619,10 @@ msgstr "Το αρχείο %s/%s αντικαθιστά αυτό στο πακέ #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Αδύνατη η ανάγνωση του %s" @@ -1652,9 +1652,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Οι φάκελοι info και temp πρέπει να βρίσκονται στο ίδιο σύστημα αρχείων" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Ανάγνωση Λιστών Πακέτων" @@ -1789,11 +1789,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 "Αποτυχία ορισμού του χρόνου τροποποίησης" @@ -1855,7 +1855,7 @@ msgstr "Λήξη χρόνου σύνδεσης" msgid "Server closed the connection" msgstr "Ο διακομιστής έκλεισε την σύνδεση" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Σφάλμα ανάγνωσης" @@ -1867,7 +1867,7 @@ msgstr "Το μήνυμα απάντησης υπερχείλισε την εν msgid "Protocol corruption" msgstr "Αλλοίωση του πρωτοκόλλου" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Σφάλμα εγγραφής" @@ -1921,7 +1921,7 @@ msgstr "Λήξη χρόνου σύνδεσης στην υποδοχή δεδο msgid "Unable to accept connection" msgstr "Αδύνατη η αποδοχή συνδέσεων" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Πρόβλημα κατά το hashing του αρχείου" @@ -1985,62 +1985,67 @@ msgstr "Αδύνατη η σύνδεση στο %s:%s (%s)." msgid "Connecting to %s" msgstr "Σύνδεση στο %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Αδύνατη η εύρεση του '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Προσωρινή αποτυχία στην εύρεση του '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Κάτι παράξενο συνέβη κατά την εύρεση του '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Αδύνατη η σύνδεση στο %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Εγκατάλειψη της εγκατάστασης." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "Ε: Λίστα Ορισμάτων από Acquire::gpgv::Options πολύ μεγάλη. Έξοδος." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Εσωτερικό σφάλμα: Η υπογραφή είναι καλή, αλλά αδυναμία προσδιορισμού του " "αποτυπώματος?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Βρέθηκε τουλάχιστον μια μη έγκυρη υπογραφή." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Αδυναμία εκτέλεσης του '%s' για την επαλήθευση της υπογραφής (είναι " "εγκατεστημένο το gpgv;)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Άγνωστο σφάλμα κατά την εκτέλεση του gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Οι παρακάτω υπογραφές ήταν μη έγκυρες:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2091,49 +2096,49 @@ msgstr "Ο διακομιστής http δεν υποστηρίζει πλήρω msgid "Unknown date format" msgstr "Άγνωστη μορφή ημερομηνίας" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Η επιλογή απέτυχε" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Λήξη χρόνου σύνδεσης" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Σφάλμα στην εγγραφή στο αρχείο εξόδου" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Σφάλμα στην εγγραφή στο αρχείο" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "Σφάλμα στην ανάγνωση από το διακομιστή, το άλλο άκρο έκλεισε τη σύνδεση" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Σφάλμα στην ανάγνωση από το διακομιστή" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Αποτυχία εγγραφής του αρχείου %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Ελαττωματικά δεδομένα επικεφαλίδας" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Η σύνδεση απέτυχε" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Εσωτερικό Σφάλμα" @@ -2141,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 @@ -2182,53 +2194,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Η επιλογή %s δε βρέθηκε" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Μη αναγνωρισμένος τύπος σύντμησης: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Συντακτικό σφάλμα %s:%u: Το block αρχίζει χωρίς όνομα." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Συντακτικό σφάλμα %s:%u: Λάθος μορφή Ετικέτας (Tag)" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες μετά την τιμή" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Συντακτικό σφάλμα %s:%u: Οι οδηγίες βρίσκονται μόνο στο ανώτατο επίπεδο" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Συντακτικό σφάλμα %s:%u: Υπερβολικός αριθμός συνδυασμένων includes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Συντακτικό σφάλμα %s:%u: Συμπεριλαμβάνεται από εδώ" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Συντακτικό σφάλμα %s:%u: Μη υποστηριζόμενη εντολή '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Συντακτικό σφάλμα %s:%u: Άχρηστοι χαρακτήρες στο τέλος του αρχείου" @@ -2305,78 +2317,78 @@ msgstr "Αδύνατη η αλλαγή σε %s" msgid "Failed to stat the cdrom" msgstr "Αδύνατη η εύρεση της κατάστασης του cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το ανάγνωσης μόνο αρχείο κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου κλειδώματος %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Δε θα χρησιμοποιηθεί κλείδωμα για το συναρμοσμένο από nfs αρχείο κλειδώματος " "%s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Αδύνατο το κλείδωμα %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Αναμονή του %s, αλλά δε βρισκόταν εκεί" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Η υποδιεργασία %s έλαβε ένα σφάλμα καταμερισμού (segfault)" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Η υποδιεργασία %s επέστρεψε ένα κωδικός σφάλματος (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Η υποδιεργασία %s εγκατέλειψε απρόσμενα" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Αδύνατο το άνοιγμα του αρχείου %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "αναγνώστηκαν, απομένουν ακόμη %lu για ανάγνωση αλλά δεν απομένουν άλλα" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "γράφτηκαν, απομένουν %lu για εγγραφή αλλά χωρίς επιτυχία" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Πρόβλημα κατά το κλείσιμο του αρχείου" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Πρόβλημα κατά την διαγραφή του αρχείου" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Πρόβλημα κατά τον συγχρονισμό του αρχείου" @@ -2493,52 +2505,52 @@ msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s msgid "Unable to parse package file %s (2)" msgstr "Αδύνατη η ανάλυση του αρχείου πακέτου %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Απόλυτο dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Λάθος μορφή της γραμμής %lu στη λίστα πηγών %s (Ανάλυση dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Άνοιγμα του %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Η γραμμή %u έχει υπερβολικό μήκος στη λίστα πηγών %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (τύπος)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Ο τύπος '%s' στη γραμμή %u στη λίστα πηγών %s είναι άγνωστος " -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Λάθος μορφή της γραμμής %u στη λίστα πηγών %s (id κατασκευαστή)" @@ -2669,17 +2681,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ίσως να πρέπει να τρέξετε apt-get update για να διορθώσετε αυτά τα προβλήματα" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Μη έγκυρη εγγραφή στο αρχείο προτιμήσεων, καμία επικεφαλίδα Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Αδύνατη η κατανόηση του τύπου καθήλωσης %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" "Δεν έχει οριστεί προτεραιότητα (ή έχει οριστεί μηδενική) για την καθήλωση" @@ -2768,16 +2780,16 @@ msgstr "Προέκυψε σφάλμα κατά την επεξεργασία τ msgid "Package %s %s was not found while processing file dependencies" msgstr "Το πακέτο %s %s δε βρέθηκε κατά την επεξεργασία εξαρτήσεων του αρχείου" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Αδύνατη η εύρεση της κατάστασης της λίστας πηγαίων πακέτων %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Συλλογή Παροχών Αρχείου" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Σφάλμα IO κατά την αποθήκευση της cache πηγών" @@ -2786,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:432 msgid "MD5Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Ανόμοιο MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2807,7 +2819,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο. (λόγω χαμένου αρχείου)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2816,7 +2828,7 @@ msgstr "" "Αδύνατος ο εντοπισμός ενός αρχείου για το πακέτο %s. Αυτό ίσως σημαίνει ότι " "χρειάζεται να διορθώσετε χειροκίνητα το πακέτο." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2824,7 +2836,7 @@ msgstr "" "Κατεστραμμένα αρχεία ευρετηρίου πακέτων. Δεν υπάρχει πεδίο Filename: στο " "πακέτο %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Ανόμοιο μέγεθος" @@ -2959,7 +2971,6 @@ msgstr "Εγιναν %i εγγραφές με %i απώντα αρχεία κα #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Άνοιγμα του αρχείου ρυθμίσεων %s" @@ -2970,7 +2981,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Ανόμοιο MD5Sum" @@ -2991,7 +3001,6 @@ msgstr "Αφαιρώ το %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Το %s διαγράφηκε πλήρως" @@ -3077,14 +3086,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Αδύνατη η εύρεση του συνόλου κλειδιών '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Αδύνατη η διόρθωση του αρχείου" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/en_GB.po b/po/en_GB.po index 3b73e344b..39163a47e 100644 --- a/po/en_GB.po +++ b/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: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -146,7 +146,7 @@ msgstr " Version table:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -299,7 +299,7 @@ msgstr "" " -c=? Read this configuration file\n" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Unable to write to %s" @@ -432,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB is old, attempting to upgrade %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB format is invalid. If you upgraded from a older version of apt, please " @@ -450,11 +451,11 @@ msgstr "Unable to open DB file %s: %s" msgid "Failed to stat %s" msgstr "Failed to stat %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archive has no control record" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Unable to get a cursor" @@ -519,26 +520,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archive had no package field" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s has no override entry\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s maintainer is %s not %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s has no source override entry\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s has no binary override entry either\n" @@ -642,7 +643,7 @@ msgstr "Failed to rename %s to %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex compilation error - %s" @@ -803,11 +804,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Unable to lock the download directory" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "The list of sources could not be read." @@ -836,8 +837,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Couldn't determine free space in %s" @@ -874,7 +875,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Do you want to continue [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Failed to fetch %s %s\n" @@ -883,7 +884,7 @@ msgstr "Failed to fetch %s %s\n" msgid "Some files failed to download" msgstr "Some files failed to download" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Download complete and in download only mode" @@ -980,35 +981,35 @@ msgstr "Version ‘%s’ for ‘%s’ was not found" msgid "Selected version %s (%s) for %s\n" msgstr "Selected version %s (%s) for %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "The update command takes no arguments" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Unable to lock the list directory" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1016,18 +1017,18 @@ msgstr "" "The following packages were automatically installed and are no longer " "required:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' to remove them." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1045,43 +1046,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "The following information may help to resolve the situation:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internal Error, AutoRemoved broke stuff" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, AllUpgrade broke stuff" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Couldn't find task %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Couldn't find package %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, selecting %s for regex ‘%s’\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s set to manually installed.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1090,7 @@ msgstr "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,116 +1102,116 @@ msgstr "" "distribution that some required packages have not yet been created\n" "or been moved out of Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Broken packages" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "The following extra packages will be installed:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Suggested packages:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Recommended packages:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculating upgrade... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Failed" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Done" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Internal error, problem resolver broke stuff" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Unable to find a source package for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Skipping already downloaded file '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Need to get %sB of source archives.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Fetch source %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Failed to fetch some archives." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Unpack command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Build command ‘%s’ failed.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Child process failed" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Unable to get build-dependency information for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s has no build depends.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1219,7 +1220,7 @@ msgstr "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,31 +1229,31 @@ msgstr "" "%s dependency for %s cannot be satisfied because no available versions of " "package %s can satisfy version requirements" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Failed to satisfy %s dependency for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Build-dependencies for %s could not be satisfied." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Failed to process build dependencies" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Supported modules:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1337,7 +1338,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1583,11 +1584,10 @@ msgstr "File %s/%s overwrites the one in the package %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Unable to read %s" @@ -1617,9 +1617,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "The info and temp directories need to be on the same filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Reading package lists" @@ -1753,11 +1753,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" @@ -1819,7 +1819,7 @@ msgstr "Connection timeout" msgid "Server closed the connection" msgstr "Server closed the connection" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Read error" @@ -1831,7 +1831,7 @@ msgstr "A response overflowed the buffer." msgid "Protocol corruption" msgstr "Protocol corruption" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Write error" @@ -1885,7 +1885,7 @@ msgstr "Data socket connect timed out" msgid "Unable to accept connection" msgstr "Unable to accept connection" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem hashing file" @@ -1949,59 +1949,64 @@ msgstr "Could not connect to %s:%s (%s)." msgid "Connecting to %s" msgstr "Connecting to %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Could not resolve ‘%s’" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporary failure resolving ‘%s’" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Something wicked happened resolving ‘%s:%s’ (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Unable to connect to %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Aborting install." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argument list from Acquire::gpgv::Options too long. Exiting." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internal error: Good signature, but could not determine key fingerprint?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "At least one invalid signature was encountered." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Could not execute '%s' to verify signature (is gpgv installed?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Unknown error executing gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "The following signatures were invalid:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2052,47 +2057,47 @@ msgstr "This HTTP server has broken range support" msgid "Unknown date format" msgstr "Unknown date format" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Select failed" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Connection timed out" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Error writing to output file" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Error writing to file" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Error writing to the file" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Error reading from server. Remote end closed connection" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Error reading from server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Failed to truncate file" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Bad header data" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Connection failed" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Internal error" @@ -2100,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 @@ -2141,52 +2153,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Selection %s not found" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Unrecognized type abbreviation: ‘%c’" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Opening configuration file %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Block starts with no name." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Malformed tag" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: Extra junk after value" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntax error %s:%u: Directives can only be done at the top level" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Too many nested includes" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Unsupported directive ‘%s’" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: Extra junk at end of file" @@ -2262,75 +2274,75 @@ msgstr "Unable to change to %s" msgid "Failed to stat the cdrom" msgstr "Failed to stat the cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Not using locking for read only lock file %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Could not open lock file %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Not using locking for nfs mounted lock file %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Could not get lock %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Waited for %s but it wasn't there" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-process %s received a segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-process %s returned an error code (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-process %s exited unexpectedly" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Could not open file %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, still have %lu to read but none left" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, still have %lu to write but couldn't" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem closing the file" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem unlinking the file" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem syncing the file" @@ -2447,52 +2459,52 @@ msgstr "Unable to parse package file %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Unable to parse package file %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Malformed line %lu in source list %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Malformed line %lu in source list %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Malformed line %lu in source list %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Malformed line %lu in source list %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Malformed line %lu in source list %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opening %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Line %u too long in source list %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Malformed line %u in source list %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type ‘%s’ is not known on line %u in source list %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Malformed line %u in source list %s (vendor id)" @@ -2618,17 +2630,17 @@ msgstr "The package lists or status file could not be parsed or opened." msgid "You may want to run apt-get update to correct these problems" msgstr "You may want to run apt-get update to correct these problems" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Invalid record in the preferences file, no Package header" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Did not understand pin type %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "No priority (or zero) specified for pin" @@ -2712,16 +2724,16 @@ msgstr "Error occurred while processing %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Package %s %s was not found while processing file dependencies" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Couldn't stat source package list %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Collecting File Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO Error saving source cache" @@ -2730,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:432 msgid "MD5Sum mismatch" msgstr "MD5Sum mismatch" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum mismatch" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2751,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2760,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:1360 #, 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:1447 msgid "Size mismatch" msgstr "Size mismatch" @@ -2902,7 +2914,6 @@ msgstr "Wrote %i records with %i missing files and %i mismatched files\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Opening configuration file %s" @@ -2913,7 +2924,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum mismatch" @@ -2934,7 +2944,6 @@ msgstr "Removing %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Completely removed %s" @@ -3018,14 +3027,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Couldn't access keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Could not patch file" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.18\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -150,7 +150,7 @@ msgstr " Tabla de versin:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -309,7 +309,7 @@ msgstr "" " -o=? Establece una opcin de configuracin arbitraria, p. ej. -o dir::" "cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "No se puede escribir en %s" @@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB anticuada, intentando actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "El formato de la base de datos no es vlido. Debe eliminar y recrear la base " @@ -465,11 +466,11 @@ msgstr "No se pudo abrir el archivo DB %s: %s" msgid "Failed to stat %s" msgstr "No pude leer %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "No hay registro de control del archivo" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "No se pudo obtener un cursor" @@ -534,26 +535,26 @@ msgstr "*** No pude enlazar %s con %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink se ha llegado al lmite de %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archivo no tiene campo de paquetes" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s no tiene entrada de predominio\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " el encargado de %s es %s y no %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s no tiene una entrada fuente predominante\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampoco tiene una entrada binaria predominante\n" @@ -657,7 +658,7 @@ msgstr "Fall el renombre de %s a %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Error de compilacin de expresiones regulares - %s" @@ -818,11 +819,11 @@ msgstr "Los paquetes necesitan eliminarse pero Remove est deshabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Error interno, no termin el ordenamiento" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 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:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "No se pudieron leer las listas de fuentes." @@ -854,8 +855,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Se liberarn %sB despus de esta operacin.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "No pude determinar el espacio libre en %s" @@ -892,7 +893,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Desea continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Imposible obtener %s %s\n" @@ -901,7 +902,7 @@ msgstr "Imposible obtener %s %s\n" msgid "Some files failed to download" msgstr "Algunos archivos no pudieron descargarse" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descarga completa y en modo de slo descarga" @@ -998,36 +999,36 @@ msgstr "No se encontr la versin '%s' para '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "Versin seleccionada %s (%s) para %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "El comando de actualizacin no toma argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "No se pudo bloquear el directorio de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1035,18 +1036,18 @@ msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Se instalaron de forma automtica los siguientes paquetes y ya no son " "necesarios." -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilice apt-get autoremove para eliminarlos." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1064,43 +1065,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "La siguiente informacin puede ayudar a resolver la situacin:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Error interno, AutoRemover rompi cosas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Error Interno, AllUpgrade rompi cosas" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "No se pudo encontrar la tarea %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "No se pudo encontrar el paquete %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, seleccionando %s para la expresin regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "fijado %s como instalado manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1108,7 +1109,7 @@ msgstr "" "Dependencias incumplidas. Intente 'apt-get -f install' sin paquetes (o " "especifique una solucin)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1120,119 +1121,119 @@ msgstr "" "inestable, que algunos paquetes necesarios no han sido creados o han\n" "sido movidos fuera de Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Se instalarn los siguientes paquetes extras:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquetes sugeridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquetes recomendados" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculando la actualizacin... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fall" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Listo" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "Error interno, el sistema de solucin de problemas rompi\n" "algunas cosas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Debe especificar al menos un paquete para obtener su cdigo fuente" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, 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:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ignorando fichero ya descargado '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "No tiene suficiente espacio libre en %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Necesito descargar %sB de archivos fuente.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Fuente obtenida %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "No se pudieron obtener algunos archivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fall la orden de desempaquetamiento '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fall la orden de construccin '%s'.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Fall el proceso hijo" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Debe especificar al menos un paquete para verificar sus\n" "dependencias de construccin" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "No se pudo obtener informacin de dependencias de construccin para %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s no tiene dependencias de construccin.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1241,7 +1242,7 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque no se puede \n" "encontrar el paquete %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1250,32 +1251,32 @@ msgstr "" "La dependencia %s en %s no puede satisfacerse porque ninguna versin\n" "disponible del paquete %s satisface los requisitos de versin" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "No se pudieron satisfacer las dependencias de construccin de %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "No se pudieron procesar las dependencias de construccin" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mdulos soportados:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1361,7 +1362,7 @@ msgstr "" "para ms informacin y opciones.\n" " Este APT tiene poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1613,11 +1614,10 @@ msgstr "El archivo %s/%s sobreescribe al que est en el paquete %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "No pude leer %s" @@ -1648,9 +1648,9 @@ msgstr "" "Los directorios info y temp deben de estar en el mismo sistema de archivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Leyendo lista de paquetes" @@ -1784,11 +1784,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 modificacin" @@ -1850,7 +1850,7 @@ msgstr "La conexin expir" msgid "Server closed the connection" msgstr "El servidor cerr la conexin" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Error de lectura" @@ -1862,7 +1862,7 @@ msgstr "Una respuesta desbord el buffer." msgid "Protocol corruption" msgstr "Corrupcin del protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Error de escritura" @@ -1916,7 +1916,7 @@ msgstr "Expir conexin a socket de datos" msgid "Unable to accept connection" msgstr "No pude aceptar la conexin" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Hay problemas enlazando fichero" @@ -1980,61 +1980,66 @@ msgstr "No pude conectarme a %s:%s (%s)." msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "No pude resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal al resolver '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo raro pas resolviendo '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "No pude conectarme a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "No se pudo acceder al anillo de claves: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortando la instalacin." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options demasiado larga. Terminando." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error interno: Firma correcta, pero no se pudo determinar su huella digital?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Se encontr al menos una firma invlida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "No se pudo ejecutar '%s' para verificar la firma (est instalado gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Error desconocido ejecutando gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Las siguientes firms fueron invlidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2085,47 +2090,47 @@ msgstr "ste servidor de http tiene el soporte de alcance roto" msgid "Unknown date format" msgstr "Formato de fecha desconocido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Fall la seleccin" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Expir la conexin" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Error escribiendo al archivo de salida" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Error escribiendo a archivo" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Error escribiendo al archivo" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Error leyendo del servidor, el lado remoto cerr la conexin." -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Error leyendo del servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Fall al truncar el archivo" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Mala cabecera Data" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Fallo la conexin" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Error interno" @@ -2133,18 +2138,25 @@ msgstr "Error interno" msgid "Can't mmap an empty file" msgstr "No puedo hacer mmap de un fichero vaco" -#: 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 @@ -2174,54 +2186,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Seleccin %s no encontrada" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tipo de abreviacin no reconocida: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Abriendo fichero de configuracin %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Error de sintaxis %s:%u: No hay un nombre al comienzo del bloque." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Error de sintaxis %s:%u: Marca mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Error de sintaxis %s:%u: Basura extra despus del valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Error de sintaxis %s:%u: Las directivas slo se pueden poner\n" "en el primer nivel" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Error de sintaxis %s:%u: Demasiadas inclusiones anidadas" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Error de sintaxis %s:%u: Incluido desde aqu" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Error de sintaxis %s:%u: Directiva '%s' no soportada" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Error de sintaxis %s:%u: Basura extra al final del archivo" @@ -2299,75 +2311,75 @@ msgstr "No se pudo cambiar a %s" msgid "Failed to stat the cdrom" msgstr "No pude montar el cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "No se utiliza bloqueos para el fichero de bloqueo de slo lectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "No se pudo abrir el fichero de bloqueo '%s'" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "No se utilizan bloqueos para el fichero de bloqueo de montaje nfs %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "No se pudo bloquear %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperaba %s pero no estaba all" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "El subproceso %s recibi un fallo de segmentacin." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "El subproceso %s devolvi un cdigo de error (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "El subproceso %s termin de forma inesperada" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "No pude abrir el fichero %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "ledos, todava deba leer %lu pero no queda nada" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritos, todava tena que escribir %lu pero no pude hacerlo" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problemas cerrando el archivo" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Hay problemas desligando el fichero %s" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Hay problemas sincronizando el fichero" @@ -2484,52 +2496,52 @@ msgstr "No se pudo tratar el archivo de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "No se pudo tratar el archivo de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Lnea %lu mal formada en lista de fuentes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Lnea %lu mal formada en lista de fuentes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Lnea %lu mal formada en lista de fuentes %s (anlisis de dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abriendo %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Lnea %u demasiado larga en la lista de fuentes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Lnea %u mal formada en lista de fuentes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' desconocido en la lnea %u de lista de fuentes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Lnea %u mal formada en la lista de fuentes %s (id del fabricante)" @@ -2660,18 +2672,18 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Tal vez quiera ejecutar 'apt-get update' para corregir estos problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Registro invlido en el archivo de preferencias, no hay cabecera de paquete" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "No se entiende el pin tipo %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "No hay prioridad especificada para pin (o es cero)" @@ -2761,16 +2773,16 @@ msgstr "" "Al procesar las dependencias de archivos no se encontr el\n" "paquete %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "No se puede leer la lista de paquetes fuente %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Recogiendo archivos que proveen" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Error de E/S guardando cach fuente" @@ -2779,21 +2791,21 @@ msgstr "Error de E/S guardando cach fuente" 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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "La suma hash difiere" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "No existe ninguna clave pblica disponible para los siguientes " "identificadores de clave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2803,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2812,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:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2820,7 +2832,7 @@ msgstr "" "Los archivos de ndice de paquetes estn corrompidos. El campo 'Filename:' " "no existe para para el paquete %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "El tamao difiere" @@ -2959,7 +2971,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Abriendo fichero de configuracin %s" @@ -2970,7 +2981,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "La suma hash difiere" @@ -2991,7 +3001,6 @@ msgstr "Eliminando %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Se borr completamente %s" @@ -3077,14 +3086,30 @@ 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 conexin se cerr prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "No se pudo acceder al anillo de claves: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "No pude parchear el fichero" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_eu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -150,7 +150,7 @@ msgstr " Bertsio taula:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -303,7 +303,7 @@ msgstr "" " -c=? Irakurri konfigurazio fitxategi hau\n" " -o=? Ezarri konfigurazio aukera arbitrario bat. Adib.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s : ezin da idatzi" @@ -435,8 +435,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Datu-basea zaharra da; %s bertsio-berritzen saiatzen ari da" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB formatu baliogabe da. Apt bertsio zaharrago batetik eguneratu baduzu, " @@ -453,11 +454,11 @@ msgstr "Ezin da ireki %s datu-base fitxategia: %s" msgid "Failed to stat %s" msgstr "Huts egin du %s(e)tik datuak lortzean" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Artxiboak ez du kontrol erregistrorik" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ezin da kurtsorerik eskuratu" @@ -522,26 +523,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Artxiboak ez du pakete eremurik" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s: ez du override sarrerarik\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s mantentzailea %s da, eta ez %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s: ez du jatorri gainidazketa sarrerarik\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s: ez du bitar gainidazketa sarrerarik\n" @@ -645,7 +646,7 @@ msgstr "Huts egin du %s izenaren ordez %s ipintzean" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Adierazpen erregularren konpilazio errorea - %s" @@ -806,11 +807,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Ezin da deskarga direktorioa blokeatu" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Ezin izan da Iturburu zerrenda irakurri." @@ -841,8 +842,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Ezin da %s(e)n duzun leku librea atzeman." @@ -879,7 +880,7 @@ msgstr "Abortatu." msgid "Do you want to continue [Y/n]? " msgstr "Aurrera jarraitu nahi al duzu [B/e]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ezin da lortu %s %s\n" @@ -888,7 +889,7 @@ msgstr "Ezin da lortu %s %s\n" msgid "Some files failed to download" msgstr "Fitxategi batzuk ezin izan dira deskargatu" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Deskarga amaituta eta deskarga soileko moduan" @@ -985,35 +986,35 @@ msgstr "'%2$s'(r)en '%1$s' bertsioa ez da aurkitu" msgid "Selected version %s (%s) for %s\n" msgstr "Hautatutako bertsioa: %s (%s) -- %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Eguneratzeko komandoak ez du argumenturik hartzen" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Ezin da zerrenda direktorioa blokeatu" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1021,18 +1022,18 @@ msgstr "" "Ondorengo pakete automatikoki instalatuak izan ziren eta ez dira luzaroago " "behar." -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "'apt-get autoremove' erabili ezabatzeko." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1050,43 +1051,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Informazio honek arazoa konpontzen lagun dezake:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Barne Errorea, AutoRemover-ek zerbait apurtu du" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Barne Errorea, AllUpgade-k zerbait apurtu du" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Ezin izan da %s zeregina aurkitu" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Ezin izan da %s paketea aurkitu" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Oharra: %s hautatzen '%s' adierazpen erregularrarentzat\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s eskuz instalatua bezala ezarri.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1094,7 +1095,7 @@ msgstr "" "Bete gabeko mendekotasunak. Probatu 'apt-get -f install' paketerik gabe (edo " "zehaztu konponbide bat)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1106,117 +1107,117 @@ msgstr "" "beharrezko pakete batzuk ez ziren sortuko oraindik, edo \n" "Sarrerakoetan (Incoming) egoten jarraituko dute." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Hautsitako paketeak" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Ondorengo pakete gehigarriak instalatuko dira:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Iradokitako paketeak:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Gomendatutako paketeak:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Berriketak kalkulatzen... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Huts egin du" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Eginda" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Barne Errorea, arazo konpontzaileak zerbait apurtu du" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Gutxienez pakete bat zehaztu behar duzu iturburua lortzeko" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Ezin da iturburu paketerik aurkitu %s(r)entzat" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Dagoeneko deskargaturiko '%s' fitxategia saltatzen\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Iturburu artxiboetako %sB eskuratu behar dira.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Eskuratu %s iturburua\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Huts egin du zenbat artxibo lortzean." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Deskonprimitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Egiaztatu 'dpkg-dev' paketea instalaturik dagoen.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Eraikitzeko '%s' komandoak huts egin du.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Prozesu umeak huts egin du" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, 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:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s: ez du eraikitze mendekotasunik.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgid "" msgstr "" "%2$s(r)en %1$s mendekotasuna ezin da bete, %3$s paketea ezin delako aurkitu" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,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:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, 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:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Huts egin du eraikitze mendekotasunak prozesatzean" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Onartutako Moduluak:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1343,7 +1344,7 @@ msgstr "" "sources.list(5) eta apt.conf(5) orrialdeak eskuliburuan.\n" " APT honek Super Behiaren Ahalmenak ditu.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1590,11 +1591,10 @@ msgstr "%s/%s fitxategiak %s paketekoa gainidazten du" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ezin da %s irakurri" @@ -1624,9 +1624,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info eta temp direktorioek fitxategi sistema berean egon behar dute" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Pakete Zerrenda irakurtzen" @@ -1762,11 +1762,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" @@ -1830,7 +1830,7 @@ msgstr "Konexioa denboraz kanpo" msgid "Server closed the connection" msgstr "Zerbitzariak konexioa itxi du" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Irakurketa errorea" @@ -1842,7 +1842,7 @@ msgstr "Erantzun batek bufferrari gainez eragin dio." msgid "Protocol corruption" msgstr "Protokolo hondatzea" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Idazketa errorea" @@ -1897,7 +1897,7 @@ msgstr "Datu-socket konexioak denbora muga gainditu du" msgid "Unable to accept connection" msgstr "Ezin da konexioa onartu" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Arazoa fitxategiaren hash egitean" @@ -1962,58 +1962,63 @@ msgstr "Ezin izan da konektatu -> %s:%s (%s)" msgid "Connecting to %s" msgstr "Konektatzen -> %s..." -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Ezin izan da '%s' ebatzi" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Aldi baterako akatsa '%s' ebaztean" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ezin da konektatu -> %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Ezin da eraztuna ebatzi: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortatu instalazioa." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options argumentu zerrenda luzeegia. Uzten." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Barne errorea: Sinadura zuzena, baina ezin da egiaztapen marka zehaztu" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Beintza sinadura baliogabe bat aurkitu da." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Ezin da %s abiarazi sinadura egiaztatzeko (gpgv instalaturik al dago?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Errore ezezaguna gpgv exekutatzean" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Ondorengo sinadurak baliogabeak dira:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2064,47 +2069,47 @@ msgstr "http zerbitzariak barruti onarpena apurturik du" msgid "Unknown date format" msgstr "Datu formatu ezezaguna" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Hautapenak huts egin du" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Konexioaren denbora muga gainditu da" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Errorea irteerako fitxategian idaztean" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Errorea fitxategian idaztean" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Errorea zerbitzaritik irakurtzen Urrunetik amaitutako konexio itxiera" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Errorea zerbitzaritik irakurtzean" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Huts fitxategia mozterakoan" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Goiburu data gaizki dago" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Konexioak huts egin du" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Barne errorea" @@ -2112,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. " @@ -2126,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 @@ -2155,52 +2167,52 @@ msgstr "" msgid "Selection %s not found" msgstr "%s hautapena ez da aurkitu" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Mota ezezaguneko laburtzapena: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurazio fitxategia irekitzen" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Sintaxi errorea, %s:%u: Blokearen hasieran ez dago izenik." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Sintaxi errorea %s:%u: Gaizki eratutako" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria balioaren ondoren" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Sintaxi errorea, %s:%u: Direktibak goi-mailan bakarrik egin daitezke" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Sintaxi errorea, %s:%u: habiaratutako elementu gehiegi" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Sintaxi errorea, %s:%u: hemendik barne hartuta" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Sintaxi errorea, %s:%u: onartu gabeko '%s' direktiba" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Sintaxi errorea, %s:%u: Zabor gehigarria fitxategi amaieran" @@ -2277,78 +2289,78 @@ msgstr "Ezin da %s(e)ra aldatu" msgid "Failed to stat the cdrom" msgstr "Huts egin du CDROMa atzitzean" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari irakurtzeko soilik den %s blokeo " "fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Ezin izan da %s blokeo fitxategia ireki" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Ez da blokeorik erabiltzen ari nfs %s muntatutako blokeo fitxategiarentzat" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Ezin izan da %s blokeoa hartu" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s espero zen baina ez zegoen han" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s azpiprozesuak segmentaziuo hutsegitea jaso du." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s azpiprozesuak errore kode bat itzuli du (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s azpiprozesua ustekabean amaitu da" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s fitxategia ezin izan da ireki" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "irakurrita; oraindik %lu irakurtzeke, baina ez da ezer geratzen" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "idatzita; oraindik %lu idazteke, baina ezin da" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Arazoa fitxategia ixtean" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Arazoa fitxategia desestekatzean" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Arazoa fitxategia sinkronizatzean" @@ -2465,52 +2477,52 @@ msgstr "Ezin da %s pakete fitxategia analizatu (1)" msgid "Unable to parse package file %s (2)" msgstr "Ezin da %s pakete fitxategia analizatu (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (URI analisia)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Gaizkieratutako %lu lerroa %s iturburu zerrendan (banaketa orokorra)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Gaizki osatutako %lu lerroa %s Iturburu zerrendan (dist analisia)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s irekitzen" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "%2$s iturburu zerrendako %1$u lerroa luzeegia da." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' mota ez da ezagutzen %u lerroan %s Iturburu zerrendan" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gaizki osatutako %u lerroa %s Iturburu zerrendan (hornitzaile id-a)" @@ -2636,17 +2648,17 @@ msgstr "Pakete zerrenda edo egoera fitxategia ezin dira analizatu edo ireki." msgid "You may want to run apt-get update to correct these problems" msgstr "Beharbada 'apt-get update' exekutatu nahiko duzu arazoak konpontzeko" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Erregistro baliogabea hobespenen fitxategian, pakete goibururik ez" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Ez da ulertu %s orratz-mota (pin)" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ez da lehentasunik zehaztu orratzarentzat (pin) (edo zero da)" @@ -2730,16 +2742,16 @@ msgstr "Errorea gertatu da %s prozesatzean (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "%s %s paketea ez da aurkitu fitxategi mendekotasunak prozesatzean" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ezin da atzitu %s iturburu paketeen zerrenda" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Fitxategiaren erreferentziak biltzen" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "S/I errorea iturburu katxea gordetzean" @@ -2748,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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Egiaztapena ez dator bat" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2769,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2778,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:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2786,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:1447 msgid "Size mismatch" msgstr "Tamaina ez dator bat" @@ -2922,7 +2934,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "%s konfigurazio fitxategia irekitzen" @@ -2933,7 +2944,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Egiaztapena ez dator bat" @@ -2954,7 +2964,6 @@ msgstr "%s kentzen" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s guztiz ezabatu da" @@ -3040,14 +3049,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Ezin da eraztuna ebatzi: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Ezin izan zaio fitxategiari adabakia ezarri" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.26\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -148,7 +148,7 @@ msgstr " Versiotaulukko:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -300,7 +300,7 @@ msgstr "" " -c=? Lue tämä asetustiedosto\n" " -o=? Aseta mikä asetusvalitsin tahansa, esim. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Tiedostoon %s kirjoittaminen ei onnistu" @@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Tietokanta on vanha, yritetään päivittää %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Tietokannan muoto ei kelpaa. Jos tehtiin päivitys vanhasta apt:n versiosta, " @@ -454,11 +455,11 @@ msgstr "Tietokantatiedostoa %s ei saatu avattua: %s" msgid "Failed to stat %s" msgstr "Tiedostolle %s ei toimi stat" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkistolla ei ole ohjaustietuetta" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kohdistinta ei saada" @@ -523,26 +524,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkistossa ei ollut pakettikenttää" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s ylläpitäjä on %s eikä %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s:llä ei ole poikkeustietuetta\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s:llä ei ole binääristäkään poikkeustietuetta\n" @@ -646,7 +647,7 @@ msgstr "Nimen muuttaminen %s -> %s ei onnistunut" msgid "Y" msgstr "K" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Käännösvirhe lausekkeessa - %s" @@ -807,11 +808,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Noutokansiota ei saatu lukittua" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lähteiden luetteloa ei pystynyt lukemaan." @@ -841,8 +842,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kansion %s vapaan tilan määrä ei selvinnyt" @@ -880,7 +881,7 @@ msgstr "Keskeytä." msgid "Do you want to continue [Y/n]? " msgstr "Haluatko jatkaa [K/e]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Tiedoston %s nouto ei onnistunut %s\n" @@ -889,7 +890,7 @@ msgstr "Tiedoston %s nouto ei onnistunut %s\n" msgid "Some files failed to download" msgstr "Joidenkin tiedostojen nouto ei onnistunut" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nouto on valmis ja määrätty vain nouto" @@ -986,36 +987,36 @@ msgstr "Versiota \"%s\" paketille \"%s\" ei löytynyt" msgid "Selected version %s (%s) for %s\n" msgstr "Valittiin versio %s (%s) paketille %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Komento update ei käytä parametreja" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Luettelokansiota ei voitu lukita" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1023,18 +1024,18 @@ msgstr "" "Seuraavat paketit asennettiin automaattisesti, eivätkä ne ole enää " "vaadittuja:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Poista ne komennolla \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1052,43 +1053,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Seuraavista tiedoista voi olla hyötyä selvitettäessä tilannetta:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Sisäinen virhe, AutoRemover rikkoi jotain" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Sisäinen virhe, AllUpgrade rikkoi jotain" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Tehtävää %s ei löytynyt" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Pakettia %s ei löytynyt" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Huomautus, valitaan %s lausekkeella \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s on merkitty käyttäjän toimesta asennetuksi.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1096,7 +1097,7 @@ msgstr "" "Kaikkia riippuvuuksia ei ole tyydytetty. Kokeile \"apt-get -f install\" " "ilmanpaketteja (tai ratkaise itse)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1107,116 +1108,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:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Rikkinäiset paketit" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Seuraavat ylimääräiset paketit on merkitty asennettaviksi:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Ehdotetut paketit:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Suositellut paketit:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Käsitellään päivitystä ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Ei onnistunut" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Valmis" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Sisäinen virhe, resolver rikkoi jotain" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Paketin %s lähdekoodipakettia ei löytynyt" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Ohitetaan jo noudettu tiedosto \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "On noudettava %st/%st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "On noudettava %st lähdekoodiarkistoja.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Nouda lähdekoodi %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Joidenkin arkistojen noutaminen ei onnistunut." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Purkukomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Tarkista onko paketti \"dpkg-dev\" asennettu.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Paketointikomento \"%s\" ei onnistunut.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Lapsiprosessi kaatui" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "On annettava ainakin yksi paketti jonka paketointiriippuvuudet tarkistetaan" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Paketille %s ei ole saatavilla riippuvuustietoja" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Paketille %s ei ole määritetty paketointiriippuvuuksia.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,7 @@ msgid "" msgstr "" "riippuvuutta %s paketille %s ei voi tyydyttää koska pakettia %s ei löydy" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,32 @@ msgstr "" "%s riippuvuutta paketille %s ei voi tyydyttää koska mikään paketin %s versio " "ei vastaa versioriippuvuuksia" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Riippuvuutta %s paketille %s ei voi tyydyttää: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Paketointiriippuvuuksia paketille %s ei voi tyydyttää." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Paketointiriippuvuuksien käsittely ei onnistunut" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Tuetut moduulit:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1343,7 @@ msgstr "" "lisätietoja ja lisää valitsimia.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1590,11 +1591,10 @@ msgstr "Tiedosto %s/%s kirjoitetaan paketista %s tulleen päälle" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Tiedostoa %s ei voi lukea" @@ -1624,9 +1624,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Kansioiden info ja temp pitää olla samassa tiedostojärjestelmässä" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Luetaan pakettiluetteloita" @@ -1762,11 +1762,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" @@ -1828,7 +1828,7 @@ msgstr "Yhteys aikakatkaistiin" msgid "Server closed the connection" msgstr "Palvelin sulki yhteyden" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lukuvirhe" @@ -1840,7 +1840,7 @@ msgstr "Vastaus aiheutti puskurin ylivuodon." msgid "Protocol corruption" msgstr "Yhteyskäytäntö on turmeltunut" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Virhe kirjoitettaessa" @@ -1894,7 +1894,7 @@ msgstr "Pistokkeen kytkeminen aikakatkaistiin" msgid "Unable to accept connection" msgstr "Yhteyttä ei voitu hyväksyä" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Pulmia tiedoston hajautuksessa" @@ -1958,61 +1958,66 @@ msgstr "Yhteyttä %s ei voitu muodostaa: %s (%s)" msgid "Connecting to %s" msgstr "Avataan yhteys %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nimeä \"%s\" ei voitu selvittää" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tilapäinen häiriö selvitettäessä \"%s\"" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ei ole mahdollista muodostaa yhteyttä %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Avainrengasta \"%s\" ei saatavilla" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Asennus keskeytetään." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Parametrien luettelo Acquire::gpgv::Options liian pitkä. Lopetetaan." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Sisäinen virhe: Allekirjoitus kelpaa, mutta avaimen sormenjälki tuntematon?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "LÖytyi ainakin yksi kelvoton allekirjoitus." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Ei käynnistynyt \"%s\" allekirjoitusta tarkistamaan (onko gpgv asennettu?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Tapahtui tuntematon virhe suoritettaessa gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Seuraavat allekirjoitukset eivät olleet kelvollisia:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2063,47 +2068,47 @@ msgstr "HTTP-palvelimen arvoaluetuki on rikki" msgid "Unknown date format" msgstr "Tuntematon päiväysmuoto" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Select ei toiminut" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Yhteys aikakatkaistiin" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Tapahtui virhe kirjoitettaessa tulostustiedostoon" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Tapahtui virhe kirjoitettaessa tiedostoon" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Tapahtui virhe luettaessa palvelimelta. Etäpää sulki yhteyden" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Tapahtui virhe luettaessa palvelimelta" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Tiedoston typistäminen ei onnistunut" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Virheellinen otsikkotieto" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Yhteys ei toiminut" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Sisäinen virhe" @@ -2111,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 @@ -2152,52 +2164,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Valintaa %s ei löydy" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Tuntematon tyypin lyhenne: \"%c\"" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Avataan asetustiedosto %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksivirhe %s: %u: Lohko alkaa ilman nimeä." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksivirhe %s: %u: väärän muotoinen nimikenttä" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksivirhe %s: %u: Arvon jälkeen ylimääräistä roskaa" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksivirhe %s: %u: Direktiivejä voi olla vain ylimmällä tasolla" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksivirhe %s: %u: Liian monta sisäkkäistä includea" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksivirhe %s: %u: Sisällytetty tästä" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksivirhe %s: %u: Tätä direktiiviä ei tueta \"%s\"" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksivirhe %s: %u: Ylimääräistä roskaa tiedoston lopussa" @@ -2273,75 +2285,75 @@ msgstr "Kansioon %s vaihto ei onnistu" msgid "Failed to stat the cdrom" msgstr "Komento stat ei toiminut rompulle" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Lukkoa ei käytetä kirjoitussuojatulle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Lukkotiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Lukitusta ei käytetä NFS-liitetylle tiedostolle %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Lukkoa %s ei saada" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Odotettiin %s, mutta sitä ei ollut" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Aliprosessi %s aiheutti suojausvirheen." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Aliprosessi %s palautti virhekoodin (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Aliprosessi %s lopetti odottamatta" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Tiedostoa %s ei voitu avata" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "read, vielä %lu lukematta mutta tiedosto loppui" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write, vielä %lu kirjoittamatta mutta epäonnistui" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Pulmia tiedoston sulkemisessa" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Pulmia tehtäessä tiedostolle unlink" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Pulmia tehtäessä tiedostolle sync" @@ -2458,52 +2470,52 @@ msgstr "Pakettitiedostoa %s (1) ei voi jäsentää" msgid "Unable to parse package file %s (2)" msgstr "Pakettitiedostoa %s (2) ei voi jäsentää" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (URI-jäsennys)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (Absoluuttinen dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Väärän muotoinen rivi %lu lähdeluettelossa %s (dist-jäsennys)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Avataan %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Rivi %u on liian pitkä lähdeluettelossa %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa %s (tyyppi)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tyyppi \"%s\" on tuntematon rivillä %u lähdeluettelossa %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rivi %u on väärän muotoinen lähdeluettelossa%s (toimittajan tunniste)" @@ -2628,17 +2640,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Voit haluta suorittaa apt-get update näiden pulmien korjaamiseksi" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Asetustiedostossa on virheellinen tietue, Package-otsikko puuttuu" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Tunnistetyyppi %s on tuntematon" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Tärkeysjärjestystä ei määritetty tunnisteelle (tai se on nolla)" @@ -2723,16 +2735,16 @@ msgstr "Tapahtui virhe käsiteltäessä %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Pakettia %s %s ei löytynyt käsiteltäessä tiedostojen riippuvuuksia." -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "stat ei toiminut lähdepakettiluettelolle %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Kootaan tiedostojen tarjoamistietoja" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Syöttö/Tulostus -virhe tallennettaessa pakettivarastoa" @@ -2741,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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum täsmää" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2762,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2771,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:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2779,7 +2791,7 @@ msgstr "" "Pakettihakemistotiedostot ovat turmeltuneet. Paketille %s ei ole Filename-" "kenttää." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Koko ei täsmää" @@ -2916,7 +2928,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Avataan asetustiedosto %s" @@ -2927,7 +2938,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum täsmää" @@ -2948,7 +2958,6 @@ msgstr "Poistetaan %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s poistettiin kokonaan" @@ -3034,14 +3043,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Avainrengasta \"%s\" ei saatavilla" + +#~ msgid "Could not patch file" +#~ msgstr "Tiedostoa %s ei voitu avata" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2010-01-11 15:17+0100\n" -"PO-Revision-Date: 2010-01-29 19:53+0100\n" +"PO-Revision-Date: 2010-02-27 07:25+0100\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" -"Language-Team: French <debian-l10n-french@lists.debian.org>\n" +"Language-Team: fr <debian-l10n-french@lists.debian.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -1275,8 +1275,7 @@ msgstr "Impossible de satisfaire les dépendances %s pour %s : %s" #: cmdline/apt-get.cc:2643 #, 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:2648 msgid "Failed to process build dependencies" @@ -2355,7 +2354,7 @@ msgstr "Verrou non utilisé pour le fichier %s se situant sur une partition nfs" #: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" -msgstr "Impossible de verrouiller %s" +msgstr "Impossible d'obtenir le verrou %s" #: apt-pkg/contrib/fileutl.cc:568 #, c-format @@ -2385,7 +2384,7 @@ msgstr "Le sous-processus %s s'est arrêté prématurément" #: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" -msgstr "Impossible de verrouiller %s" +msgstr "Impossible d'ouvrir le fichier %s" #: apt-pkg/contrib/fileutl.cc:688 #, c-format @@ -2845,8 +2844,7 @@ msgstr "Somme de contrôle de hachage incohérente" #: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_gl\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -151,7 +151,7 @@ msgstr " Táboa de versións:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -308,7 +308,7 @@ msgstr "" " -o=? Establece unha opción de configuración, por exemplo: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Non se puido escribir en %s" @@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "A base de datos é antiga, trátase de actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "O formato da base de datos non é válido. Se actualizou desde unha versión " @@ -465,11 +466,11 @@ msgstr "Non se puido abrir o ficheiro de base de datos %s: %s" msgid "Failed to stat %s" msgstr "Non se atopou %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo non ten un rexistro de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Non se puido obter un cursor" @@ -534,26 +535,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "O arquivo non tiña un campo Package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s non ten unha entrada de \"override\"\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " O mantedor de %s é %s, non %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, 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:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s tampouco ten unha entrada de \"override\" de binarios\n" @@ -657,7 +658,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:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Erro na compilación da expresión regular - %s" @@ -818,11 +819,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 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:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Non se puido ler a lista de orixes." @@ -852,8 +853,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Non se puido determinar o espazo libre en %s" @@ -890,7 +891,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "¿Quere continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Non se puido obter %s %s\n" @@ -899,7 +900,7 @@ msgstr "Non se puido obter %s %s\n" msgid "Some files failed to download" msgstr "Non se puido descargar algúns ficheiros" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Completouse a descarga no modo de só descargas" @@ -998,54 +999,54 @@ msgstr "Non se atopou a versión \"%s\" de \"%s\"" msgid "Selected version %s (%s) for %s\n" msgstr "Escolleuse a versión %s (%s) de %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "A orde \"update\" non toma argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Non se puido bloquear o directorio de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 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:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Empregue \"apt-get autoremove\" para eliminalos." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1063,43 +1064,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 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:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro interno, o autoeliminador rompeu cousas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade rompeu cousas" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Non se puido atopar a tarefa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Non se puido atopar o paquete %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, 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:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s cambiouse a instalado manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1107,7 +1108,7 @@ msgstr "" "Dependencias incumpridas. Probe \"apt-get -f install\" sen paquetes (ou " "especifique unha solución)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1118,118 +1119,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:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paquetes rotos" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Hanse instalar os seguintes paquetes extra:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paquetes suxiridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paquetes recomendados:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "A calcular a actualización... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Fallou" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Rematado" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o resolvedor interno rompeu cousas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, 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:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Omítese o ficheiro xa descargado \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, 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:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, 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:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Non se puido recibir algúns arquivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Fallou a orde de desempaquetamento \"%s\".\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Fallou a codificación de %s.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "O proceso fillo fallou" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, 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:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s non ten dependencias de compilación.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1239,7 @@ msgstr "" "A dependencia \"%s\" de %s non se pode satisfacer porque non se pode atopar " "o paquete %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1248,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:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, 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:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Non se puido procesar as dependencias de compilación" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Módulos soportados:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1360,7 +1361,7 @@ msgstr "" "máis información e opcións.\n" " Este APT ten Poderes de Supervaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1607,11 +1608,10 @@ msgstr "O ficheiro %s/%s sobrescribe o do paquete %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Non se pode ler %s" @@ -1642,9 +1642,9 @@ msgstr "" "Os directorios info e temp teñen que estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "A ler as listas de paquetes" @@ -1778,11 +1778,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" @@ -1844,7 +1844,7 @@ msgstr "Tempo esgotado para a conexión" msgid "Server closed the connection" msgstr "O servidor pechou a conexión" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de lectura" @@ -1856,7 +1856,7 @@ msgstr "Unha resposta desbordou o buffer." msgid "Protocol corruption" msgstr "Corrupción do protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escritura" @@ -1911,7 +1911,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:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1975,63 +1975,68 @@ msgstr "Non se puido conectar a %s:%s (%s)." msgid "Connecting to %s" msgstr "A conectar a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Non se puido resolver \"%s\"" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Fallo temporal ao resolver \"%s\"" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Non se pode conectar a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Non se puido acceder ao chaveiro: \"%s\"" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "A abortar a instalación." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire:gpgv::Options é longa de máis. Sáese." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Sinatura correcta, pero non se puido determinar a pegada " "dixital da chave" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Atopouse alomenos unha sinatura non válida." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Non se puido executar \"%s\" para verificar a sinatura (¿está gpgv " "instalado?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Erro descoñecido ao executar gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "As seguintes sinaturas non eran válidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2082,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:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Fallou a chamada a select" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "A conexión esgotou o tempo" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Erro ao escribir no ficheiro de saída" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Erro ao escribir nun ficheiro" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Erro ao escribir no ficheiro" -#: methods/http.cc:891 +#: methods/http.cc:892 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Non se puido truncar o ficheiro" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Datos da cabeceira incorrectos" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "A conexión fallou" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Erro interno" @@ -2130,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 @@ -2171,52 +2183,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Non se atopou a selección %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo \"%c\" descoñecida" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuración %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloque comeza sen un nome." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Etiqueta mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra despois do valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Erro de sintaxe %s:%u: Só se poden facer directivas no nivel superior" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Includes aniñados de máis" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído de aquí" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Non se soporta a directiva \"%s\"" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra á fin da liña" @@ -2293,75 +2305,75 @@ msgstr "Non se pode cambiar a %s" msgid "Failed to stat the cdrom" msgstr "Non se puido analizar o CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo de só lectura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Non se puido abrir o ficheiro de bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Non se empregan bloqueos para o ficheiro de bloqueo montado por NFS %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Non se puido obter o bloqueo %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Agardouse por %s pero non estaba alí" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "O subproceso %s recibiu un fallo de segmento." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O subproceso %s devolveu un código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O subproceso %s saíu de xeito inesperado" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Non se puido abrir o ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lectura, aínda hai %lu para ler pero non queda ningún" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escritura, aínda hai %lu para escribir pero non se puido" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema ao pechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema ao borrar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema ao sincronizar o ficheiro" @@ -2478,52 +2490,52 @@ msgstr "Non se pode analizar o ficheiro de paquetes %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Non se pode analizar o ficheiro de paquetes %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Liña %lu mal formada na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Liña %lu mal formada na lista de fontes %s (dist absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Liña %lu mal formada na lista de fontes %s (análise de dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Liña %u longa de máis na lista de fontes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Liña %u mal formada na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo \"%s\" non se coñece na liña %u da lista de fontes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Liña %u mal formada na lista de fontes %s (id de provedor)" @@ -2649,19 +2661,19 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Pode querer executar apt-get update para corrixir estes problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Rexistro non válido no ficheiro de preferencias, non hai unha cabeceira " "Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Non se entendeu o tipo de inmobilización %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" "Non se indicou unha prioridade (ou indicouse cero) para a inmobilización" @@ -2746,16 +2758,16 @@ msgstr "Ocorreu un erro ao procesar %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Non se atopou o paquete %s %s ao procesar as dependencias de ficheiros" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Non se atopou a lista de paquetes fonte %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "A recoller as provisións de ficheiros" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar a caché de fontes" @@ -2764,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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Os \"hashes\" non coinciden" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2786,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2795,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:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2803,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:1447 msgid "Size mismatch" msgstr "Os tamaños non coinciden" @@ -2940,7 +2952,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "A abrir o ficheiro de configuración %s" @@ -2951,7 +2962,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Os \"hashes\" non coinciden" @@ -2972,7 +2982,6 @@ msgstr "A eliminar %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Eliminouse %s completamente" @@ -3058,14 +3067,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "Non se puido acceder ao chaveiro: \"%s\"" + +#~ msgid "Could not patch file" +#~ msgstr "Non se puido parchear o ficheiro" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: hu\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -151,7 +151,7 @@ msgstr " Verziótáblázat:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -305,7 +305,7 @@ msgstr "" " -c=? Ezt a konfigurációs fájlt olvassa be\n" " -o=? Beállít egy tetszőleges konfigurációs opciót, pl -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nem lehet írni ebbe: %s" @@ -440,8 +440,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB régi, megkísérlem frissíteni erre: %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB formátum érvénytelen. Ha az apt régebbi változatáról frissítettél, töröld " @@ -458,11 +459,11 @@ msgstr "A(z) %s DB fájlt nem lehet megnyitni: %s" msgid "Failed to stat %s" msgstr "%s elérése sikertelen" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Az archívumnak nincs vezérlő rekordja" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nem sikerült egy mutatóhoz jutni" @@ -527,26 +528,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:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Az archívumnak nem volt csomag mezője" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nem rendelkezik felülbíráló bejegyzéssel\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s karbantartója %s, nem %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, 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:641 +#: ftparchive/writer.cc:642 #, 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" @@ -650,7 +651,7 @@ msgstr "Nem sikerült átnevezni %s-t erre: %s" msgid "Y" msgstr "I" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex fordítási hiba - %s" @@ -811,11 +812,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:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 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:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A források listája olvashatatlan." @@ -844,8 +845,8 @@ 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:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nem határozható meg a szabad hely itt: %s" @@ -882,7 +883,7 @@ msgstr "Megszakítva." msgid "Do you want to continue [Y/n]? " msgstr "Folytatni akarod [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Sikertelen letöltés: %s %s\n" @@ -891,7 +892,7 @@ msgstr "Sikertelen letöltés: %s %s\n" msgid "Some files failed to download" msgstr "Néhány fájlt nem sikerült letölteni" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "A letöltés befejeződött a 'csak letöltés' módban" @@ -987,50 +988,50 @@ msgstr "'%s' verzió ehhez: '%s' nem található" msgid "Selected version %s (%s) for %s\n" msgstr "%s (%s) a kiválasztott verzió ehhez: %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, 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:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Az update parancsnak nincsenek argumentumai" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nem tudom a listakönyvtárat zárolni" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 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:1513 +#: cmdline/apt-get.cc:1523 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:1515 +#: cmdline/apt-get.cc:1525 #, 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:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Töröld az 'apt-get autoremove' paranccsal!" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1048,43 +1049,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 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:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Belső hiba, az AutoRemover sérült" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Belső hiba, AllUpgrade megsértett valamit" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Hiányzó %s feladat" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Az alábbi csomag nem található: %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, 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:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s kézi telepítésre állított.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 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:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1092,7 +1093,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:1799 +#: cmdline/apt-get.cc:1809 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 +1105,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:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Törött csomagok" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Az alábbi extra csomagok kerülnek telepítésre:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Javasolt csomagok:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Ajánlott csomagok:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Frissítés kiszámítása... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Sikertelen" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Kész" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Belső hiba, hibafeloldó gond" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 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:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nem található forráscsomag ehhez: %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, 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:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nincs elég szabad hely itt: %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, 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:2271 +#: cmdline/apt-get.cc:2281 #, 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:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Forrás letöltése: %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nem sikerült néhány archívumot letölteni." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, 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:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' kibontási parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, 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:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "'%s' elkészítési parancs nem sikerült.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Hiba a gyermekfolyamatnál" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 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:2429 +#: cmdline/apt-get.cc:2439 #, 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:2449 +#: cmdline/apt-get.cc:2459 #, 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:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1224,7 +1225,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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1233,32 +1234,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:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, 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:2633 +#: cmdline/apt-get.cc:2643 #, 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:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Nem sikerült az építési függőségeket feldolgozni" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Támogatott modulok:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1343,7 +1344,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:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1588,11 +1589,10 @@ msgstr "A(z) %s/%s fájl felülírja a(z) %s csomagban levőt" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s nem olvasható" @@ -1622,9 +1622,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Az info és temp könyvtáraknak egy fájlrendszeren kell lenniük" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Csomaglisták olvasása" @@ -1758,11 +1758,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" @@ -1824,7 +1824,7 @@ msgstr "Időtúllépés a kapcsolatban" msgid "Server closed the connection" msgstr "A kiszolgáló lezárta a kapcsolatot" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Olvasási hiba" @@ -1836,7 +1836,7 @@ msgstr "A válasz túlcsordította a puffert." msgid "Protocol corruption" msgstr "Protokoll hiba" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Írási hiba" @@ -1890,7 +1890,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:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probléma a fájl hash értékének meghatározásakor" @@ -1954,58 +1954,63 @@ msgstr "Nem tudtam kapcsolódni ehhez: %s: %s (%s)." msgid "Connecting to %s" msgstr "Kapcsolódás: %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nem lehet feloldani a következőt: '%s' " -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Átmeneti hiba '%s' feloldása közben" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, 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 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Sikertelen kapcsolódás ide: %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "%s kulcstartó nem érhető el" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Telepítés megszakítása." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "H: Az Acquire::gpgv::Options argumentum lista túl hosszú. Kilépek." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Belső hiba: Jó aláírás, de meghatározhatatlan kulcs ujjlenyomat?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "1 vagy több érvénytelen aláírást találtam." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "'%s' nem futtatható az aláírás ellenőrzéséhez (a gpgv telepítve van?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Ismeretlen gpgv futtatási hiba" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Az alábbi aláírások érvénytelenek voltak:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2055,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:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Sikertelen kiválasztás" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Időtúllépés a kapcsolatban" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Hiba a kimeneti fájl írásakor" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Hiba fájl írásakor" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Hiba a fájl írásakor" -#: methods/http.cc:891 +#: methods/http.cc:892 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:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Hiba a kiszolgálóról olvasáskor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "%s fájl írása sikertelen" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Rossz fejlécadat" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Sikertelen kapcsolódás" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Belső hiba" @@ -2105,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 @@ -2146,52 +2158,52 @@ msgstr "" msgid "Selection %s not found" msgstr "%s kiválasztás nem található" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ismeretlen típusrövidítés: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "%s konfigurációs fájl megnyitása" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Szintaktikai hiba %s: %u: A blokk név nélkül kezdődik" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Szintaktikai hiba %s: %u: hibás formátumú címke" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét az érték után" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Szintaktikai hiba %s: %u: Csak legfelső szinten használhatók előírások" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Szintaktikai hiba %s: %u: Túl sok beágyazott include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Szintaktikai hiba %s: %u: ugyaninnen include-olva" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Szintaktikai hiba %s: %u: '%s' nem támogatott előírás" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Szintaktikai hiba %s: %u: fölösleges szemét a fájl végén" @@ -2268,75 +2280,75 @@ msgstr "Nem sikerült ide váltani: %s" msgid "Failed to stat the cdrom" msgstr "Nem sikerült elérni a CD-ROM-ot." -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nem zárolom '%s' csak olvasható zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "%s zárolási fájl nem nyitható meg" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nem zárolom '%s' NFS-csatlakoztatású zárolási fájlt" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nem sikerült zárolni: %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s nem volt itt, ahogy vártam" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s alfolyamat szegmentálási hibát okozott." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s alfolyamat hibakóddal tért vissza (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s alfolyamat váratlanul kilépett" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nem lehet megnyitni %s fájlt" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "olvasás, még kellene %lu, de már az összes elfogyott" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "írás, még kiírandó %lu de ez nem lehetséges" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Hiba a fájl bezárásakor" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Hiba a fájl leválasztásával" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Hiba a fájl szinkronizálásakor" @@ -2453,52 +2465,52 @@ msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (1)" msgid "Unable to parse package file %s (2)" msgstr "Nem lehet a(z) %s csomagfájlt feldolgozni (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (URI feldolgozó)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "A(z) %lu. sor hibás %s forráslistában (Abszolút dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "A(z) %lu. sor hibás %s forráslistában (dist feldolgozó)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s megnyitása" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "A(z) %u. sor túl hosszú %s forráslistában." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "A(z) %u. sor hibás %s forráslistában (típus)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "'%s' típus nem ismert a(z) %u. sorban a(z) %s forráslistában" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "A(z) %u. sor hibás %s forráslistában (terjesztő id)" @@ -2625,17 +2637,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Próbáld futtatni az apt-get update -et, hogy javítsd e hibákat" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Hibás rekord a tulajdonság fájlban, nincs csomagfejléc" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "A(z) %s tűtípus nem értelmezhető" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nincs prioritás (vagy nulla) megadva a tűhöz" @@ -2724,17 +2736,17 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "%s %s csomag nem volt megtalálható a fájl függőségeinek feldolgozása közben" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nem lehet a(z) %s forrás csomaglistáját elérni" # FIXME -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "\"Előkészít\" kapcsolatok összegyűjtése" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO hiba a forrás-gyorsítótár mentésekor" @@ -2743,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:432 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:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "A Hash Sum nem megfelelő" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2764,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:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2773,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:1360 #, 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:1447 msgid "Size mismatch" msgstr "A méret nem megfelelő" @@ -2915,7 +2927,6 @@ msgstr "%i rekord kiírva %i hiányzó és %i hibásan párosított fájllal\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "%s konfigurációs fájl megnyitása" @@ -2926,7 +2937,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "A Hash Sum nem megfelelő" @@ -2947,7 +2957,6 @@ msgstr "%s eltávolítása" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s teljesen eltávolítva" @@ -3031,14 +3040,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "%s kulcstartó nem érhető el" + +#~ msgid "Could not patch file" +#~ msgstr "%s fájl foltozása sikertelen" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -2009,7 +2009,6 @@ msgstr "Impossibile connettersi a %s:%s:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:78 #, fuzzy, c-format -#| msgid "Aborting install." msgid "No keyring installed in %s." msgstr "Interruzione dell'installazione." @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -147,7 +147,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -301,7 +301,7 @@ msgstr "" " -c=? 指定した設定ファイルを読み込む\n" " -o=? 指定した設定オプションを適用する (例: -o dir::cache=/tmp)\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s に書き込めません" @@ -436,8 +436,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB が古いため、%s のアップグレードを試みます" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB フォーマットが無効です。apt の古いバージョンから更新したのであれば、データ" @@ -454,11 +455,11 @@ msgstr "DB ファイル %s を開くことができません: %s" msgid "Failed to stat %s" msgstr "%s の状態を取得するのに失敗しました" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "アーカイブにコントロールレコードがありません" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "カーソルを取得できません" @@ -523,26 +524,26 @@ msgstr "*** %s を %s にリンクするのに失敗しました" msgid " DeLink limit of %sB hit.\n" msgstr " リンクを外す制限の %sB に到達しました。\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "アーカイブにパッケージフィールドがありませんでした" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s に override エントリがありません\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %1$s メンテナは %3$s ではなく %2$s です\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s にソース override エントリがありません\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s にバイナリ override エントリがありません\n" @@ -646,7 +647,7 @@ msgstr "%s を %s に名前変更できませんでした" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "正規表現の展開エラー - %s" @@ -809,11 +810,11 @@ msgstr "パッケージを削除しなければなりませんが、削除が無 msgid "Internal error, Ordering didn't finish" msgstr "内部エラー、調整が終わっていません" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "ダウンロードディレクトリをロックできません" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ソースのリストを読むことができません。" @@ -843,8 +844,8 @@ msgstr "この操作後に追加で %sB のディスク容量が消費されま msgid "After this operation, %sB disk space will be freed.\n" msgstr "この操作後に %sB のディスク容量が解放されます。\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s の空き領域を測定できません" @@ -881,7 +882,7 @@ msgstr "中断しました。" msgid "Do you want to continue [Y/n]? " msgstr "続行しますか [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s の取得に失敗しました %s\n" @@ -890,7 +891,7 @@ msgstr "%s の取得に失敗しました %s\n" msgid "Some files failed to download" msgstr "いくつかのファイルの取得に失敗しました" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "ダウンロードオンリーモードでパッケージのダウンロードが完了しました" @@ -989,53 +990,53 @@ msgstr "'%2$s' のバージョン '%1$s' が見つかりませんでした" msgid "Selected version %s (%s) for %s\n" msgstr "%3$s にはバージョン %1$s (%2$s) を選択しました\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "update コマンドは引数をとりません" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "list ディレクトリをロックできません" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "一連のものを削除するようになっていないので、AutoRemover を開始できません" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "以下のパッケージが自動でインストールされましたが、もう必要とされていません:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "これらを削除するには 'apt-get autoremove' を利用してください。" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1053,45 +1054,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "以下の情報がこの問題を解決するために役立つかもしれません:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部エラー、AutoRemover が何かを破壊しました" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部エラー、AllUpgrade が何かを破壊しました" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "タスク %s が見つかりません" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "パッケージ %s が見つかりません" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意: 正規表現 '%2$s' に対して %1$s を選択しました\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s は手動でインストールしたと設定されました。\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "以下の問題を解決するために 'apt-get -f install' を実行する必要があるかもしれ" "ません:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1099,7 +1100,7 @@ msgstr "" "未解決の依存関係です。'apt-get -f install' を実行してみてください (または解法" "を明示してください)。" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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 +1112,118 @@ msgstr "" "であれば) 必要なパッケージがまだ作成されていなかったり Incoming から移\n" "動されていないことが考えられます。" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "壊れたパッケージ" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "以下の特別パッケージがインストールされます:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "提案パッケージ:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "推奨パッケージ:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "アップグレードパッケージを検出しています ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "完了" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "内部エラー、問題リゾルバが何かを破壊しました" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "ソースを取得するには少なくともひとつのパッケージ名を指定する必要があります" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s のソースパッケージが見つかりません" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "すでにダウンロードされたファイル '%s' をスキップします\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "%s に充分な空きスペースがありません" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "%2$sB 中 %1$sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "%sB のソースアーカイブを取得する必要があります。\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "ソース %s を取得\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "いくつかのアーカイブの取得に失敗しました。" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "すでに %s に展開されたソースがあるため、展開をスキップします\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "展開コマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" "'dpkg-dev' パッケージがインストールされていることを確認してください。\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "ビルドコマンド '%s' が失敗しました。\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "子プロセスが失敗しました" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "ビルド依存関係をチェックするパッケージを少なくとも 1 つ指定する必要があります" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s のビルド依存情報を取得できません" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s にはビルド依存情報が指定されていません。\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1232,7 @@ msgstr "" "パッケージ %3$s が見つからないため、%2$s に対する %1$s の依存関係を満たすこと" "ができません" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1241,32 @@ msgstr "" "入手可能な %3$s はいずれもバージョンについての要求を満たせないため、%2$s に対" "する %1$s の依存関係を満たすことができません" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s の依存関係 %1$s を満たすことができません: %3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s のビルド依存関係を満たすことができませんでした。" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "ビルド依存関係の処理に失敗しました" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "サポートされているモジュール:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1354,7 +1355,7 @@ msgstr "" "apt.conf(5) を参照してください。\n" " この APT は Super Cow Powers 化されています。\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1600,11 +1601,10 @@ msgstr "ファイル %s/%s がパッケージ %s のものを上書きします" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s を読み込むことができません" @@ -1634,9 +1634,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info と temp ディレクトリは同じファイルシステム上になければなりません" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "パッケージリストを読み込んでいます" @@ -1772,11 +1772,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 "変更時刻の設定に失敗しました" @@ -1838,7 +1838,7 @@ msgstr "接続タイムアウト" msgid "Server closed the connection" msgstr "サーバが接続を切断しました" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "読み込みエラー" @@ -1850,7 +1850,7 @@ msgstr "レスポンスがバッファをオーバフローさせました。" msgid "Protocol corruption" msgstr "プロトコルが壊れています" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "書き込みエラー" @@ -1904,7 +1904,7 @@ msgstr "データソケット接続タイムアウト" msgid "Unable to accept connection" msgstr "接続を accept できません" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "ファイルのハッシュでの問題" @@ -1968,61 +1968,66 @@ msgstr "%s:%s (%s) へ接続できませんでした。" msgid "Connecting to %s" msgstr "%s へ接続しています" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' を解決できませんでした" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' が一時的に解決できません" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s' (%i) の解決中に問題が起こりました" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s へ接続できません:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "キーリングにアクセスできませんでした: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "インストールを中断します。" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "エラー: Acquire::gpgv::Options の引数リストが長すぎます。終了しています。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部エラー: 正しい署名ですが、鍵指紋を確定できません?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "少なくとも 1 つの不正な署名が発見されました。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "署名を検証するための '%s' の実行ができませんでした (gpgv はインストールされて" "いますか?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv の実行中に未知のエラーが発生" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "以下の署名が無効です:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2071,47 +2076,47 @@ msgstr "http サーバのレンジサポートが壊れています" msgid "Unknown date format" msgstr "不明な日付フォーマットです" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select に失敗しました" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "接続タイムアウト" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "出力ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "ファイルへの書き込みでエラーが発生しました" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "リモート側で接続がクローズされてサーバからの読み込みに失敗しました" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "サーバからの読み込みに失敗しました" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "ファイルの切り詰めに失敗しました" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "不正なヘッダです" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "接続失敗" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "内部エラー" @@ -2119,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 @@ -2160,52 +2172,52 @@ msgstr "" msgid "Selection %s not found" msgstr "選択された %s が見つかりません" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "理解できない省略形式です: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "設定ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "文法エラー %s:%u: ブロックが名前なしで始まっています。" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "文法エラー %s:%u: 不正なタグです" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "文法エラー %s:%u: 値の後に余分なゴミが入っています" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "文法エラー %s:%u: 命令はトップレベルでのみ実行できます" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "文法エラー %s:%u: インクルードのネストが多すぎます" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "文法エラー %s:%u: ここからインクルードされています" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "文法エラー %s:%u: 未対応の命令 '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "文法エラー %s:%u: ファイルの最後に余計なゴミがあります" @@ -2281,75 +2293,75 @@ msgstr "%s へ変更することができません" msgid "Failed to stat the cdrom" msgstr "cdrom の状態を取得するのに失敗しました" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "読み込み専用のロックファイル %s にロックは使用しません" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ロックファイル %s をオープンできません" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs マウントされたロックファイル %s にはロックを使用しません" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "ロック %s が取得できませんでした" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s を待ちましたが、そこにはありませんでした" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "子プロセス %s がセグメンテーション違反を受け取りました。" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子プロセス %s がエラーコード (%u) を返しました" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子プロセス %s が予期せず終了しました" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "ファイル %s をオープンできませんでした" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "読み込みが %lu 残っているはずですが、何も残っていません" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "あと %lu 書き込む必要がありますが、書き込むことができませんでした" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "ファイルのクローズ中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "ファイルの削除中に問題が発生しました" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "ファイルの同期中に問題が発生しました" @@ -2466,52 +2478,52 @@ msgstr "パッケージファイル %s を解釈することができません ( msgid "Unable to parse package file %s (2)" msgstr "パッケージファイル %s を解釈することができません (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "ソースリスト %2$s の %1$lu 行目が不正です (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s をオープンしています" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "ソースリスト %2$s の %1$u 行目が長すぎます。" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ソースリスト %3$s の %2$u 行にあるタイプ '%1$s' は不明です" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "ソースリスト %2$s の %1$u 行目が不正です (vendor id)" @@ -2643,19 +2655,19 @@ msgstr "" "これらの問題を解決するためには apt-get update を実行する必要があるかもしれま" "せん" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "不正なレコードが preferences ファイルに存在します。パッケージヘッダがありませ" "ん" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "pin タイプ %s が理解できませんでした" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "pin で優先度 (または 0) が指定されていません" @@ -2739,16 +2751,16 @@ msgstr "%s を処理中にエラーが発生しました (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "パッケージ %s %s がファイル依存の処理中に見つかりませんでした" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "ソースパッケージリスト %s の状態を取得できません" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "ファイル提供情報を収集しています" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "ソースキャッシュの保存中に IO エラーが発生しました" @@ -2757,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:432 msgid "MD5Sum mismatch" msgstr "MD5Sum が適合しません" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "ハッシュサムが適合しません" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2778,7 +2790,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります (存在しないアーキテクチャのため)。" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2787,7 +2799,7 @@ msgstr "" "パッケージ %s のファイルの位置を特定できません。おそらくこのパッケージを手動" "で修正する必要があります。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2795,7 +2807,7 @@ msgstr "" "パッケージインデックスファイルが壊れています。パッケージ %s に Filename: " "フィールドがありません。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "サイズが適合しません" @@ -2932,7 +2944,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "設定ファイル %s をオープンできませんでした" @@ -2943,7 +2954,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "ハッシュサムが適合しません" @@ -2964,7 +2974,6 @@ msgstr "%s を削除しています" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s を完全に削除しました" @@ -3050,14 +3059,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "キーリングにアクセスできませんでした: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "ファイルにパッチできませんでした" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po_km\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+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" @@ -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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -306,7 +306,7 @@ msgstr "" " -c=? អានឯកសារការកំណត់រចនាស្ព័ន្ធនេះ\n" " -o=? កំណត់ជម្រើសការកំណត់រចនាសម្ព័ន្ធតាមចិត្ត ឧ. eg -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "មិនអាចសរសេរទៅ %s" @@ -440,8 +440,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB ចាស់, កំពុងព្យាយាមធ្វើឲ្យ %s ប្រសើរឡើង" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "ទ្រង់ទ្រាយមូលដ្ឋានទិន្នន័យមិនត្រឹមត្រូវ ។ ប្រសិនបើអ្នកបានធ្វើឲ្យវាប្រសើឡើងពីកំណែចាស់របស់ apt សូមយក" @@ -458,11 +459,11 @@ msgstr "មិនអាចបើកឯកសារ DB បានទ msgid "Failed to stat %s" msgstr "បានបរាជ័យក្នុងការថ្លែង %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "ប័ណ្ណសារគ្មានកំណត់ត្រាត្រួតពិនិត្យទេ" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "មិនអាចយកទស្សន៍ទ្រនិច" @@ -527,26 +528,26 @@ msgstr "*** បានបរាជ័យក្នុងការត msgid " DeLink limit of %sB hit.\n" msgstr " DeLink កំណត់នៃការវាយ %sB ។\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "ប័ណ្ណសារគ្មានវាលកញ្ចប់" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s គ្មានធាតុធាតុបញ្ចូលបដិសេធឡើយ\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " អ្នកថែទាំ %s គឺ %s មិនមែន %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s គ្មានធាតុបដិសេធប្រភព\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s គ្មានធាតុបដិសេធគោលពីរដែរ\n" @@ -650,7 +651,7 @@ msgstr "បរាជ័យក្នុងការប្តូរឈ msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex កំហុសការចងក្រង - %s" @@ -811,11 +812,11 @@ msgstr "កញ្ចប់ ត្រូវការឲ្យយកច msgid "Internal error, Ordering didn't finish" msgstr "កំហុសខាងក្នុង ការរៀបតាមលំដាប់មិនបានបញ្ចប់ឡើយ" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "មិនអាចចាក់សោថតទាញយកបានឡើយ" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "មិនអាចអានបញ្ជីប្រភពបានឡើយ ។" @@ -844,8 +845,8 @@ msgstr "បន្ទាប់ពីពន្លា %sB នៃកា msgid "After this operation, %sB disk space will be freed.\n" msgstr "បន្ទាប់ពីពន្លា %sB ទំហំថាសនឹងទំនេរ ។ \n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "មិនអាចកំណត់ទំហំទំនេរក្នុង %s បានឡើយ" @@ -882,7 +883,7 @@ msgstr "បោះបង់ ។" msgid "Do you want to continue [Y/n]? " msgstr "តើអ្នកចង់បន្តឬ [បាទ ចាស/ទេ] ? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "បរាជ័យក្នុងការទៅប្រមូលយក %s %s\n" @@ -891,7 +892,7 @@ msgstr "បរាជ័យក្នុងការទៅប្រម msgid "Some files failed to download" msgstr "ឯកសារមួយចំនួនបានបរាជ័យក្នុងការទាញយក" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "បានបញ្ចប់ការទាញយក ហើយតែក្នុងរបៀបទាញយកប៉ុណ្ណោះ" @@ -988,51 +989,51 @@ msgstr "រកមិនឃើញកំណែ '%s' សម្រាប msgid "Selected version %s (%s) for %s\n" msgstr "បានជ្រើសកំណែ %s (%s) សម្រាប់ %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "មិនអាចថ្លែង បញ្ជីកញ្ចប់ប្រភពចប់ បានឡើយ %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "ពាក្យបញ្ជាដែលធ្វើឲ្យទាន់សម័យគ្មានអាគុយម៉ង់ទេ" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "មិនអាចចាក់សោថតបញ្ជីបានឡើយ" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "កញ្ចប់ថ្មីខាងក្រោមនឹងត្រូវបានដំឡើង ៖" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "កញ្ចប់ថ្មីខាងក្រោមនឹងត្រូវបានដំឡើង ៖" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1048,51 +1049,51 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "ព័ត៌មានដូចតទៅនេះ អាចជួយដោះស្រាយស្ថានភាពបាន ៖" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "កំហុសខាងក្នុង អ្នកដោះស្រាយបញ្ហាបានធ្វើឲ្យខូចឧបករណ៍" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "កំហុសខាងក្នុង ការធ្វើឲ្យប្រសើរទាំងអស់បានធ្វើឲ្យឧបករណ៍ខូច" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "មិនអាចរកកញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "មិនអាចរកកញ្ចប់ %s បានទេ" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "ចំណាំ កំពុងជ្រើស %s សម្រាប់ regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ប៉ុន្តែ %s នឹងត្រូវបានដំឡើង" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "អ្នកប្រហែលជាចង់រត់ `apt-get -f install' ដើម្បីកែពួកវាទាំងនេះ ៖" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" "ភាពអស្រ័យដែលខុសគ្នា ។ ព្យាយាម 'apt-get -f install' ដោយគ្មានកញ្ចប់ (ឬ បញ្ជាក់ដំណោះស្រាយ) ។" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,122 +1105,122 @@ msgstr "" "ដែលបានទាមទារនឹងមិនទាន់បានបង្កើតឡើយ\n" " ឬ បានយកចេញពីការមកដល់ ។" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "កញ្ចប់ដែលបានខូច" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "កញ្ចប់បន្ថែមដូចតទៅនេះ នឹងត្រូវបានដំឡើង ៖" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "កញ្ចប់ដែលបានផ្ដល់យោបល់ ៖" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "កញ្ចប់ដែលបានផ្ដល់អនុសាសន៍ ៖" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "កំពុងគណនាការធ្វើឲ្យប្រសើរ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "បានបរាជ័យ" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "ធ្វើរួច" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "កំហុសខាងក្នុង អ្នកដោះស្រាយបញ្ហាបានធ្វើឲ្យខូចឧបករណ៍" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "យ៉ាងហោចណាស់ត្រូវបញ្ជាក់កញ្ចប់មួយ ដើម្បីទៅប្រមូលយកប្រភពសម្រាប់" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "មិនអាចរកកញ្ចប់ប្រភពសម្រាប់ %s បានឡើយ" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "កំពុងរំលងឯកសារដែលបានទាញយករួច '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "អ្នកពុំមានទំហំទំនេរគ្រប់គ្រាន់ទេនៅក្នុង %s ឡើយ" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ត្រូវការយក %sB/%sB នៃប័ណ្ណសារប្រភព ។\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ត្រូវការយក %sB នៃប័ណ្ណសារប្រភព ។\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "ទៅប្រមូលប្រភព %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "បរាជ័យក្នុងការទៅប្រមូលយកប័ណ្ណសារមួយចំនួន ។" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "កំពុងរំលងការស្រាយនៃប្រភពដែលបានស្រាយរួចនៅក្នុង %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "ពាក្យបញ្ជាស្រាយ '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "ពិនិត្យប្រសិនបើកញ្ចប់ 'dpkg-dev' មិនទាន់បានដំឡើង ។\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "សាងសងពាក្យបញ្ជា '%s' បានបរាជ័យ ។\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "ដំណើរការកូនបានបរាជ័យ" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "ត្រូវតែបញ្ជាក់យ៉ាងហោចណាស់មួយកញ្ចប់ដើម្បីពិនិត្យ builddeps សម្រាប់" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "មិនអាចសាងសង់ព័ត៌មានភាពអស្រ័យសម្រាប់ %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s មិនមានភាពអាស្រ័យស្ថាបនាឡើយ ។\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, 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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,30 +1229,30 @@ msgstr "" "ភាពអាស្រ័យ %s សម្រាប់ %s មិនអាចតម្រូវចិត្តបានទេ ព្រោះ មិនមានកំណែនៃកញ្ចប់ %s ដែលអាចតម្រូវចិត្ត" "តម្រូវការកំណែបានឡើយ" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s ៖ កញ្ចប់ %s ដែលបានដំឡើង គឺថ្មីពេក" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "បរាជ័យក្នុងការតម្រូវចិត្តភាពអាស្រ័យ %s សម្រាប់ %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ភាពអាស្រ័យដែលបង្កើត %s មិនអាចបំពេញសេចក្ដីត្រូវការបានទេ ។" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "បានបរាជ័យក្នុងការដំណើរការបង្កើតភាពអាស្រ័យ" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "ម៉ូឌុលដែលគាំទ្រ ៖ " -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1334,7 +1335,7 @@ msgstr "" "pages for more information and options.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1579,11 +1580,10 @@ msgstr "ឯកសារ %s/%s សរសេរជាន់ពីលើ #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "មិនអាចអាន %s បានឡើយ" @@ -1613,9 +1613,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "ថតព័ត៌មាន និង ពុម្ព ត្រូវការនៅលើប្រព័ន្ធឯកសារដូចគ្នា" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "កំពុងអានបញ្ជីកញ្ចប់" @@ -1748,11 +1748,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 "បរាជ័យក្នុងការកំណត់ពេលវេលាការកែប្រែ" @@ -1813,7 +1813,7 @@ msgstr "អស់ពេលក្នុងការតភ្ជាប់" msgid "Server closed the connection" msgstr "ម៉ាស៊ីនបម្រើបានបិទការតភ្ជាប់" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "ការអានមានកំហុស" @@ -1825,7 +1825,7 @@ msgstr "ឆ្លើយតបសតិបណ្តោះអាសន្ន msgid "Protocol corruption" msgstr "ការបង្ខូចពិធីការ" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "ការសរសេរមានកំហុស" @@ -1879,7 +1879,7 @@ msgstr "ការតភ្ជាប់រន្ធទិន្នន័ msgid "Unable to accept connection" msgstr "មិនអាចទទួលយកការតភ្ជាប់បានឡើយ" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "បញ្ហាធ្វើឲ្យខូចឯកសារ" @@ -1943,58 +1943,63 @@ msgstr "មិនអាចតភ្ជាប់ទៅកាន់ %s msgid "Connecting to %s" msgstr "កំពុងតភ្ជាប់ទៅកាន់ %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "មិនអាចដោះស្រាយ '%s' បានឡើយ" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "ការដោះស្រាយភាពបរាជ័យបណ្តោះអាសន្ន '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "ការដោះស្រាយអ្វីអាក្រក់ដែលបានកើតឡើង '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "មិនអាចតភ្ជាប់ទៅកាន់ %s %s ៖" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "មិនអាចចូលដំណើរការ keyring ៖ '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "កំពុងបោះបង់ការដំឡើង ។" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E ៖ បញ្ជីអាគុយម៉ង់ពី Acquire::gpgv::Options too long ។ ចេញ ។" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "កំហុសខាងក្នុង ៖ ហត្ថលេខាល្អ ប៉ុន្តែ មិនអាចកំណត់កូនសោស្នាមម្រាមដៃ ?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "បានជួបប្រទះហត្ថលេខាយ៉ាងហោចណាស់មួយ ដែលត្រឹមត្រូវ ។" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "មិនអាចប្រតិបត្តិ '%s' ដើម្បីផ្ទៀងផ្ទាត់ហត្ថលេខា (តើ gpgv ត្រូវបានដំឡើងឬនៅ ?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "មិនស្គាល់កំហុស ក្នុងការប្រតិបត្តិ gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "ហត្ថលេខាខាងក្រោមមិនត្រឹមត្រូវ ៖\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2043,48 +2048,48 @@ msgstr "ម៉ាស៊ីនបម្រើ HTTP នេះបានខូ msgid "Unknown date format" msgstr "មិនស្គាល់ទ្រង់ទ្រាយកាលបរិច្ឆេទ" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "ជ្រើសបានបរាជ័យ" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "ការតភ្ជាប់បានអស់ពេល" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "កំហុសក្នុងការសរសេរទៅកាន់ឯកសារលទ្ធផល" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "កំហុសក្នុងការសរសេរទៅកាន់ឯកសារ" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "កំហុសក្នុងការសរសេរទៅកាន់ឯកសារ" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "កំហុសក្នុងការអានពីម៉ាស៊ីនបម្រើ ។ ការបញ្ចប់ពីចម្ងាយបានបិទការតភ្ជាប់" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "កំហុសក្នុងការអានពីម៉ាស៊ីនបម្រើ" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "បរាជ័យក្នុងការសរសេរឯកសារ %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "ទិន្នន័យបឋមកថាខូច" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "ការតភ្ជាប់បានបរាជ័យ" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "កំហុសខាងក្នុង" @@ -2092,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 @@ -2133,52 +2145,52 @@ msgstr "" msgid "Selection %s not found" msgstr "ជម្រើស %s រកមិនឃើញឡើយ" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "មិនបានទទួលស្គាល់ប្រភេទអក្សរសង្ខេប ៖ '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "កំពុងបើឯកសារកំណត់រចនាសម្ព័ន្ធ %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ ប្លុកចាប់ផ្តើមដោយគ្មានឈ្មោះ ។" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ ស្លាកដែលបាន Malformed" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ តម្លៃឥតបានការនៅក្រៅ" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់អាចត្រូវបានធ្វើតែនៅលើកម្រិតកំពូលតែប៉ុណ្ណោះ" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ មានការរួមបញ្ចូលដែលដាក់រួមគ្នាយ៉ាងច្រើន" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ បានរួមបញ្ចូលពីទីនេះ" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ សេចក្ដីបង្គាប់ដែលមិនបានគាំទ្រ '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "កំហុសវាក្យសម្ពន្ធ %s:%u ៖ សារឥតបានការបន្ថែម ដែលនៅខាងចុងឯកសារ" @@ -2254,75 +2266,75 @@ msgstr "មិនអាចប្ដូរទៅ %s បានឡើយ" msgid "Failed to stat the cdrom" msgstr "បរាជ័យក្នុងការថ្លែង ស៊ីឌីរ៉ូម" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "មិនប្រើប្រាស់ការចាក់សោ សម្រាប់តែឯកសារចាក់សោដែលបានតែអានប៉ុណ្ណោះ %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "មិនអាចបើកឯកសារចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "មិនប្រើការចាក់សោ សម្រាប់ nfs ឯកសារចាក់សោដែលបានម៉ោន%s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "មិនអាចចាក់សោ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "រង់ចាំប់ %s ប៉ុន្តែ វាមិននៅទីនោះ" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "ដំណើរការរង %s បានទទួលកំហុសការចែកជាចម្រៀក ។" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "ដំណើរការរង %s បានទទួលកំហុសការចែកជាចម្រៀក ។" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "ដំណើរការរង %s បានត្រឡប់ទៅកាន់កូដមានកំហុស (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "ដំណើរការរង %s បានចេញ ដោយមិនរំពឹងទុក " -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "មិនអាចបើកឯកសារ %s បានឡើយ" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "អាន, នៅតែមាន %lu ដើម្បីអាន ប៉ុន្តែគ្មានអ្វីនៅសល់" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "សរសេរ, នៅតែមាន %lu ដើម្បីសរសេរ ប៉ុន្តែមិនអាច" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "មានបញ្ហាក្នុងការបិទឯកសារ" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "មានបញ្ហាក្នុងការផ្ដាច់តំណឯកសារ" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "មានបញ្ហាក្នុងការធ្វើសមកាលកម្មឯកសារ" @@ -2440,52 +2452,52 @@ msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (1 msgid "Unable to parse package file %s (2)" msgstr "មិនអាចញែកឯកសារកញ្ចប់ %s (2) បានឡើយ" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "បន្ទាត់ Malformed %lu ក្នុងញ្ជីប្រភព %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុងបញ្ជីប្រភព %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុងបញ្ជីប្រភព %s (URI ញែក)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "បន្ទាត់ Malformed %lu ក្នុងបញ្ជីប្រភព %s (dist លែងប្រើ)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "បន្ទាត់ Malformed %lu ក្នុងបញ្ជីប្រភព %s (dist ញែក)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "កំពុងបើក %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "បន្ទាត់ %u មានប្រវែងវែងពេកនៅក្នុងបញ្ជីប្រភព %s ។" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "បន្ទាត់ Malformed %u ក្នុងបញ្ជីប្រភព %s (ប្រភេទ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ប្រភេទ '%s' មិនស្គាល់នៅលើបន្ទាត់ %u ក្នុងបញ្ជីប្រភព %s ឡើយ" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "បន្ទាត់ Malformed %u ក្នុងបញ្ជីប្រភព %s (លេខសម្គាល់ក្រុមហ៊ុនលក់)" @@ -2608,17 +2620,17 @@ msgstr "បញ្ជីកញ្ចប់ ឬ ឯកសារស្ថ msgid "You may want to run apt-get update to correct these problems" msgstr "អ្នកប្រហែលជាចង់ភាពទាន់សម័យ apt-get ដើម្បីកែបញ្ហាទាំងនេះ" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "កំណត់ត្រាមិនត្រឹមត្រូវនៅក្នុងឯកសារចំណង់ចំណូលចិត្ត មិនមានបឋមកថាកញ្ចប់ទេ" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "មិនបានយល់ពីប្រភេទម្ជុល %s ឡើយ" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "គ្មានអទិភាព (ឬ សូន្យ) បានបញ្ជាក់សម្រាប់ម្ជុលទេ" @@ -2703,16 +2715,16 @@ msgstr "កំហុសបានកើតឡើងខណៈពេលក msgid "Package %s %s was not found while processing file dependencies" msgstr "កញ្ចប់ %s %s រកមិនឃើញខណៈពេលកំពុងដំណើរការភាពអាស្រ័យឯកសារ" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "មិនអាចថ្លែង បញ្ជីកញ្ចប់ប្រភពចប់ បានឡើយ %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "ការផ្ដល់ឯកសារប្រមូលផ្ដុំ" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO កំហុសក្នុងការររក្សាទុកឃ្លាំងសម្ងាត់ប្រភព" @@ -2721,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:432 msgid "MD5Sum mismatch" msgstr "MD5Sum មិនផ្គួផ្គង" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum មិនផ្គួផ្គង" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2743,7 +2755,7 @@ msgstr "" "ខ្ញុំមិនអាចរកទីតាំងឯកសារសម្រាប់កញ្ចប់ %s បានទេ ។ មានន័យថាអ្នកត្រូវការជួសជុលកញ្ចប់នេះដោយដៃ ។ " "(ដោយសារបាត់ស្ថាបត្យកម្ម)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2751,13 +2763,13 @@ msgid "" msgstr "" "ខ្ញុំមិនអាចរកទីតាំងឯកសារសម្រាប់កញ្ចប់ %s បានទេ ។ មានន័យថាអ្នកត្រូវការជួសជុលកញ្ចប់នេះដោយដៃ ។" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "ទំហំមិនបានផ្គួផ្គង" @@ -2891,7 +2903,6 @@ msgstr "បានសរសេរ %i កំណត់ត្រាជាមួ #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "កំពុងបើឯកសារកំណត់រចនាសម្ព័ន្ធ %s" @@ -2922,7 +2933,6 @@ msgstr "កំពុងយក %s ចេញ" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "បានយក %s ចេញទាំងស្រុង" @@ -3006,15 +3016,31 @@ 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 "បានបិទការតភ្ជាប់មុនពេល" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "មិនអាចចូលដំណើរការ keyring ៖ '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "មិនអាចបើកឯកសារ %s បានឡើយ" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-13 07:14+0900\n" "Last-Translator: Changwoo Ryu <cwryu@debian.org>\n" "Language-Team: Korean <debian-l10n-korean@lists.debian.org>\n" @@ -144,7 +144,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s(%s), 컴파일 시각 %s %s\n" @@ -297,7 +297,7 @@ msgstr "" " -c=? 설정 파일을 읽습니다\n" " -o=? 임의의 옵션을 설정합니다. 예를 들어 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s에 쓸 수 없습니다" @@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB가 오래되었습니다. %s의 업그레이드를 시도합니다" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB 형식이 잘못되었습니다. apt 예전 버전에서 업그레이드했다면, 데이터베이스를 " @@ -449,12 +450,12 @@ msgstr "DB 파일, %s 파일을 열 수 없습니다: %s" msgid "Failed to stat %s" msgstr "%s의 정보를 읽는 데 실패했습니다" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "아카이브에 컨트롤 기록이 없습니다" # FIXME: 왠 커서?? -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "커서를 가져올 수 없습니다" @@ -520,26 +521,26 @@ msgstr "*** %s 파일을 %s에 링크하는 데 실패했습니다" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink 한계값 %s바이트에 도달했습니다.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "아카이브에 패키지 필드가 없습니다" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s에는 override 항목이 없습니다\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 관리자가 %s입니다 (%s 아님)\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s에는 source override 항목이 없습니다\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s에는 binary override 항목이 없습니다\n" @@ -643,7 +644,7 @@ msgstr "%s 파일의 이름을 %s(으)로 바꾸는 데 실패했습니다" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "정규식 컴파일 오류 - %s" @@ -805,11 +806,11 @@ msgstr "패키지를 지워야 하지만 지우기가 금지되어 있습니다. msgid "Internal error, Ordering didn't finish" msgstr "내부 오류. 순서변경작업이 끝나지 않았습니다" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "다운로드 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "소스 목록을 읽을 수 없습니다." @@ -840,8 +841,8 @@ msgstr "이 작업 후 %s바이트의 디스크 공간을 더 사용하게 됩 msgid "After this operation, %sB disk space will be freed.\n" msgstr "이 작업 후 %s바이트의 디스크 공간이 비워집니다.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s의 여유 공간의 크기를 파악할 수 없습니다" @@ -881,7 +882,7 @@ msgstr "중단." msgid "Do you want to continue [Y/n]? " msgstr "계속 하시겠습니까 [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s 파일을 받는 데 실패했습니다 %s\n" @@ -890,7 +891,7 @@ msgstr "%s 파일을 받는 데 실패했습니다 %s\n" msgid "Some files failed to download" msgstr "일부 파일을 받는 데 실패했습니다" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "다운로드를 마쳤고 다운로드 전용 모드입니다" @@ -988,50 +989,50 @@ msgstr "%2$s 패키지의 '%1$s' 버전을 찾을 수 없습니다" msgid "Selected version %s (%s) for %s\n" msgstr "%3$s 패키지의 %1$s (%2$s) 버전을 선택합니다\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "update 명령은 인수를 받지 않습니다" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "목록 디렉토리를 잠글 수 없습니다" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "삭제를 할 수 없으므로 AutoRemover를 실행하지 못합니다" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "다음 새 패키지가 전에 자동으로 설치되었지만 더 이상 필요하지 않습니다:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "이들을 지우기 위해서는 'apt-get autoremove'를 사용하십시오." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1049,44 +1050,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "이 상황을 해결하는 데 다음 정보가 도움이 될 수도 있습니다:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "내부 오류, AllUpgrade 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "%s 작업를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "%s 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "주의, 정규식 '%2$s'에 대하여 %1$s을(를) 선택합니다\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 패키지 수동설치로 지정합니다.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "다음을 바로잡으려면 `apt-get -f install'을 실행해 보십시오:" # FIXME: specify a solution? 무슨 솔루션? -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1094,7 +1095,7 @@ msgstr "" "의존성이 맞지 않습니다. 패키지 없이 'apt-get -f install'을 시도해 보십시오 " "(아니면 해결 방법을 지정하십시오)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1105,115 +1106,115 @@ msgstr "" "불안정 배포판을 사용해서 일부 필요한 패키지를 아직 만들지 않았거나,\n" "아직 Incoming에서 나오지 않은 경우일 수도 있습니다." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "망가진 패키지" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "다음 패키지를 더 설치할 것입니다:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "제안하는 패키지:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "추천하는 패키지:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "업그레이드를 계산하는 중입니다... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "실패" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "완료" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "내부 오류, 문제 해결 프로그램이 무언가를 망가뜨렸습니다" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "해당되는 소스 패키지를 가져올 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s의 소스 패키지를 찾을 수 없습니다" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "이미 다운로드 받은 파일 '%s'은(는) 다시 받지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "%s에 충분한 공간이 없습니다" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "소스 아카이브를 %s바이트/%s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "소스 아카이브를 %s바이트 받아야 합니다.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "%s 소스를 가져옵니다\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "일부 아카이브를 가져오는 데 실패했습니다." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s에 이미 풀려 있는 소스의 압축을 풀지 않고 건너 뜁니다.\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "압축 풀기 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' 패키지가 설치되었는지를 확인하십시오.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "빌드 명령 '%s' 실패.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "하위 프로세스가 실패했습니다" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "해당되는 빌드 의존성을 검사할 패키지를 최소한 하나 지정해야 합니다" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s의 빌드 의존성 정보를 가져올 수 없습니다" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s 패키지에 빌드 의존성이 없습니다.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1222,7 +1223,7 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지를 찾을 수 없습니" "다" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1231,32 +1232,32 @@ msgstr "" "%2$s에 대한 %1$s 의존성을 만족시킬 수 없습니다. %3$s 패키지의 사용 가능한 버" "전 중에서는 이 버전 요구사항을 만족시킬 수 없습니다" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%2$s에 대한 %1$s 의존성을 만족시키는 데 실패했습니다: %3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s의 빌드 의존성을 만족시키지 못했습니다." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "빌드 의존성을 처리하는 데 실패했습니다" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "지원하는 모듈:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1340,7 +1341,7 @@ msgstr "" "apt.conf(5) 매뉴얼 페이지를 보십시오.\n" " 이 APT는 Super Cow Powers로 무장했습니다.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1587,11 +1588,10 @@ msgstr "%s/%s 파일은 %s 패키지에 있는 파일을 덮어 씁니다" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s을(를) 읽을 수 없습니다" @@ -1621,9 +1621,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "정보 디렉토리와 임시 디렉토리는 같은 파일 시스템에 있어야 합니다" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "패키지 목록을 읽는 중입니다" @@ -1756,11 +1756,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 "파일 변경 시각을 설정하는 데 실패했습니다" @@ -1822,7 +1822,7 @@ msgstr "연결 시간 초과" msgid "Server closed the connection" msgstr "서버에서 연결을 닫았습니다" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "읽기 오류" @@ -1834,7 +1834,7 @@ msgstr "응답이 버퍼 크기를 넘어갔습니다." msgid "Protocol corruption" msgstr "프로토콜이 틀렸습니다" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "쓰기 오류" @@ -1888,7 +1888,7 @@ msgstr "데이터 소켓 연결 시간 초과" msgid "Unable to accept connection" msgstr "연결을 받을 수 없습니다" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "파일 해싱에 문제가 있습니다" @@ -1952,60 +1952,65 @@ msgstr "%s:%s에 연결할 수 없습니다 (%s)." msgid "Connecting to %s" msgstr "%s에 연결하는 중입니다" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s'의 주소를 알아낼 수 없습니다" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s'의 주소를 알아내는 데 임시로 실패했습니다" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "'%s:%s'의 주소를 알아내는 데 무언가 이상한 일이 발생했습니다 (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s에 연결할 수 없습니다:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "키링에 접근할 수 없습니다: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "설치를 중단합니다." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Acquire::gpgv::Options의 인자 목록이 너무 깁니다. 끝냅니다." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "내부 오류: 서명은 올바르지만 키 지문을 확인할 수 없습니다!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "최소한 하나 이상의 서명이 잘못되었습니다." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "서명을 확인하는 '%s' 프로그램을 실행할 수 없습니다. (gnuv 프로그램을 설치했습" "니까?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv 실행 도중 알 수 없는 오류 발생" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "다음 서명이 올바르지 않습니다:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2054,47 +2059,47 @@ msgstr "HTTP 서버에 범위 지원 기능이 잘못되어 있습니다" msgid "Unknown date format" msgstr "데이터 형식을 알 수 없습니다" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select가 실패했습니다" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "연결 시간이 초과했습니다" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "출력 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "해당 파일에 쓰는 데 오류가 발생했습니다" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "서버에서 읽고 연결을 닫는 데 오류가 발생했습니다" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "서버에서 읽는 데 오류가 발생했습니다" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "파일을 자르는 데 실패했습니다" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "헤더 데이터가 잘못되었습니다" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "연결이 실패했습니다" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "내부 오류" @@ -2102,18 +2107,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 @@ -2143,52 +2155,52 @@ msgstr "" msgid "Selection %s not found" msgstr "선택한 %s이(가) 없습니다" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "이 타입 줄임말을 알 수 없습니다: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "문법 오류 %s:%u: 블럭이 이름으로 시작하지 않습니다." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "문법 오류 %s:%u: 태그의 형식이 잘못되었습니다" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "문법 오류 %s:%u: 값 뒤에 쓰레기 데이터가 더 있습니다" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "문법 오류 %s:%u: 지시어는 맨 위 단계에서만 쓸 수 있습니다" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "문법 오류 %s:%u: include가 너무 많이 겹쳐 있습니다" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "문법 오류 %s:%u: 여기서 include됩니다" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "문법 오류 %s:%u: 지원하지 않는 지시어 '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "문법 오류 %s:%u: 파일의 끝에 쓰레기 데이터가 더 있습니다" @@ -2264,75 +2276,75 @@ msgstr "%s 디렉토리로 이동할 수 없습니다" msgid "Failed to stat the cdrom" msgstr "CD-ROM의 정보를 읽을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "읽기 전용 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "잠금 파일 %s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "NFS로 마운트된 잠금 파일 %s에 대해 잠금을 사용하지 않습니다" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "%s 잠금 파일을 얻을 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s 프로세스를 기다렸지만 해당 프로세스가 없습니다" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "하위 프로세스 %s 프로세스가 세그멘테이션 오류를 받았습니다." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "하위 프로세스 %s 프로세스가 오류 코드(%u)를 리턴했습니다" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "하위 프로세스 %s 프로세스가 예상치 못하게 끝났습니다" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s 파일을 열 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "%lu만큼 더 읽어야 하지만 더 이상 읽을 데이터가 없습니다" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "%lu만큼 더 써야 하지만 더 이상 쓸 수 없습니다" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "파일을 닫는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "파일을 지우는 데 문제가 있습니다" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "파일을 동기화하는 데 문제가 있습니다" @@ -2449,52 +2461,52 @@ msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (1)" msgid "Unable to parse package file %s (2)" msgstr "패키지 파일 %s 파일을 파싱할 수 없습니다 (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (URI 파싱)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (절대 dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "소스 리스트 %2$s의 %1$lu번 줄이 잘못되었습니다 (dist 파싱)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s 파일을 여는 중입니다" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "소스 리스트 %2$s의 %1$u번 줄이 너무 깁니다." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (타입)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "소스 목록 %3$s의 %2$u번 줄의 '%1$s' 타입을 알 수 없습니다" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "소스 리스트 %2$s의 %1$u번 줄이 잘못되었습니다 (벤더 ID)" @@ -2620,17 +2632,17 @@ msgstr "패키지 목록이나 상태 파일을 파싱할 수 없거나 열 수 msgid "You may want to run apt-get update to correct these problems" msgstr "apt-get update를 실행하면 이 문제를 바로잡을 수도 있습니다." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "기본 설정 파일에 잘못된 데이터가 있습니다. 패키지 헤더가 없습니다" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "핀 타입 %s이(가) 무엇인지 이해할 수 없습니다" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "핀에 우선순위(혹은 0)를 지정하지 않았습니다" @@ -2714,16 +2726,16 @@ msgstr "%s 처리 중에 오류가 발생했습니다 (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "파일 의존성을 처리하는 데, %s %s 패키지가 없습니다" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "소스 패키지 목록 %s의 정보를 읽을 수 없습니다" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "파일에서 제공하는 것을 모으는 중입니다" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다" @@ -2732,19 +2744,19 @@ msgstr "소스 캐시를 저장하는 데 입출력 오류가 발생했습니다 msgid "rename failed, %s (%s -> %s)." msgstr "이름 바꾸기가 실패했습니다. %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum이 맞지 않습니다" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "해쉬 합계가 서로 다릅니다" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2753,7 +2765,7 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다. (아키텍쳐가 빠졌기 때문입니다)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2762,14 +2774,14 @@ msgstr "" "%s 패키지의 파일을 찾을 수 없습니다. 수동으로 이 패키지를 고쳐야 할 수도 있습" "니다." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "패키지 인덱스 파일이 손상되었습니다. %s 패키지에 Filename: 필드가 없습니다." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "크기가 맞지 않습니다" @@ -2902,7 +2914,6 @@ msgstr "레코드 %i개를 파일 %i개가 빠지고 %i개가 맞지 않은 상 #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "설정 파일 %s 파일을 여는 중입니다" @@ -2913,7 +2924,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "해쉬 합계가 서로 다릅니다" @@ -2934,7 +2944,6 @@ msgstr "%s 패키지를 지우는 중입니다" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s 패키지를 완전히 지웠습니다" @@ -3019,14 +3028,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -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 "연결이 너무 빨리 끊어졌습니다" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "키링에 접근할 수 없습니다: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "%s 파일을 열 수 없습니다" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-ku\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-05-08 12:48+0200\n" "Last-Translator: Erdal Ronahi <erdal dot ronahi at gmail dot com>\n" "Language-Team: ku <ubuntu-l10n-kur@lists.ubuntu.com>\n" @@ -151,7 +151,7 @@ msgstr " Tabloya guhertoyan:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s ji bo %s %s komkirî di %s %s de\n" @@ -259,7 +259,7 @@ msgid "" " -o=? Set an arbitrary configuration option, eg -o dir::cache=/tmp\n" msgstr "" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nivîsandin ji bo %s ne pêkane" @@ -355,7 +355,7 @@ msgstr "Danegir kevn e, ji bo bilindkirina %s hewl dide" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -370,11 +370,11 @@ msgstr "Danegira %s nehate vekirin: %s" msgid "Failed to stat %s" msgstr "" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Tomara kontrola arşîvê tuneye" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -439,26 +439,26 @@ msgstr "" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Di arşîvê de qada pakêtê tuneye" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -562,7 +562,7 @@ msgstr "" msgid "Y" msgstr "E" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -721,11 +721,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Pelrêça daxistinê nayê quflekirin" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "" @@ -754,8 +754,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nikarî cihê vala li %s tesbît bike" @@ -789,7 +789,7 @@ msgstr "Betal." msgid "Do you want to continue [Y/n]? " msgstr "Dixwazî bidomînî [E/n]?" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Anîna %s %s biserneket\n" @@ -798,7 +798,7 @@ msgstr "Anîna %s %s biserneket\n" msgid "Some files failed to download" msgstr "Daxistina çend pelan biserneket" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "" @@ -890,51 +890,51 @@ msgstr "" msgid "Selected version %s (%s) for %s\n" msgstr "" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -950,49 +950,49 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Peywira %s nehate dîtin" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nikarî pakêta %s bibîne" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "lê %s dê were sazkirin" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." msgstr "" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1000,152 +1000,152 @@ msgid "" "or been moved out of Incoming." msgstr "" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Paketên şikestî" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Paketên tên pêşniyaz kirin:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Paketên tên tawsiyê kirin:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Bilindkirin tê hesibandin..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Serneket" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Temam" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Cihê vala li %s têre nake" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Çavkanîna %s bîne\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Anîna çend arşîvan biserneket." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, 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:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1189,7 +1189,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1422,11 +1422,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nikare %s bixwîne" @@ -1456,9 +1455,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Lîsteya pakêtan tê xwendin" @@ -1587,12 +1586,12 @@ msgid "File not found" msgstr "Pel nehate dîtin" #: 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 #, fuzzy msgid "Failed to stat" msgstr "%s venebû" -#: 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 "" @@ -1652,7 +1651,7 @@ msgstr "" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Çewiya xwendinê" @@ -1664,7 +1663,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Çewtiya nivîsînê" @@ -1718,7 +1717,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1783,59 +1782,64 @@ msgstr "" msgid "Connecting to %s" msgstr "Bi %s re tê girêdan" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nikarî '%s' çareser bike" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nikare bi %s re girêdan pêk bîne %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Sazkirin tê betalkirin." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Di xebitandina gpgv de çewtiya nenas" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Ev pakêtên NÛ dê werine sazkirin:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1884,49 +1888,49 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Hilbijartin neserketî" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "" -#: methods/http.cc:818 +#: methods/http.cc:819 #, fuzzy msgid "Error writing to output file" msgstr "Dema li dosyeya naverokê joreagahî dihate nivîsîn çewtî" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Dema li pelî dihate nivîsîn çewtî" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Nivîsîna pelê %s biserneket" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Girêdan pêk nehatiye" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Çewtiya hundirîn" @@ -1934,18 +1938,25 @@ msgstr "Çewtiya hundirîn" 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 @@ -1975,52 +1986,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Hilbijartina %s nehatiye dîtin" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2096,75 +2107,75 @@ msgstr "Nikarî derbasa %s bike" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nikarî qufila pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nikarî pelê %s veke" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Di girtina pelî de pirsgirêkek derket" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "" @@ -2281,52 +2292,52 @@ msgstr "Pakêt nehate dîtin %s" msgid "Unable to parse package file %s (2)" msgstr "Pakêt nehate dîtin %s" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s tê vekirin" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2443,17 +2454,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2537,16 +2548,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2555,39 +2566,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "nav guherandin biserneket, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum li hev nayên" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum li hev nayên" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, 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:1319 #, 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:1360 #, 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:1447 msgid "Size mismatch" msgstr "Mezinahî li hev nayên" @@ -2728,7 +2739,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum li hev nayên" @@ -2749,7 +2759,6 @@ msgstr "%s tê rakirin" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s bi tevahî hatine rakirin" @@ -2833,15 +2842,28 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Danegira %s nehate vekirin: %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 "Girêdan zû hatiye girtin" +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Danegira %s nehate vekirin: %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-08-02 01:47-0400\n" "Last-Translator: Gintautas Miliauskas <gintas@akl.lt>\n" "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n" @@ -150,7 +150,7 @@ msgstr " Versijų lentelė:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "" @@ -268,7 +268,7 @@ msgstr "" " -c=? Nuskaityti šį konfigūracijų failą\n" " -o=? Nustatyti savarankiškas nuostatas, pvz.: -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nepavyko įrašyti į %s" @@ -407,8 +407,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Duomenų bazė yra sena, bandoma atnaujinti %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Duomenų bazės formatas yra netinkamas. Jei jūs atsinaujinote iš senesnės " @@ -425,11 +426,11 @@ msgstr "Nepavyko atverti DB failo %s: %s" msgid "Failed to stat %s" msgstr "Nepavyko patikrinti %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "" @@ -494,26 +495,26 @@ msgstr "*** Nepavyko susieti %s su %s" msgid " DeLink limit of %sB hit.\n" msgstr "" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archyvas neturėjo paketo lauko" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s neturi perrašymo įrašo\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s prižiūrėtojas yra %s, o ne %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -617,7 +618,7 @@ msgstr "Nepavyko pervadinti %s į %s" msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "" @@ -779,11 +780,11 @@ msgstr "Reikia pašalinti paketus, tačiau šalinimas išjungtas." msgid "Internal error, Ordering didn't finish" msgstr "" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nepavyko užrakinti parsiuntimų aplanko" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nepavyko perskaityti šaltinių sąrašo." @@ -812,8 +813,8 @@ msgstr "Po šios operacijos bus naudojama %sB papildomos disko vietos.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po šios operacijos bus atlaisvinta %sB disko vietos.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nepavyko nustatyti %s laisvos vietos" @@ -850,7 +851,7 @@ msgstr "Nutraukti." msgid "Do you want to continue [Y/n]? " msgstr "Ar norite tęsti [T/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nepavyko parsiųsti %s %s\n" @@ -859,7 +860,7 @@ msgstr "Nepavyko parsiųsti %s %s\n" msgid "Some files failed to download" msgstr "Nepavyko parsiųsti kai kurių failų" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Pavyko parsiųsti tik parsiuntimo režime" @@ -957,50 +958,50 @@ msgstr "Nebuvo rasta „%s“ versija paketui „%s“" msgid "Selected version %s (%s) for %s\n" msgstr "Pažymėta versija %s (%s) paketui %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 +#: cmdline/apt-get.cc:1321 #, c-format -msgid "Ignore unavailable version '%s' of package '%s'" +msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1352 #, c-format -msgid "Ignore unavailable target release '%s' of package '%s'" +msgid "Picking '%s' as source package instead of '%s'\n" msgstr "" -#: cmdline/apt-get.cc:1342 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 #, c-format -msgid "Picking '%s' as source package instead of '%s'\n" +msgid "Ignore unavailable version '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1395 +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Atnaujinimo komandai argumentų nereikia" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nepavyko užrakinti sąrašo aplanko" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Šie paketai buvo automatiškai įdiegti ir daugiau nebėra reikalingi:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Norėdami juos pašalinti, paleiskite „apt-get autoremove“" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1016,43 +1017,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Ši informacija gali padėti išspręsti šią situaciją:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nepavyko rasti užduoties %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nepavyko rasti paketo %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Pastaba, žymima %s regex atitikimų formoje '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s nustatytas kaip įdiegtas rankiniu būdu\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Jūs galite norėti paleisti 'apt-get -f install\" klaidų taisymui:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1060,7 +1061,7 @@ msgstr "" "Nepatenkintos priklausomybės. Pabandykite įvykdyti 'apt-get -f install' be " "nurodytų paketų (arba nurodykite išeitį)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1072,115 +1073,115 @@ msgstr "" "leidimą, kuomet kai kurie paketai dar nebuvo sukurti arba buvo\n" "pašalinti iš \"Incoming\" aplanko." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Sugadinti paketai" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Bus įdiegti šie papildomi paketai:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Siūlomi paketai:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Rekomenduojami paketai:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Skaičiuojami atnaujinimai... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Nepavyko" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Įvykdyta" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Vidinė klaida, problemos sprendimas kažką sugadino" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Būtina nurodyti bent vieną paketą, kad parsiųsti jo išeities tekstą" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nepavyko surasti išeities teksto paketo, skirto %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Neturite pakankamai laisvos vietos %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Reikia parsiųsti %sB/%sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Reikia parsiųsti %sB išeities archyvų.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Parsiunčiamas archyvas %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nepavyko gauti kai kurių arhcyvų." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Jau išpakuotas archyvas %s praleidžiama\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Nepavyko įvykdyti išpakavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Patikrinkite, ar įdiegtas „dpkg-dev“ paketas.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Nepavyko įvykdyti paketo kompiliavimo komandos „%s“\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Klaida procese-palikuonyje" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Būtina nurodyti bent vieną paketą, kuriam norite įvykdyti builddeps" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nepavyko gauti kūrimo-priklausomybių informacijos paketui %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1188,7 +1189,7 @@ msgid "" msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes paketas %s nerastas" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1197,32 +1198,32 @@ msgstr "" "%s priklausomybė %s paketui negali būti patenkinama, nes nėra tinkamos " "versijos %s paketo" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nepavyko patenkinti %s priklausomybės %s paketui: Įdiegtas paketas %s yra " "per naujas" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nepavyko patenkinti %s priklausomybės %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Palaikomi moduliai:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1266,7 +1267,7 @@ msgid "" " This APT has Super Cow Powers.\n" msgstr "" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1516,11 +1517,10 @@ msgstr "" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nepavyko perskaityti %s" @@ -1550,9 +1550,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Skaitomi paketų sąrašai" @@ -1681,11 +1681,11 @@ msgid "File not found" msgstr "Failas nerastas" #: 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 "" @@ -1745,7 +1745,7 @@ msgstr "Jungiamasi per ilgai" msgid "Server closed the connection" msgstr "" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Skaitymo klaida" @@ -1757,7 +1757,7 @@ msgstr "" msgid "Protocol corruption" msgstr "" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Rašymo klaida" @@ -1811,7 +1811,7 @@ msgstr "" msgid "Unable to accept connection" msgstr "" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "" @@ -1875,58 +1875,63 @@ msgstr "Nepavyko prisijungti prie %s:%s (%s)." msgid "Connecting to %s" msgstr "Jungiamasi prie %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nepavyko surasti vardo „%s“" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Laikinas sutrikimas ieškant vardo „%s“" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nepavyko prisijungti prie %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Diegimas nutraukiamas." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Nežinoma klaida kviečiant gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Šie parašai buvo nevalidūs:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -1975,48 +1980,48 @@ msgstr "" msgid "Unknown date format" msgstr "" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Prisijungimo laiko limitas baigėsi" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Klaida bandant rašyti į failą" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Nepavyko patikrinti %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Prisijungti nepavyko" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Vidinė klaida" @@ -2024,18 +2029,25 @@ msgstr "Vidinė klaida" 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 @@ -2065,52 +2077,52 @@ msgstr "" msgid "Selection %s not found" msgstr "" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "" @@ -2186,75 +2198,75 @@ msgstr "Nepavyko pakeisti į %s" msgid "Failed to stat the cdrom" msgstr "" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nepavyko atverti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nepavyko rezervuoti rakinimo failo %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Procesas %s gavo segmentavimo klaidą" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Procesas %s grąžino klaidos kodą (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Procesas %s netikėtai išėjo" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nepavyko atverti failo %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Klaida užveriant failą" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Klaida sinchronizuojant failą" @@ -2371,52 +2383,52 @@ msgstr "" msgid "Unable to parse package file %s (2)" msgstr "" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Atveriama %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "" @@ -2537,17 +2549,17 @@ msgstr "" "Greičiausiai norėsite paleisti „apt-get update“, kad šios problemos būtų " "ištaisytos" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "" @@ -2631,16 +2643,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "" @@ -2649,39 +2661,39 @@ msgstr "" msgid "rename failed, %s (%s -> %s)." msgstr "" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5 sumos neatitikimas" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Maišos sumos nesutapimas" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, 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:1319 #, 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:1360 #, 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:1447 msgid "Size mismatch" msgstr "Neatitinka dydžiai" @@ -2812,7 +2824,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Skipping already downloaded file '%s'\n" msgid "Skipping nonexistent file %s" msgstr "Praleidžiama jau parsiųsta byla „%s“\n" @@ -2823,7 +2834,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Maišos sumos nesutapimas" @@ -2844,7 +2854,6 @@ msgstr "Šalinamas %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Visiškai pašalintas %s" @@ -2928,16 +2937,29 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -#| msgid "Could not open file %s" -msgid "Could not patch file" -msgstr "Nepavyko atverti failo %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 open file %s" +#~ msgid "Could not patch file" +#~ msgstr "Nepavyko atverti failo %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-20 23:27+0530\n" "Last-Translator: Sampada <sampadanakhare@gmail.com>\n" "Language-Team: Marathi, janabhaaratii, C-DAC, Mumbai, India " @@ -146,7 +146,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s हे %s करिता %s %s वर संग्रहित\n" @@ -299,7 +299,7 @@ msgstr "" " -c=? ही संरचना संचिका वाचा \n" " -o=? एखादा अहेतुक संरचना पर्याय निर्धारित करा जसे- -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "%s मध्ये लिहिण्यास असमर्थ " @@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB जुने आहे,%s पुढच्या आवृतीसाठी प्रयत्न करत आहे" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB स्वरुप वैध नाही. जर तुम्ही apt च्या जुन्या आवृत्तीपासून पुढिल आवृत्तीकृत करत असाल तर, " @@ -451,11 +452,11 @@ msgstr "%s: %s DB संचिका उघडण्यास असमर्थ msgid "Failed to stat %s" msgstr "%s स्टेट करण्यास असमर्थ" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "अर्काईव्ह मध्ये नियंत्रण माहिती संच नाही" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "संकेतक घेण्यास असमर्थ" @@ -520,26 +521,26 @@ msgstr "%s चा %s दुवा साधण्यास असमर्थ" msgid " DeLink limit of %sB hit.\n" msgstr "%sB हीट ची डिलींक मर्यादा\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "अर्काईव्ह ला पॅकेज जागा नाही" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr "%s ला ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr "%s देखभालकर्ता हा %s आणि %s नाही \n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "%s ला उगम ओव्हरराईड/दुर्लक्षित जागा नाही\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "%s ला द्वयंक ओव्हरराईड जागा नाही\n" @@ -643,7 +644,7 @@ msgstr "%s ला पुनर्नामांकन %s करण्यास msgid "Y" msgstr "होय" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "रिजेक्स कंपायलेशन त्रुटी -%s " @@ -804,11 +805,11 @@ msgstr "पॅकेजेस कायमची काढायची आहे msgid "Internal error, Ordering didn't finish" msgstr "अंतर्गत त्रुटी,क्रम अजून संपला नाही" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "डाऊनलोड डिरेक्टरी कुलूपबंद करण्यास असमर्थ" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "उगमांच्या याद्या वाचता येणार नाहीत." @@ -837,8 +838,8 @@ msgstr "या क्रियेनंतर, %sB एवढी अधिक ड msgid "After this operation, %sB disk space will be freed.\n" msgstr "या क्रियेनंतर, %sB डिस्क जागा मोकळी होईल.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "%s मध्ये रिकामी जागा सांगू शकत नाही" @@ -875,7 +876,7 @@ msgstr "व्यत्यय/बंद करा." msgid "Do you want to continue [Y/n]? " msgstr "तुम्हाला पुढे जायचे आहे [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s आणणे असफल\n" @@ -884,7 +885,7 @@ msgstr "%s %s आणणे असफल\n" msgid "Some files failed to download" msgstr "काही संचिका डाऊनलोड करण्यास असमर्थ" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "डाऊनलोड संपूर्ण आणि डाऊनलोड मध्ये फक्त पद्धती" @@ -982,50 +983,50 @@ msgstr "'%s' साठी '%s' आवृत्ती सापडली ना msgid "Selected version %s (%s) for %s\n" msgstr "%s साठी %s (%s) निवडलेली आवृत्ती.\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "सुधारित आवृत्तीचा विधान आर्ग्युमेंटस घेऊ शकत नाही." -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "संचयिका यादीला कुलुप लावण्यात असमर्थ" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "आपण या गोष्टी काढून टाकता नये, ऑटोरिमूव्हर सुरू करता येत नाही" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "खालील नवीन पॅकेजेस स्वयंचलितपणे संस्थापित झाली होती व आता आवश्यक नाहीत:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "ती काढून टाकण्यासाठी 'apt-get autoremove' वापरा." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1043,45 +1044,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "खालील माहिती परिस्थिती निवळण्यासाठी मदत ठरू शकेल:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "अंतर्गत त्रुटी, AutoRemoverने स्टफला तोडले" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "अंतर्गत त्रुटी,ऑलअपग्रेडने स्टफला तोडले" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "%s कार्य सापडू शकले नाही" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "%s पॅकेज सापडू शकले नाही" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "सूचना, '%s' रिजेक्स साठी %s ची निवड करत आहे\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s स्वहस्ते संस्थापित करायचे आहे.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "तुम्हाला कदाचित `apt-get -f install'(एपीटी-गेट -एफ संस्थापन') प्रोग्राम चालू करावा " "लागेल'यात बदल करण्यासाठी:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1090,7 @@ msgstr "" "अनमेट डिपेंडन्सीज.एपीटी-गेट -एफ संस्थापन (`apt-get -f install') पॅकेजशिवाय प्रयत्न करा " "(किंवा पर्याय सांगा)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,122 +1102,122 @@ msgstr "" "विभागणी असणारी पण हवी असणारी, तयार केली नसलेली पॅकेजेस वापरत असाल \n" "किंवा ती येणाऱ्यांपैकी बाहेर हलविली असतील." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "तुटलेली पॅकेजेस" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "खालील अतिरिक्त पॅकेजेस संस्थापित होतील:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "सुचवलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "शिफारस केलेली पॅकेजेस:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "पुढिल आवृत्तीची गणती करीत आहे..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "असमर्थ" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "झाले" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "अंतर्गत त्रुटी, अडचण निवारकाने स्टफला तोडले" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "उगम शोधण्यासाठी किमान एक पॅकेज देणे/सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s उगम पॅकेज शोधणे शक्य नाही/शोधण्यास असमर्थ आहे" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "आधीच डाऊनलोड केलेली '%s' फाईल सोडून द्या\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "%s मध्ये पुरेशी जागा नाही" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "उगम अर्काईव्हज चा %sB/%sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "उगम अर्काईव्हजचा %sB घेण्याची गरज आहे.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "%s उगम घ्या\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "काही अर्काईव्हज आणण्यास असमर्थ." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "%s मध्ये आधीच उघडलेल्या उगमातील उघडलेल्याला सोडून द्या किंवा वगळा\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "'%s' आज्ञा सुट्या करण्यास असमर्थ.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "'dpkg-dev' पॅकेज संस्थापित केले आहे का ते पडताळून पहा.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "बांधणी करणाऱ्या आज्ञा '%s' अयशस्वी.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "चाईल्ड प्रक्रिया अयशस्वी" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "बिल्डेपस् कशासाठी ते पडताळण्यासाठी किमान एक पॅकेज सांगणे गरजेचे आहे" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s साठी बांधणी डिपेंडन्सी माहिती मिळवण्यास असमर्थ" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s ला बांधणी डिपेंडन्स नाहीत.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, 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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1225,30 +1226,30 @@ msgstr "" "आवृतीची मागणी पूर्ण करण्यासाठी %s पॅकेजची आवृत्ती उपलब्ध नाही,त्यामुळे %s साठी %s " "डिपेंडन्सी पूर्ण होऊ शकत नाही" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s अवलंबित्व %s साठी पूर्ण होण्यास असमर्थ: संस्थापित पॅकेज %s खूपच नवीन आहे" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s साठी %s डिपेंडन्सी पूर्ण होण्यास असमर्थ: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s साठी बांधणी-डिपेंडन्सीज पूर्ण होऊ शकत नाही." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "बांधणी-डिपेंडन्सीज क्रिया पूर्ण करण्यास असमर्थ " -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "प्रोग्राम गटाला तांत्रिक मदत दिली:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1333,7 +1334,7 @@ msgstr "" " apt.conf(5) पुस्तिका पाने पहा.\n" " ह्या APT ला सुपर काऊ पॉवर्स आहेत\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1580,11 +1581,10 @@ msgstr "File %s/%s, %s पॅकेज मधल्या एका वर प #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s वाचण्यास असमर्थ" @@ -1614,9 +1614,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info आणि temp संचिका सारख्याच फाईलप्रणालीत असणे आवश्यक आहे" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "पॅकेज याद्या वाचत आहोत" @@ -1749,11 +1749,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 "बदलण्याचा वेळ निश्चित करण्यास असमर्थ" @@ -1815,7 +1815,7 @@ msgstr "वेळेअभावी संबंध जोडता येत msgid "Server closed the connection" msgstr "सर्व्हरने संबंध जोडणी बंद केली" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटी वाचा" @@ -1827,7 +1827,7 @@ msgstr "प्रतिसाधाने बफर भरुन गेले." msgid "Protocol corruption" msgstr "प्रोटोकॉल खराब झाले" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "लिहिण्यात त्रुटी" @@ -1881,7 +1881,7 @@ msgstr "डेटा सॉकेट जोडणी वेळेअभावी msgid "Unable to accept connection" msgstr "जोडणी स्विकारण्यास असमर्थ" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "फाईल हॅश करण्यात त्रुटी" @@ -1945,60 +1945,65 @@ msgstr "%s:%s (%s) ला जोडू शकत नाही" msgid "Connecting to %s" msgstr "%s ला जोडत आहे" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "%s रिझॉल्व्ह होऊ शकत नाही " -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' रिझॉल्व्ह करताना तात्पुरती त्रुटी" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "%s:%s' (%i) रिझॉल्व्ह होत असताना काहीतरी वाईट घडले" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s ला जोडण्यास असमर्थ:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "संस्थापन खंडित करत आहे." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "दोष: ::gpgv:: कडून प्राप्त झालेला ऑर्गुमेंट सूचीचा पर्याय खूप लांबीचा. बाहेर पडत आहे." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "अंतर्गत त्रुटी: चांगली सही, पण की ठसे सांगू शकत नाही?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "किमान एक अवैध सही सापडली." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "सहीची खात्री करण्यासाठी '%s' कार्यान्वित करू शकत नाही (gpgv संस्थापित केले आहे का?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यान्वित होत असताना अपरिचित त्रुटी" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "खालील सह्या अवैध आहेत:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2047,47 +2052,47 @@ msgstr "HTTP सर्व्हरने विस्तार तांत् msgid "Unknown date format" msgstr "अपरिचित दिनांक प्रकार/स्वरूप " -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "चुकले/असमर्थ निवड करा" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "जोडणी वेळेअभावी तुटली" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "निर्गत फाईल मध्ये लिहिताना त्रुटी/चूक" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "फाईल मध्ये लिहिण्यात चूक/त्रुटी" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "सर्व्हर मधून वाचण्यात चूक. लांब शेवट आणि बंद झालेली जोडणी" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "सर्व्हर मधून वाचण्यात चूक" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "फाईल छोटी करणे असफल" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "चुकीचा शीर्षक डाटा" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "जोडणी अयशस्वी" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "अंतर्गत त्रुटी" @@ -2095,18 +2100,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 @@ -2136,52 +2148,52 @@ msgstr "" msgid "Selection %s not found" msgstr "%s निवडक भाग सापडत नाही" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "संक्षिप्तरुपाचा माहित नसलेला प्रकार: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "%s संरचना फाईल उघडत आहे" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "रचनेच्या नियमांचा दोष %s:%u: ब्लॉक नावाशिवाय सुरू होतो." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "रचनेच्या नियमांचा दोष : %s:%u: मालफॉर्मड् टॅग" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "रचनेच्या नियमांचा दोष %s:%u: मुल्यांच्या नंतर अधिक जंक" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "रचनेच्या नियमांचा दोष %s:%u: दिशादर्शक फक्त उच्च पातळीवर केले जाऊ शकतात" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "रचनेच्या नियमांचा दोष %s:%u: खूपच एकात एक इनक्लूडस्" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "रचनेच्या नियमांचा दोष %s:%u: ह्या पासून समाविष्ट " -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "नियम रचनेचा दोष %s:%u: '%s' दिशादर्शक असहाय्यकारी" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "नियम रचनेचा दोष %s:%u: फाईलच्या अंती अधिक जंक" @@ -2257,75 +2269,75 @@ msgstr "%s मध्ये बदलण्यास असमर्थ" msgid "Failed to stat the cdrom" msgstr "सीडी-रॉम स्टॅट करण्यास असमर्थ" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "फक्त वाचण्यासाठी कुलूप संचिका %s साठी कुलूपबंदचा वापर करीत नाही" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "%s कुलूप फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "%s nfs(नेटवर्क फाईल सिस्टीम) माऊंटेड कुलुप फाईल ला कुलुप /बंद करता येत नाही" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "%s कुलुप मिळवता येत नाही" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "%s साठी थांबलो पण ते तेथे नव्हते" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "%s उपक्रियेला सेगमेंटेशन दोष प्राप्त झाला." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "%s उपक्रियेने (%u) त्रुटी कोड दिलेला आहे" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "%s उपक्रिया अचानकपणे बाहेर पडली" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "%s फाईल उघडता येत नाही" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "वाचा, %lu अजूनही वाचण्यासाठी आहे पण आता काही उरली नाही" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लिहा, %lu अजूनही लिहिण्यासाठी आहे पण लिहिता येत नाही" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "फाईल बंद करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "फाईल अनलिंकिंग करण्यात अडचण" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "संचिकेची syncing समस्या" @@ -2442,52 +2454,52 @@ msgstr "%s (1) पॅकेज फाईल पार्स करण्या msgid "Unable to parse package file %s (2)" msgstr "%s (२) पॅकेज फाईल पार्स करण्यात असमर्थ" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "स्त्रोत सुची %s (यूआरआय) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "स्त्रोत सुची %s (डिआयएसटी) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "स्त्रोत सुची %s (यूआरआय पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "स्त्रोत सुची %s (absolute dist) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "स्त्रोत सुची %s (डीआयएसटी पार्स) मध्ये %lu वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s उघडत आहे" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "%s स्त्रोत सुचीमध्ये ओळ %u खूप लांब आहे." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "स्त्रोत सुची %s (प्रकार) मध्ये %u वाईट/व्यंग रेषा" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "%s स्त्रोत सुचीमध्ये %u रेषेवर '%s' प्रकार माहित नाही " -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "स्त्रोत सुची %s (विक्रेता आयडी) मध्ये %u वाईट/व्यंग रेषा " @@ -2612,17 +2624,17 @@ msgstr "पॅकेजच्या याद्या किंवा संच msgid "You may want to run apt-get update to correct these problems" msgstr "तुम्ही ह्या समस्यांचे निवारण करण्यासाठी apt-get update प्रोग्राम चालू करु शकता" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "पसंतीच्या संचिकेत अवैध माहितीसंच, पॅकेजला शीर्षक नाही " -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "%s पिनचा प्रकार समजलेला नाही" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "पिन करिता प्राधान्य/अग्रक्रम (किंवा शून्य)निर्देशीत केलेला नाही" @@ -2711,16 +2723,16 @@ msgstr "%s (तरतूद/पुरवलेल्या संचिका msgid "Package %s %s was not found while processing file dependencies" msgstr "अवलंबित/विसंबून असणाऱ्या संचिकांची प्रक्रिया करीत असतांना पॅकेज %s %s सापडले नाही " -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "%s उगम पॅकेज यादी सुरू करता येत नाही" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "तरतूद/पुरवलेल्या संचिका संग्रहित करीत आहे" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO त्रुटी उगम निवडक संचयस्थानात संग्रहित होत आहे" @@ -2729,19 +2741,19 @@ msgstr "IO त्रुटी उगम निवडक संचयस्था msgid "rename failed, %s (%s -> %s)." msgstr "पुनर्नामांकन अयशस्वी, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "एमडी५ बेरीज/MD5Sum जुळत नाही" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "हॅश बेरीज जुळत नाही" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2750,7 +2762,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हाला हे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे(हरवलेल्या आर्चमुळे) " -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2759,7 +2771,7 @@ msgstr "" "मी %s पॅकेजकरीता संचिका शोधण्यास समर्थ नव्हतो. याचा अर्थ असाकी तुम्हालाहे पॅकेज स्वहस्ते " "स्थिर/निश्चित करण्याची गरज आहे." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2767,7 +2779,7 @@ msgstr "" "पॅकेज यादीची/सुचीची संचिका दूषित/खराब झालेली आहे. संचिका नाव नाही: पॅकेजकरीता क्षेत्र/" "ठिकाण %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "आकार जुळतनाही" @@ -2902,7 +2914,6 @@ msgstr "%i गहाळ संचिकाबरोबर आणि %i विज #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "%s संरचना फाईल उघडत आहे" @@ -2913,7 +2924,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "हॅश बेरीज जुळत नाही" @@ -2934,7 +2944,6 @@ msgstr "%s काढून टाकत आहे" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s संपूर्ण काढून टाकले" @@ -3018,14 +3027,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "'%s': कीरिंग पर्यंत पोहोचू शकत नाही" + +#~ msgid "Could not patch file" +#~ msgstr "फाईल पॅच करता आली नाही" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-02-01 18:26+0100\n" "Last-Translator: Hans Fredrik Nordhaug <hans@nordhaug.priv.no>\n" "Language-Team: Norwegian Bokmal <i18n-nb@lister.ping.ui.no>\n" @@ -154,7 +154,7 @@ msgstr " Versjonstabell:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s kompilert p %s %s\n" @@ -309,7 +309,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Sett en vilkrlig innstilling, f.eks. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kan ikke skrive til %s" @@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Databasen er gammel, forsker oppgradere %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB-formatet er ugyldig. Hvis du oppgraderte fra en eldre versjon av apt, " @@ -461,11 +462,11 @@ msgstr "Klarte ikke pne Databasefila %s: %s" msgid "Failed to stat %s" msgstr "Klarte ikke f statusen p %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikke finne en peker" @@ -530,26 +531,26 @@ msgstr "*** Klarte ikke lenke %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %s B er ndd.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet har ikke noe pakkefelt" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen overstyringsoppfring\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikeholderen er %s, ikke %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen kildeoverstyringsoppfring\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har ingen binroverstyringsoppfring heller\n" @@ -653,7 +654,7 @@ msgstr "Klarte ikke endre navnet p %s til %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Kompileringsfeil i regulrt uttrykk - %s" @@ -814,11 +815,11 @@ msgstr "Pakker trenges fjernes, men funksjonen er sltt av." msgid "Internal error, Ordering didn't finish" msgstr "Intern feil, sortering fullfrte ikke" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Klarer ikke lse nedlastingsmappa" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kan ikke lese kildlista." @@ -849,8 +850,8 @@ msgstr "Etter denne operasjonen vil %sB ekstra diskplass bli brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter denne operasjonen vil %sB diskplass bli ledig.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Klarte ikke bestemme ledig plass i %s" @@ -888,7 +889,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vil du fortsette [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikke skaffe %s %s\n" @@ -897,7 +898,7 @@ msgstr "Klarte ikke skaffe %s %s\n" msgid "Some files failed to download" msgstr "Noen av filene kunne ikke lastes ned" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nedlasting fullfrt med innstillinga bare nedlasting" @@ -995,50 +996,50 @@ msgstr "Versjon %s av %s ble ikke funnet" msgid "Selected version %s (%s) for %s\n" msgstr "Utvalgt versjon %s (%s) for %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Oppdaterings-kommandoen tar ingen argumenter" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kan ikke lse listemappa" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Vi skal ikke slette ting, kan ikke starte auto-fjerner (AutoRemover)" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Flgende pakker ble automatisk installert og er ikke lenger pkrevet:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Bruk apt-get autoremove for fjerne dem." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1056,43 +1057,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Flgende informasjon kan vre til hjelp med lse problemet:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil, autofjerneren (AutoRemover) dela noe" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil - AllUpgrade dela noe" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Klarte ikke finne oppgave %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Klarte ikke finne pakken %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, velger %s istedenfor det regulre uttrykket %s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s satt til manuell installasjon.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje utfre apt-get -f install for rette p disse:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1100,7 +1101,7 @@ msgstr "" "Uinnfridde avhengighetsforhold. Prv apt-get -f install uten pakker (eller " "angi en lsning)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,122 +1113,122 @@ msgstr "" "at visse kjernepakker enn ikke er laget eller flyttet ut av Incoming for\n" "distribusjonen." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "delagte pakker" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Flgende ekstra pakker vil bli installert." -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Foresltte pakker:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Anbefalte pakker" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Beregner oppgradering... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislyktes" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Utfrt" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil, problemlser dela noe" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du m angi minst en pakke du vil ha kildekoden til" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Klarer ikke finne en kildekodepakke for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hopper over allerede nedlastet fil %s\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikke nok ledig plass i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Trenger skaffe %sB av %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Trenger skaffe %sB fra kildekodearkivet.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Skaffer kildekode %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Klarte ikke skaffe alle arkivene." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Omgr utpakking av allerede utpakket kilde i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Sjekk om pakken dpkg-dev er installert.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggekommandoen %s mislyktes.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barneprosessen mislyktes" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Du m angi minst en pakke du vil sjekke builddeps for" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarer ikke skaffe informasjon om bygge-avhengighetene for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen avhengigheter.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikke oppfylles fordi pakken %s ikke finnes" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1236,32 +1237,32 @@ msgstr "" "Kravet %s for %s kan ikke oppfylles fordi det ikke finnes noen tilgjengelige " "versjoner av pakken %s som oppfyller versjonskravene" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikke tilfredsstille %s avhengighet for %s: den installerte pakken %" "s er for ny" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikke tilfredsstille %s avhengighet for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Klarte ikke tilfredstille bygg-avhengighetene for %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Klarte ikke behandle forutsetningene for bygging" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Stttede moduler:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1346,7 +1347,7 @@ msgstr "" "for mer informasjon og flere innstillinger\n" " Denne APT har kraften til en Superku.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1594,11 +1595,10 @@ msgstr "Fila %s/%s skriver over den tilsvarende fila i pakken %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Klarer ikke lese %s" @@ -1629,9 +1629,9 @@ msgstr "" "Infokatalogen og den midlertidige katalogen m vre p det samme filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Leser pakkelister" @@ -1769,11 +1769,11 @@ msgid "File not found" msgstr "Fant ikke fila" #: 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 "Klarte ikke f status" -#: 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 "Klarte ikke sette endringstidspunkt" @@ -1835,7 +1835,7 @@ msgstr "Tidsavbrudd p forbindelsen" msgid "Server closed the connection" msgstr "Tjeneren lukket forbindelsen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1847,7 +1847,7 @@ msgstr "Et svar oversvmte bufferen." msgid "Protocol corruption" msgstr "Protokolldeleggelse" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1901,7 +1901,7 @@ msgstr "Tidsavbrudd p tilkoblingen til datasokkelen" msgid "Unable to accept connection" msgstr "Klarte ikke godta tilkoblingen" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1965,59 +1965,64 @@ msgstr "Klarte ikke koble til %s:%s (%s)." msgid "Connecting to %s" msgstr "Kobler til %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikke sl opp %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Midlertidig feil ved oppslag av %s" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Noe galt skjedde ved oppslag av %s:%s (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Klarte ikke koble til %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Klarte ikke sl opp i nkkelring; %s" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Avbryter istallasjonen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentliste fra Acquire::gpgv::Options for lang. Avbryter." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Intern feil: God signatur, men kunne bestemme nkkelfingeravtrykk?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Minst en ugyldig signatur ble funnet." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Klarte ikke kjre %s for verifisere signaturen (er gpgv installert?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Ukjent feil ved kjring av gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "De flgende signaturene var ugyldige:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2068,47 +2073,47 @@ msgstr "Denne HTTP-tjeneren har delagt sttte for omrde" msgid "Unknown date format" msgstr "Ukjent datoformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Utvalget mislykkes" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Tidsavbrudd p forbindelsen" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fra tjeneren. Forbindelsen ble lukket i andre enden" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Feil ved lesing fra tjeneren" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Klarte ikke forkorte fila %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "delagte hodedata" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Forbindelsen mislykkes" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Intern feil" @@ -2116,12 +2121,12 @@ msgstr "Intern feil" msgid "Can't mmap an empty file" msgstr "Kan ikke utfre mmap p 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 lage mmap av %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. " @@ -2130,6 +2135,13 @@ msgstr "" "Dynamisk MMap gikk tom for minne. k strrelsen p APT::Cache-Limit. " "Nvrende verdi: %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 @@ -2159,52 +2171,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Fant ikke utvalget %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjent typeforkortelse: %c" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "pner oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka starter uten navn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Feil p taggen" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser etter verdien" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktivene kan bare ligge i det verste nivet" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nstede inkluderte filer" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herfra" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikke stttet" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ugyldige angivelser p slutten av fila" @@ -2280,75 +2292,75 @@ msgstr "Klarer ikke endre %s" msgid "Failed to stat the cdrom" msgstr "Klarer ikke f statusen p CD-spilleren" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Bruker ikke lsing for den skrivebeskyttede lsefila %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kunne ikke pne lsefila %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Bruker ikke lsing p den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Fr ikke lst %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ventet p %s, men den ble ikke funnet" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok et minnefeilsignal." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s ga en feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avsluttet uventet" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kunne ikke pne fila %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har fremdeles %lu igjen lese, men ingen igjen" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har fremdeles %lu igjen skrive, men klarte ikke " -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenke til fila" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem ved oppdatering av fila" @@ -2465,52 +2477,52 @@ msgstr "Klarer ikke fortolke pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarer ikke fortolke pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Feil p linje %lu i kildelista %s (nettadresse)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Feil p linje %lu i kildelista %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Feil p %lu i kildelista %s (fortolkning av nettadressen)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Feil p %lu i kildelista %s (Absolutt dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Feil p %lu i kildelista %s (dist fortolking)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "pner %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linje %u i kildelista %s er for lang" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Feil p %u i kildelista %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjent i linje %u i kildelista %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Feil p %u i kildelista %s (selgers id)" @@ -2637,17 +2649,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Det kan hende du vil kjre apt-get update for rette p disse problemene" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig oppslag i foretrekksfila, manglende pakkehode" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Forsto ikke spikring av typen %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) spesifisert for pin" @@ -2731,16 +2743,16 @@ msgstr "Feil oppsto under behandling av %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Fant ikke pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunne ikke finne informasjon om %s - lista over kildekodepakker" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samler inn filtilbud" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO-feil ved lagring av kildekode-lager" @@ -2749,20 +2761,20 @@ msgstr "IO-feil ved lagring av kildekode-lager" msgid "rename failed, %s (%s -> %s)." msgstr "klarte ikke endre navnet, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Feil MD5sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hashsummen stemmer ikke" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Det er ingen offentlig nkkel tilgjengelig for de flgende nkkel-ID-ene:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2771,7 +2783,7 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne pakken " "selv (fordi arkitekturen mangler)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2780,13 +2792,13 @@ msgstr "" "Klarte ikke finne en fil for pakken %s. Det kan bety at du m ordne denne " "pakken selv." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Oversiktsfilene er delagte. Feltet Filename: mangler for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Feil strrelse" @@ -2921,7 +2933,6 @@ msgstr "Skrev %i poster med %i manglende filer og %i feile filer.\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "pner oppsettsfila %s" @@ -2932,7 +2943,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hashsummen stemmer ikke" @@ -2953,7 +2963,6 @@ msgstr "Fjerner %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Fjernet %s fullstendig" @@ -3037,14 +3046,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunne ikke pne fila %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 "Forbindelsen ble uventet stengt" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Klarte ikke sl opp i nkkelring; %s" + +#~ msgid "Could not patch file" +#~ msgstr "Kunne ikke pne fila %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_po\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-06-12 14:35+0545\n" "Last-Translator: Shiva Pokharel <pokharelshiva@hotmail.com>\n" "Language-Team: Nepali <info@mpp.org.np>\n" @@ -149,7 +149,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -304,7 +304,7 @@ msgstr "" " -c=? यो कनफिगरेसन फाइल पढ्नुहोस्\n" " -o=? एउटा स्वेच्छाचारी कनफिगरेसन विकल्प सेट गर्नुहोस्, जस्तै -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr " %s मा लेख्न असक्षम" @@ -441,7 +441,7 @@ msgstr "DB पुरानो छ, %s स्तरवृद्धि गर् #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -456,11 +456,11 @@ msgstr "DB फाइल %s असक्षम भयो: %s" msgid "Failed to stat %s" msgstr " %s स्थिर गर्न असफल" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "संग्रह संग नियन्त्रण रेकर्ड छैन" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "कर्सर प्राप्त गर्न असक्षम भयो" @@ -525,26 +525,26 @@ msgstr "*** %s मा %s लिङ्क असफल भयो" msgid " DeLink limit of %sB hit.\n" msgstr "यस %sB हिटको डि लिङ्क सिमा।\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "संग्रह संग कुनै प्याकेज फाँट छैन" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s संभारकर्ता %s हो %s होइन\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s संग कुनै अधिलेखन प्रविष्टि छैन\n" @@ -648,7 +648,7 @@ msgstr " %s मा %s पुन:नामकरण असफल भयो" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "संकलन त्रुटि रिजेक्स गर्नुहोस् - %s" @@ -809,11 +809,11 @@ msgstr "प्याकेजहरू हट्न चाहदैछन् त msgid "Internal error, Ordering didn't finish" msgstr "आन्तरिक त्रुटि, आदेश समाप्त भएको छैन" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "डाउनलोड डाइरेक्ट्री ताल्चा मार्न असक्षम" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "स्रोतहरुको सूचि पढ्न सकिएन ।" @@ -842,8 +842,8 @@ msgstr "अनप्याक गरिसके पछि थप डिस् msgid "After this operation, %sB disk space will be freed.\n" msgstr "%sB अनप्याक गरिसके पछि डिस्क खाली ठाउँ खाली हुनेछ ।\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr " %s मा खाली ठाऊँ निर्धारण गर्न सकिएन" @@ -880,7 +880,7 @@ msgstr "परित्याग गर्नुहोस् ।" msgid "Do you want to continue [Y/n]? " msgstr "के तपाईँ निरन्तरता दिन चाहनुहुन्छ [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "%s %s तान्न असफल भयो\n" @@ -889,7 +889,7 @@ msgstr "%s %s तान्न असफल भयो\n" msgid "Some files failed to download" msgstr "केही फाइलहरू डाउनलोड गर्न असफल भयो" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "डाउनलोड समाप्त भयो र डाउनलोडमा मोड मात्रै छ" @@ -986,51 +986,51 @@ msgstr " '%s' को लागि '%s' संस्करण फेला पा msgid "Selected version %s (%s) for %s\n" msgstr "%s को लागि चयन भएको संस्करण %s (%s)\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "अद्यावधिक आदेशले कुनै तर्कहरू लिदैन" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "सूचि डाइरेक्ट्री ताल्चा मार्न असफल" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "निम्न नयाँ प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1046,44 +1046,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "निम्न सूचनाले अवस्थालाई हल गर्न मद्दत गर्नेछ: " -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "आन्तरिक त्रुटि,सबै स्तरवृद्धिले उत्तम गुण नष्ट गर्दछ" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "प्याकेज फेला पार्न सकिएन %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "द्रष्टब्य, रिजेक्स '%s' को लागि %s चयन गरिदैछ\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "तर %s स्थापना हुनुपर्यो" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "तपाईँ यसलाई सुधार गर्न `apt-get -f install' चलाउन चाहनुहुन्छ:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1091,7 +1091,7 @@ msgstr "" "नभेटिएका निर्भरताहरू । प्याकेजहरू बिना 'apt-get -f install' प्रयास गर्नुहोस् ( वा " "समाधान निर्दिष्ट गर्नुहोस्) ।" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,122 +1104,122 @@ msgstr "" " वितरण अहिले सम्म सिर्जना\n" " भएको छैन वा आवगमन विनानै सर्यो ।" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "भाँचिएका प्याकेजहरू" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "निम्न अतिरिक्त प्याकेजहरू स्थापना हुनेछन्:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "सुझाव दिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "सिफारिस गरिएका प्याकेजहरू:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "स्तर वृद्धि गणना गरिदैछ..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "असफल भयो" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "काम भयो" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "आन्तरिक त्रुटि,समस्या हलकर्ताले उत्तम गुण भाँच्यो " -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "को लागि स्रोत तान्न कम्तिमा एउटा प्याकेज निर्दिष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "%s को लागि स्रोत प्याकेज फेला पार्न असफल भयो" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "पहिल्यै डाउनलोड भएका फाइलहरु फड्काइदैछ '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "तपाईँ संग %s मा पर्याप्त खाली ठाऊँ छैन" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB/%sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "स्रोत संग्रहहरुको %sB प्राप्त गर्न आवश्यक छ ।\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "स्रोत फड्काउनुहोस् %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "केही संग्रह फड्काउन असफल भयो ।" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr " %s मा पहिल्यै अनप्याक गरिएका स्रोतको अनप्याक फड्काइदैछ\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "अनप्याक आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "जाँच्नुहोस् यदि 'dpkg-dev' प्याकेज स्थापना भयो ।\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "निर्माण आदेश '%s' असफल भयो ।\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "शाखा प्रक्रिया असफल भयो" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "को लागि builddeps जाँच्न कम्तिमा एउटा प्याकेज निर्दष्ट गर्नुपर्छ" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "%s को लागि निर्माण-निर्भरता सूचना प्राप्त गर्न असक्षम भयो" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s कुनै निर्माणमा आधारित हुदैन ।\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, 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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,30 +1228,30 @@ msgstr "" "%sको लागि %s निर्भरता सन्तुष्ट हुन सकेन किन भने प्याकेज %s को कुनै उपलब्ध संस्करणले संस्करण " "आवश्यकताहरुलाई सन्तुष्ट पार्न सकेन " -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "%s को लागि %s निर्भरता सन्तुष्ट पार्न असफल भयो: स्थापित प्याकेज %s अति नयाँ छ" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "%s को लागि %s निर्भरता सन्तुष्ट गर्न असफल: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "%s को लागि निर्माण निर्भरताहरू सन्तुष्ट गर्न सकिएन । " -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "निर्माण निर्भरताहरू प्रक्रिया गर्न असफल" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "समर्थित मोड्युलहरू:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1334,7 +1334,7 @@ msgstr "" "pages हेर्नुहोस् ।\n" " APT संग सुपर काउ शक्तिहरू छ ।\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1581,11 +1581,10 @@ msgstr "फाइल %s/%s ले प्याकेज %s मा एउटा #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "%s पढ्न असफल भयो" @@ -1615,9 +1614,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "सूचना र टेम्प डाइरेक्ट्रीहरू एउटै फाइल प्रणालीमा हुनपर्छ" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "प्याकेज सूचिहरू पढिदैछ" @@ -1750,11 +1749,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 "परिमार्जन समय सेट असफल भयो" @@ -1816,7 +1815,7 @@ msgstr "जडान समय सकियो" msgid "Server closed the connection" msgstr "सर्भरले जडान बन्द गर्यो" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "त्रुटि पढ्नुहोस्" @@ -1828,7 +1827,7 @@ msgstr "एउटा प्रतिक्रियाले बफर अधि msgid "Protocol corruption" msgstr "प्रोटोकल दूषित" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "त्रुटि लेख्नुहोस्" @@ -1882,7 +1881,7 @@ msgstr "डेटा सकेटको जडान समय सकियो" msgid "Unable to accept connection" msgstr "जडान स्वीकार गर्न असक्षम भयो" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "समस्या द्रुतान्वेषण फाइल" @@ -1946,58 +1945,63 @@ msgstr " %s:%s (%s) मा जडान गर्न सकिएन ।" msgid "Connecting to %s" msgstr "%s मा जडान गरिदैछ" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "'%s' हल गर्न सकिएन" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "'%s' हल गर्दा अस्थायी असफल" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr " '%s:%s' (%i) हल गर्दा केही दुष्ट घट्यो" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "%s %s मा जडान गर्न असफल भयो:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "स्थापना परित्याग गरिदैछ ।" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: प्राप्त गर्नेबाट तर्क सूचि::gpgv::अति लामो विकल्पहरू अवस्थित छ ।" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "आन्तरिक त्रुटि: असल हस्ताक्षर, तर कुञ्जी औठाछाप निर्धारण गर्न सकिएन?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "कम्तिमा एउटा अवैध हस्ताक्षर विरोध भयो ।" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "हस्ताक्षर रूजू गर्न '%s' कार्यन्वयन गर्न सकिएन (के gpgv स्थापना भयो?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "gpgv कार्यन्वयन गर्दा अज्ञात त्रुटि" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "निम्न हस्ताक्षरहरू अवैध छन्:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2046,48 +2050,48 @@ msgstr "HTTP सर्भर संग भाँचिएको दायरा msgid "Unknown date format" msgstr "अज्ञात मिति ढाँचा" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "असफल चयन गर्नुहोस्" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "जडान समय सकियो" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "निर्गात फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "फाइलमा त्रुटि लेखिदैछ" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "सर्भरबाट त्रुटि पढिदैछ । दूर गन्तब्य बन्द जडान" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "सर्भरबाट त्रुटि पढिदैछ" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "फाइल %s लेख्न असफल भयो" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "खराब हेडर डेटा" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "जडान असफल भयो" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "आन्तरिक त्रुटि" @@ -2095,18 +2099,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 @@ -2136,52 +2147,52 @@ msgstr "" msgid "Selection %s not found" msgstr "चयन %s फेला पार्न सकिएन" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "नचिनिएको टाइप संक्षिप्त रुप: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "कनफिगरेसन फाइल खोलिदैछ %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "वाक्य संरचना त्रुटि %s:%u: बन्द कुनै नाम बिना सुरू हुन्छ ।" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "वाक्य संरचना त्रुटि %s:%u: वैरुप गरिएको ट्याग" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "वाक्य संरचना त्रुटि %s:%u: मान पछाडि अतिरिक्त जंक" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "वाक्य संरचना त्रुटि %s:%u: निर्देशनहरू माथिल्लो तहबाट मात्र हुन्छ" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "वाक्य संरचना त्रुटि %s:%u: अति धेरै नेस्टेड समावेश गर्दछ" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "वाक्य संरचना त्रुटि %s:%u: यहाँ बाट समावेश गरेको" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "वाक्य संरचना त्रुटि %s:%u: समर्थन नभएको डाइरेक्टिभ '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "वाक्य संरचना त्रुटि %s:%u:फाइलको अन्त्यमा अतिरिक्त जंक" @@ -2257,75 +2268,75 @@ msgstr "%s मा परिवर्तन गर्न असक्षम" msgid "Failed to stat the cdrom" msgstr "सिडी रोम स्थिर गर्न असफल भयो" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "ताल्चा मारिएको फाइल मात्र पढ्नको लागि ताल्चा मार्न प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ताल्चा मारिएको फाइल खोल्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "nfs माउन्ट गरिएको लक फाइलको लागि लक प्रयोग गरिएको छैन %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "ताल्चा प्राप्त गर्न सकिएन %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr " %s को लागि पर्खिरहेको तर यो त्यहाँ छैन" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "सहायक प्रक्रिया %s ले खण्डिकरण गल्ति प्राप्त भयो ।" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "सहायक प्रक्रिया %s ले एउटा त्रुटि कोड फर्कायो (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "सहायक प्रक्रिया %s अनपेक्षित बन्द भयो" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "फाइल %s खोल्न सकिएन" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "पड्नुहोस्, अहिले सम्म %lu पढ्न छ तर कुनै बाँकी छैन" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "लेख्नुहोस्, अहिले सम्म %lu लेख्न छ तर सकिदैन " -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "फाइल बन्द गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "फाइल अनलिङ्क गर्दा समस्या" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "फाइल गुप्तिकरण गर्दा समस्या" @@ -2443,52 +2454,52 @@ msgstr "प्याकेज फाइल पद वर्णन गर्न msgid "Unable to parse package file %s (2)" msgstr "प्याकेज फाइल पद वर्णन गर्न असक्षम %s (२)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (URI पद वर्णन)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (पूर्ण dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "वैरुप्य लाइन %lu स्रोत सूचिमा %s (dist पद वर्णन )" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s खोलिदैछ" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "लाइन %u स्रोत सूचि %s मा अति लामो छ ।" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (प्रकार)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "स्रोत सूची %s भित्र %u लाइनमा टाइप '%s' ज्ञात छैन" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "वैरुप्य लाइन %u स्रोत सूचिमा %s (बिक्रता आइडी)" @@ -2612,17 +2623,17 @@ msgstr "प्याकेज सूचीहरू वा वस्तुस् msgid "You may want to run apt-get update to correct these problems" msgstr "यो समस्याहरू सुधार्न तपाईँ apt-get अद्यावधिक चलाउन चाहनुहुन्छ" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "प्राथमिकता फाइलमा अवैध रेकर्ड, कुनै प्याकेज हेडर छैन" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "पिन टाइप %s बुझ्न सकिएन " -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "पिनको लागि कुनै प्राथमिकता (वा शून्य) निर्दिष्ट छैन" @@ -2707,16 +2718,16 @@ msgstr " %s प्रक्रिया गर्दा त्रुटि द msgid "Package %s %s was not found while processing file dependencies" msgstr "फाइल निर्भरताहरू प्रक्रिया गर्दा प्याकेज %s %s फेला परेन" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "स्रोत प्याकेज सूची %s स्थिर गर्न सकिएन " -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "फाइल उपलब्धताहरू संकलन गरिदैछ" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "स्रोत क्यास बचत गर्दा IO त्रुटि" @@ -2725,20 +2736,20 @@ msgstr "स्रोत क्यास बचत गर्दा IO त्र msgid "rename failed, %s (%s -> %s)." msgstr "पुन:नामकरण असफल गरियो, %s (%s -> %s) ।" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "MD5Sum मेल भएन" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2747,7 +2758,7 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् । (arch हराएरहेको कारणले) " -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2756,13 +2767,13 @@ msgstr "" "%s प्याकेजको लागि मैले फाइल स्थित गर्न सकिन । यसको मतलब तपाईँले म्यानुल्ली यो प्याकेज " "निश्चित गर्नुहोस् ।" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "साइज मेल खाएन" @@ -2896,7 +2907,6 @@ msgstr "हराइरहेको फाइल %i हरू र मेल न #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "कनफिगरेसन फाइल खोलिदैछ %s" @@ -2927,7 +2937,6 @@ msgstr " %s हटाइदैछ" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr " %s पूर्ण रुपले हट्यो" @@ -3011,15 +3020,31 @@ 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 "जडान असमायिक बन्द भयो" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "कुञ्जी घण्टी पहुँच गर्न सकिएन: '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "फाइल %s खोल्न सकिएन" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-05-05 18:39+0200\n" "Last-Translator: Bart Cornelis <cobaco@skolelinux.no>\n" "Language-Team: debian-l10n-dutch <debian-l10n-dutch@lists.debian.org>\n" @@ -147,7 +147,7 @@ msgstr " Versietabel:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s voor %s gecompileerd op %s %s\n" @@ -305,7 +305,7 @@ msgstr "" " -c=? Lees dit configuratiebestand.\n" " -o=? Stel een willekeurige optie in, b.v. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kan niet naar %s schrijven" @@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB is verouderd, opwaardering van %s wordt geprobeerd" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB-formaat is ongeldig. Als u opgewaardeerd heeft van een oudere versie, van " @@ -461,11 +462,11 @@ msgstr "Kan het DB-bestand %s niet openen: %s" msgid "Failed to stat %s" msgstr "Status opvragen van %s is mislukt" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archief heeft geen 'control'-record" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kan geen cursor verkrijgen" @@ -530,26 +531,26 @@ msgstr "*** Linken van %s aan %s is mislukt" msgid " DeLink limit of %sB hit.\n" msgstr " Ontlinklimiet van %sB is bereikt.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archief heeft geen 'package'-veld" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s heeft geen voorrangsingang\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s beheerder is %s, niet %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s heeft geen voorrangsingang voor bronpakketten\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s heeft ook geen voorrangsingang voor binaire pakketten\n" @@ -653,7 +654,7 @@ msgstr "Hernoemen van %s naar %s is mislukt" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-compilatiefout - %s" @@ -815,11 +816,11 @@ msgstr "Pakketten moeten verwijderd worden maar verwijderen is uitgeschakeld." msgid "Internal error, Ordering didn't finish" msgstr "Interne fout, rangschikken is niet voltooid" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Kon de ophaalmap niet vergrendelen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "De lijst van bronnen kon niet gelezen worden." @@ -850,8 +851,8 @@ msgstr "Door deze operatie zal er %sB extra schijfruimte gebruikt worden.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Door deze operatie zal er %sB schijfruimte vrijkomen.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kon de hoeveelheid vrije schijfruimte op %s niet bepalen" @@ -888,7 +889,7 @@ msgstr "Afbreken." msgid "Do you want to continue [Y/n]? " msgstr "Wilt u doorgaan [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ophalen van %s %s is mislukt\n" @@ -897,7 +898,7 @@ msgstr "Ophalen van %s %s is mislukt\n" msgid "Some files failed to download" msgstr "Ophalen van sommige bestanden is mislukt" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Ophalen klaar en alleen-ophalen-modus staat aan" @@ -997,35 +998,35 @@ msgstr "Versie '%s' voor '%s' is niet gevonden" msgid "Selected version %s (%s) for %s\n" msgstr "Versie %s (%s) geselecteerd voor %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "De 'update'-opdracht aanvaard geen argumenten" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kon de lijst-map niet vergrendelen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "We mogen geen dingen verwijderen, kan AutoRemover niet starten" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1033,18 +1034,18 @@ msgstr "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "De volgende pakketten zijn automatisch geïnstalleerd en zijn niet langer " "nodig:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "U kunt deze verwijderen via 'apt-get autoremove'." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1062,45 +1063,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "De volgende informatie helpt u mogelijk verder:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Interne fout, AutoRemover heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Interne fout, AllUpgrade heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Kon taak %s niet vinden" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Kon pakket %s niet vinden" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Let op, %s wordt geselecteerd omwille van de regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s is ingesteld voor handmatige installatie.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "U wilt waarschijnlijk 'apt-get -f install' uitvoeren om volgende op te " "lossen:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1108,7 +1109,7 @@ msgstr "" "Er zijn niet-voldane vereisten. U kunt best 'apt-get -f install' uitvoeren " "zonder pakketten op te geven, (of u kunt zelf een oplossing specificeren)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1119,119 +1120,119 @@ msgstr "" "een onmogelijke situatie gevraagd hebt of dat u de 'unstable'-distributie \n" "gebruikt en sommige benodigde pakketten nog vastzitten in 'incoming'." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Niet-werkende pakketten:" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "De volgende extra pakketten zullen geïnstalleerd worden:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Voorgestelde pakketten:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Aanbevolen pakketten:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Opwaardering wordt doorgerekend... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislukt" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Klaar" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Interne fout, probleemoplosser heeft dingen stukgemaakt" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "U dient minstens 1 pakket op te geven waarvan de broncode opgehaald moet " "worden" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Kan geen bronpakket vinden voor %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Reeds opgehaald bestand '%s' wordt overgeslagen\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "U heeft niet voldoende vrije schijfruimte op %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Moet %sB/%sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Moet %sB aan bronarchieven ophalen.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Ophalen bron %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Ophalen van sommige archieven is mislukt." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Het uitpakken van de reeds uitgepakte bron in %s wordt overgeslagen\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uitpakopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Gelieve na te gaan of het 'dpkg-dev'-pakket geïnstalleerd is.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Bouwopdracht '%s' is mislukt.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Dochterproces is mislukt" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "U dient tenminste één pakket op te geven om de bouwvereisten van te " "controleren" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kan de informatie over de bouwvereisten voor %s niet ophalen" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s heeft geen bouwvereisten.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1240,7 +1241,7 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat pakket %s " "onvindbaar is" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1249,32 +1250,32 @@ msgstr "" "De vereiste %s van pakket %s kan niet voldaan worden omdat er geen " "beschikbare versies zijn van pakket %s die aan de versievereisten voldoen" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Voldoen van Vereiste %s van pakket %s is mislukt: geïnstalleerde versie %s " "is te nieuw" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Voldoen van de vereiste %s van pakket %s is mislukt: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Bouwvereisten voor %s konden niet voldaan worden." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Verwerken van de bouwvereisten is mislukt" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Ondersteunde modules:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1363,7 +1364,7 @@ msgstr "" "voor meer informatie en opties.\n" " Deze APT heeft Super Koekrachten.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1616,11 +1617,10 @@ msgstr "Het bestand %s/%s overschrijft het bestand van pakket %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Kan %s niet lezen" @@ -1651,9 +1651,9 @@ msgstr "" "De 'info'- en de 'temp'-mappen dienen op hetzelfde bestandsysteem te staan" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Pakketlijsten worden ingelezen" @@ -1789,11 +1789,11 @@ msgid "File not found" msgstr "Bestand niet gevonden" #: 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 "Status opvragen is mislukt" -#: 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 "Instellen van de aanpassingstijd is mislukt" @@ -1855,7 +1855,7 @@ msgstr "Verbinding is verlopen" msgid "Server closed the connection" msgstr "Verbinding is verbroken door de server" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Leesfout" @@ -1867,7 +1867,7 @@ msgstr "Een reactie deed de buffer overlopen" msgid "Protocol corruption" msgstr "Protocolcorruptie" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Schrijffout" @@ -1921,7 +1921,7 @@ msgstr "Datasocket verbinding is verlopen" msgid "Unable to accept connection" msgstr "Kan de verbinding niet aanvaarden" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Probleem bij het hashen van het bestand" @@ -1985,64 +1985,69 @@ msgstr "Kon niet verbinden met %s:%s (%s)." msgid "Connecting to %s" msgstr "Er wordt verbinding gemaakt met %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Kon '%s' niet vinden" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tijdelijke fout bij het opzoeken van '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Er gebeurde iets raars bij het zoeken naar '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Kan niet verbinden met %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Kon de sleutelring niet benaderen: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Installatie wordt afgebroken." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "F: argumentenlijst van Acquire::gpv::Options was te lang. Er wordt " "afgesloten." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Interne fout: ondertekening is goed maar kon de vingerafdruk van de sleutel\n" "niet bepalen?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Er is tenminste één ongeldige ondertekening gevonden." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Kon '%s' niet uitvoeren om ondertekening te verifiëren (is gpgv " "geïnstalleerd?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Onbekende fout bij het uitvoeren van gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "De volgende ondertekeningen waren ongeldig:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2095,49 +2100,49 @@ msgstr "De bereik-ondersteuning van deze HTTP-server werkt niet" msgid "Unknown date format" msgstr "Onbekend datumformaat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Selectie is mislukt" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Verbinding verliep" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fout bij het schrijven naar het uitvoerbestand" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fout bij het schrijven naar bestand" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fout bij het schrijven naar het bestand" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "Fout bij het lezen van de server, andere kant heeft de verbinding gesloten" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fout bij het lezen van de server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Wegschrijven van bestand %s is mislukt" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Foute koptekstdata" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Verbinding mislukt" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Interne fout" @@ -2145,18 +2150,25 @@ msgstr "Interne fout" msgid "Can't mmap an empty file" msgstr "Kan een leeg bestand niet mmappen" -#: 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 "Kon van %lu bytes geen mmap maken" -#: 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 @@ -2186,54 +2198,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Selectie %s niet gevonden" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Onbekende type-afkorting '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Configuratiebestand %s wordt geopend" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfout %s:%u: Blok start zonder naam." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfout %s:%u: Verkeerd gevormde markering" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfout %s:%u: Extra rommel na waarde" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntaxfout %s:%u: Richtlijnen kunnen enkel op het hoogste niveau gegeven " "worden" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfout %s:%u: Teveel geneste invoegingen" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfout %s:%u: Vanaf hier ingevoegd" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfout %s:%u: Niet-ondersteunde richtlijn '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfout %s:%u: Extra rommel aan het einde van het bestand" @@ -2311,78 +2323,78 @@ msgstr "Kan %s niet veranderen" msgid "Failed to stat the cdrom" msgstr "Het opvragen van de CD-status is mislukt" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Er wordt geen vergrendeling gebruikt voor het alleen-lezen-" "vergrendelingsbestand %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kon het vergrendelingsbestand '%s' niet openen" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Het via nfs aangekoppelde vergrendelingsbestand %s wordt niet vergrendeld" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Kon vergrendeling %s niet verkrijgen" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Er is gewacht op %s, maar die kwam niet" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subproces %s ontving een segmentatiefout." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subproces %s gaf de foutcode %u terug" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subproces %s sloot onverwacht af" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kon het bestand %s niet openen" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lees, de laatste te lezen %lu zijn niet beschikbaar" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "schrijf, de laatste %lu konden niet weggeschreven worden" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Probleem bij het afsluiten van het bestand" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Probleem bij het ontlinken van het bestand" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Probleem bij het synchroniseren van het bestand" @@ -2499,52 +2511,52 @@ msgstr "Kon pakketbestand %s niet ontleden (1)" msgid "Unable to parse package file %s (2)" msgstr "Kon pakketbestand %s niet ontleden (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misvormde regel %lu in bronlijst %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misvormde regel %lu in bronlijst %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misvormde regel %lu in bronlijst %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misvormde regel %lu in bronlijst %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misvormde regel %lu in bronlijst %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "%s wordt geopend" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Regel %u van de bronlijst %s is te lang." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misvormde regel %u in bronlijst %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Type '%s' op regel %u in bronlijst %s is onbekend" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misvormde regel %u in bronlijst %s (verkopers-ID)" @@ -2677,17 +2689,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "U kunt misschien 'apt-get update' uitvoeren om deze problemen te verhelpen" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ongeldige record in het voorkeurenbestand, geen 'Package'-koptekst" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Pintype %s wordt niet begrepen" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Er is geen prioriteit (of nul) opgegeven voor deze pin" @@ -2775,16 +2787,16 @@ msgstr "" "Pakket %s %s werd niet gevonden bij het verwerken van de " "bestandsafhankelijkheden" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kon de status van de bronpakketlijst %s niet opvragen" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Voorziene bestanden worden verzameld" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" @@ -2793,20 +2805,20 @@ msgstr "Invoer/Uitvoer-fout tijdens wegschrijven bronpakket-cache" msgid "rename failed, %s (%s -> %s)." msgstr "herbenoeming is mislukt, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5-som komt niet overeen" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash-som komt niet overeen" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Er zijn geen publieke sleutels beschikbaar voor de volgende sleutel-IDs:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2815,7 +2827,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren (wegens missende architectuur)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2824,7 +2836,7 @@ msgstr "" "Er kon geen bestand gevonden worden voor pakket %s. Dit kan betekenen dat u " "dit pakket handmatig moet repareren." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2832,7 +2844,7 @@ msgstr "" "De pakketindex-bestanden zijn beschadigd. Er is geen 'Filename:'-veld voor " "pakket %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Grootte komt niet overeen" @@ -2969,7 +2981,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Configuratiebestand %s wordt geopend" @@ -2980,7 +2991,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash-som komt niet overeen" @@ -3001,7 +3011,6 @@ msgstr "%s wordt verwijderd" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s is volledig verwijderd" @@ -3087,14 +3096,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kon bestand niet patchen" +#: 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 "Verbinding werd voortijdig afgebroken" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Kon de sleutelring niet benaderen: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Kon bestand niet patchen" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt_nn\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2005-02-14 23:30+0100\n" "Last-Translator: Havard Korsvoll <korsvoll@skulelinux.no>\n" "Language-Team: Norwegian nynorsk <i18n-nn@lister.ping.uio.no>\n" @@ -151,7 +151,7 @@ msgstr " Versjonstabell:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s for %s %s kompilert p %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -c=? Les denne innstillingsfila.\n" " -o=? Set ei vilkrleg innstilling, t.d. -o dir::cache=/tmp.\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Klarte ikkje skriva til %s" @@ -442,7 +442,7 @@ msgstr "DB er for gammal, forskjer oppgradere %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -457,11 +457,11 @@ msgstr "Klarte ikkje opna DB-fila %s: %s" msgid "Failed to stat %s" msgstr "Klarte ikkje f status til %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen kontrollpost" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Klarte ikkje f peikar" @@ -526,26 +526,26 @@ msgstr "*** Klarte ikkje lenkja %s til %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink-grensa p %sB er ndd.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet har ikkje noko pakkefelt" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s-vedlikehaldaren er %s, ikkje %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s har inga overstyringsoppfring\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s har inga overstyringsoppfring\n" @@ -649,7 +649,7 @@ msgstr "Klarte ikkje endra namnet p %s til %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Regex-kompileringsfeil - %s" @@ -812,11 +812,11 @@ msgstr "Nokre pakkar m fjernast, men fjerning er sltt av." msgid "Internal error, Ordering didn't finish" msgstr "Intern feil ved tilleggjing av avleiing" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Klarte ikkje lsa nedlastingskatalogen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Kjeldelista kan ikkje lesast." @@ -845,8 +845,8 @@ msgstr "Etter utpakking vil %sB meir diskplass verta brukt.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Etter utpakking vil %sB meir diskplass verta frigjort.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Du har ikkje nok ledig plass i %s" @@ -884,7 +884,7 @@ msgstr "Avbryt." msgid "Do you want to continue [Y/n]? " msgstr "Vil du halda fram [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Klarte ikkje henta %s %s\n" @@ -893,7 +893,7 @@ msgstr "Klarte ikkje henta %s %s\n" msgid "Some files failed to download" msgstr "Klarte ikkje henta nokre av filene" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Nedlastinga er ferdig i nedlastingsmodus" @@ -992,51 +992,51 @@ msgstr "Fann ikkje versjonen %s av %s" msgid "Selected version %s (%s) for %s\n" msgstr "Vald versjon %s (%s) for %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Oppdateringskommandoen tek ingen argument" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Klarte ikkje lsa listekatalogen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Dei flgjande NYE pakkane vil verta installerte:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1052,44 +1052,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Flgjande informasjon kan hjelpa med lysa situasjonen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Fann ikkje pakken %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Merk, vel %s i staden for regex %s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "men %s skal installerast" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Du vil kanskje prva retta p desse ved kyra apt-get -f install." -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1097,7 +1097,7 @@ msgstr "" "Nokre krav er ikkje oppfylte. Du kan prva apt-get -f install (eller velja " "ei lysing)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1109,123 +1109,123 @@ msgstr "" "distribusjonen, kan det g henda at nokre av pakkane som trengst ikkje\n" "er laga enno eller at dei framleis ligg i Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "ydelagde pakkar" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Fresltte pakkar:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Tilrdde pakkar" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Reknar ut oppgradering ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Mislukkast" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Ferdig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Intern feil. AllUpgrade ydelagde noko" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du m velja minst in pakke som kjeldekoden skal hentast for" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Finn ingen kjeldepakke for %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har ikkje nok ledig plass i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "M henta %sB/%sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "M henta %sB med kjeldekodearkiv.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Hent kjeldekode %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Klarte ikkje henta nokre av arkiva." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Hoppar over utpakking av kjeldekode som er utpakka fr fr i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Utpakkingskommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggjekommandoen %s mislukkast.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barneprosessen mislukkast" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Du m velja minst ein pakke som byggjekrava skal sjekkast for" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Klarte ikkje henta byggjekrav for %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har ingen byggjekrav.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "Kravet %s for %s kan ikkje oppfyllast fordi pakken %s ikkje finst" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1234,31 +1234,31 @@ msgstr "" "Kravet %s for %s kan ikkje oppfyllast fordi det ikkje finst nokon " "tilgjengelege versjonar av pakken %s som oppfyller versjonskrava" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Klarte ikkje oppfylla kravet %s for %s: Den installerte pakken %s er for ny" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Klarte ikkje oppfylla kravet %s for %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggjekrav for %s kunne ikkje tilfredstillast." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Klarte ikkje behandla byggjekrava" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Sttta modular:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1342,7 +1342,7 @@ msgstr "" "til apt-get(8), sources.list(5) og apt.conf(5).\n" " APT har superku-krefter.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1587,11 +1587,10 @@ msgstr "Fila %s/%s skriv over den tilsvarande fila i pakken %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Klarte ikkje lesa %s" @@ -1622,9 +1621,9 @@ msgstr "" "Infokatalogen og den mellombelse katalogen m vera p det same filsystemet" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Les pakkelister" @@ -1761,11 +1760,11 @@ msgid "File not found" msgstr "Fann ikkje fila" #: 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 "Klarte ikkje f status" -#: 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 "Klarte ikkje setja endringstidspunkt" @@ -1827,7 +1826,7 @@ msgstr "Tidsavbrot p samband" msgid "Server closed the connection" msgstr "Tenaren lukka sambandet" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lesefeil" @@ -1839,7 +1838,7 @@ msgstr "Eit svar flaumde over bufferen." msgid "Protocol corruption" msgstr "Protokollydeleggjing" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivefeil" @@ -1893,7 +1892,7 @@ msgstr "Tidsavbrot p tilkopling til datasokkel" msgid "Unable to accept connection" msgstr "Klarte ikkje godta tilkoplinga" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem ved oppretting av nkkel for fil" @@ -1957,59 +1956,64 @@ msgstr "Klarte ikkje kopla til %s:%s (%s)." msgid "Connecting to %s" msgstr "Koplar til %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Klarte ikkje sl opp %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Mellombels feil ved oppslag av %s" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Det hende noko dumt ved oppslag av %s:%s (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Klarte ikkje kopla til %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Klarte ikkje sl opp %s" +msgid "No keyring installed in %s." +msgstr "Avbryt installasjon." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Dei flgjande tilleggspakkane vil verta installerte:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2058,48 +2062,48 @@ msgstr "Denne HTTP-tenaren har ydelagd sttte for omrde" msgid "Unknown date format" msgstr "Ukjend datoformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Utvalet mislukkast" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Tidsavbrot p sambandet" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Feil ved skriving til utfil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Feil ved skriving til fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Feil ved skriving til fila" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Feil ved lesing fr tenaren. Sambandet vart lukka i andre enden" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Feil ved lesing fr tenaren" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Klarte ikkje skriva fila %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "ydelagde hovuddata" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Sambandet mislukkast" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Intern feil" @@ -2107,18 +2111,25 @@ msgstr "Intern feil" msgid "Can't mmap an empty file" msgstr "Kan ikkje utfra mmap p ei 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 "Klarte ikkje laga mmap av %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 @@ -2148,52 +2159,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Fann ikkje utvalet %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ukjend typeforkorting: %c" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Opnar oppsettsfila %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaksfeil %s:%u: Blokka startar utan namn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaksfeil %s:%u: Misforma tagg" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaksfeil %s:%u: Ekstra rot etter verdien" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaksfeil %s:%u: Direktiva kan berre liggja i det vste nivet" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaksfeil %s:%u: For mange nsta inkluderte filer" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaksfeil %s:%u: Inkludert herifr" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaksfeil %s:%u: Direktivet %s er ikkje sttta" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaksfeil %s:%u: Ekstra rot til slutt i fila" @@ -2269,75 +2280,75 @@ msgstr "Klarte ikkje byta til %s" msgid "Failed to stat the cdrom" msgstr "Klarte ikkje f status til CD-ROM" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brukar ikkje lsing for den skrivebeskytta lsefila %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Klarte ikkje opna lsefila %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brukar ikkje lsing for den nfs-monterte lsefila %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Klarte ikkje lsa %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Venta p %s, men den fanst ikkje" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprosessen %s mottok ein segmenteringsfeil." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprosessen %s returnerte ein feilkode (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprosessen %s avslutta uventa" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Klarte ikkje opna fila %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lese, har framleis %lu att lesa, men ingen att" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrive, har framleis %lu att skrive, men klarte ikkje" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem ved lsing av fila" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem ved oppheving av lenkje til fila" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem ved synkronisering av fila" @@ -2455,52 +2466,52 @@ msgstr "Klarte ikkje tolka pakkefila %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Klarte ikkje tolka pakkefila %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Misforma linje %lu i kjeldelista %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Misforma linje %lu i kjeldelista %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Misforma linje %lu i kjeldelista %s (URI-tolking)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Misforma linje %lu i kjeldelista %s (absolutt dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Misforma linje %lu i kjeldelista %s (dist-tolking)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Opnar %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linja %u i kjeldelista %s er for lang." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Misforma linje %u i kjeldelista %s (type)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typen %s er ukjend i linja %u i kjeldelista %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Misforma linje %u i kjeldelista %s (utgjevar-ID)" @@ -2630,17 +2641,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Du vil kanskje prva retta p desse problema ved kyra apt-get update." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ugyldig oppslag i innstillingsfila, manglar pakkehovud" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Skjnar ikkje spikringstypen %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Ingen prioritet (eller null) oppgitt for spiker" @@ -2725,16 +2736,16 @@ msgstr "Feil ved behandling av %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Fann ikkje pakken %s %s ved behandling av filkrav" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Klarte ikkje f status p kjeldepakkelista %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samlar inn filtilbod" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IU-feil ved lagring av kjeldelager" @@ -2743,20 +2754,20 @@ msgstr "IU-feil ved lagring av kjeldelager" msgid "rename failed, %s (%s -> %s)." msgstr "endring av namn mislukkast, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Feil MD5-sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2765,7 +2776,7 @@ msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv " "(fordi arkitekturen manglar)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2773,14 +2784,14 @@ msgid "" msgstr "" "Fann ikkje fila for pakken %s. Det kan henda du m fiksa denne pakken sjlv." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pakkeindeksfilene er ydelagde. Feltet Filename: manglar for pakken %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Feil storleik" @@ -2914,7 +2925,6 @@ msgstr "Skreiv %i postar med %i manglande filer og %i filer som ikkje passa\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Opnar oppsettsfila %s" @@ -3028,15 +3038,32 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Klarte ikkje opna fila %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 "Sambandet vart uventa stengd" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Klarte ikkje sl opp %s" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Klarte ikkje opna fila %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.23.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-09-27 03:42+0100\n" "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -151,7 +151,7 @@ msgstr " Tabela wersji:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s dla %s skompilowany %s %s\n" @@ -306,7 +306,7 @@ msgstr "" " -c=? Czyta wskazany plik konfiguracyjny.\n" " -o=? Ustawia dowolną opcję konfiguracji, np. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nie udało się pisać do %s" @@ -442,8 +442,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Baza jest przestarzała, próbuję zaktualizować %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Niepoprawny format bazy. Jeśli została zaktualizowana starsza wersja apt, " @@ -460,11 +461,11 @@ msgstr "Nie udało się otworzyć pliku bazy %s: %s" msgid "Failed to stat %s" msgstr "Nie udało się wykonać operacji stat na %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Archiwum nie posiada rekordu kontrolnego" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nie udało się pobrać kursora" @@ -529,26 +530,26 @@ msgstr "*** Nie udało się dowiązać %s do %s" msgid " DeLink limit of %sB hit.\n" msgstr " Osiągnięto ograniczenie odłączania %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Archiwum nie posiadało pola pakietu" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nie posiada wpisu w pliku override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " opiekunem %s jest %s, a nie %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nie posiada wpisu w pliku override źródeł\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nie posiada również wpisu w pliku override binariów\n" @@ -652,7 +653,7 @@ msgstr "Nie udało się zmienić nazwy %s na %s" msgid "Y" msgstr "T" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Błąd kompilacji wyrażenia regularnego - %s" @@ -813,11 +814,11 @@ msgstr "Pakiety powinny zostać usunięte, ale Remove jest wyłączone." msgid "Internal error, Ordering didn't finish" msgstr "Błąd wewnętrzny, sortowanie niezakończone" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nie udało się zablokować katalogu pobierania" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Nie udało się odczytać list źródeł." @@ -848,8 +849,8 @@ msgstr "Po tej operacji zostanie dodatkowo użyte %sB miejsca na dysku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po tej operacji zostanie zwolnione %sB miejsca na dysku.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Nie udało się ustalić ilości wolnego miejsca w %s" @@ -886,7 +887,7 @@ msgstr "Przerwane." msgid "Do you want to continue [Y/n]? " msgstr "Kontynuować [T/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Nie udało się pobrać %s %s\n" @@ -895,7 +896,7 @@ msgstr "Nie udało się pobrać %s %s\n" msgid "Some files failed to download" msgstr "Nie udało się pobrać niektórych plików" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Ukończono pobieranie w trybie samego pobierania" @@ -994,35 +995,35 @@ msgstr "Wersja \"%s\" dla \"%s\" nie została znaleziona" msgid "Selected version %s (%s) for %s\n" msgstr "Wybrano wersję %s (%s) dla %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Polecenie update nie wymaga żadnych argumentów" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nie udało się zablokować katalogu list" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nic nie powinno być usuwane, AutoRemover nie zostanie uruchomiony" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1030,18 +1031,18 @@ msgstr "" "Następujące pakiety zostały zainstalowane automatycznie i nie są już więcej " "wymagane:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "%lu pakiety(ów) zostały zainstalowane automatycznie i nie są już więcej " "wymagane.\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Aby je usunąć należy użyć \"apt-get autoremove\"." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1059,43 +1060,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Następujące informacje mogą pomóc rozwiązać sytuację:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Błąd wewnętrzny, AutoRemover wszystko popsuł" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Błąd wewnętrzny, AllUpgrade wszystko popsuło" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nie udało się odnaleźć zadania %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nie udało się odnaleźć pakietu %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Uwaga, wybieranie %s za wyrażenie \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s zaznaczony jako zainstalowany ręcznie.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Należy uruchomić \"apt-get -f install\", aby je naprawić:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1103,7 +1104,7 @@ msgstr "" "Niespełnione zależności. Proszę spróbować \"apt-get -f install\" bez " "pakietów (lub podać rozwiązanie)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1115,119 +1116,119 @@ msgstr "" "w której niektóre pakiety nie zostały jeszcze utworzone lub przeniesione\n" "z katalogu Incoming (\"Przychodzące\")." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pakiety są uszkodzone" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Zostaną zainstalowane następujące dodatkowe pakiety:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Sugerowane pakiety:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Polecane pakiety:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Obliczanie aktualizacji..." -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Nie udało się" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Gotowe" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Błąd wewnętrzny, rozwiązywanie problemów wszystko popsuło" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać pobrane " "źródła" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nie udało się odnaleźć źródła dla pakietu %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pomijanie już pobranego pliku \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "W %s nie ma wystarczającej ilości wolnego miejsca" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Konieczne pobranie %sB/%sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Konieczne pobranie %sB archiwów źródeł.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Pobierz źródło %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nie udało się pobrać niektórych archiwów." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pomijanie rozpakowania już rozpakowanego źródła w %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Polecenie rozpakowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Proszę sprawdzić czy pakiet \"dpkg-dev\" jest zainstalowany.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Polecenie budowania \"%s\" zawiodło.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Proces potomny zawiódł" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Należy podać przynajmniej jeden pakiet, dla którego mają zostać sprawdzone " "zależności dla budowania" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nie udało się pobrać informacji o zależnościach dla budowania %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nie ma zależności dla budowania.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1236,7 +1237,7 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ nie znaleziono " "pakietu %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1245,32 +1246,32 @@ msgstr "" "Zależność %s od %s nie może zostać spełniona, ponieważ żadna z dostępnych " "wersji pakietu %s nie ma odpowiedniej wersji" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Nie udało się spełnić zależności %s od %s: Zainstalowany pakiet %s jest zbyt " "nowy" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Nie udało się spełnić zależności %s od %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Nie udało się spełnić zależności dla budowania %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Nie udało się przetworzyć zależności dla budowania" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Obsługiwane moduły:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1354,7 +1355,7 @@ msgstr "" "apt-get(8), sources.list(5) i apt.conf(5).\n" " Ten APT ma moce Super Krowy.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1607,11 +1608,10 @@ msgstr "Plik %s/%s nadpisuje plik w pakiecie %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nie można czytać %s" @@ -1641,9 +1641,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Pliki info i katalog tymczasowy muszą być na tym samym systemie plików" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Czytanie list pakietów" @@ -1779,11 +1779,11 @@ msgid "File not found" msgstr "Nie odnaleziono pliku" #: 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 "Nie udało się wykonać operacji 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 "Nie udało się ustawić czasu modyfikacji" @@ -1847,7 +1847,7 @@ msgstr "Przekroczenie czasu połączenia" msgid "Server closed the connection" msgstr "Serwer zamknął połączenie" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Błąd odczytu" @@ -1859,7 +1859,7 @@ msgstr "Odpowiedź przepełniła bufor." msgid "Protocol corruption" msgstr "Naruszenie zasad protokołu" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Błąd zapisu" @@ -1913,7 +1913,7 @@ msgstr "Przekroczony czas połączenia gniazda danych" msgid "Unable to accept connection" msgstr "Nie udało się przyjąć połączenia" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Nie udało się obliczyć skrótu pliku" @@ -1977,62 +1977,67 @@ msgstr "Nie udało się połączyć z %s:%s (%s)." msgid "Connecting to %s" msgstr "Łączenie z %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nie udało się przetłumaczyć nazwy \"%s\"" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Tymczasowy błąd przy tłumaczeniu \"%s\"" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Coś niewłaściwego stało się przy tłumaczeniu \"%s:%s\" (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nie udało się połączyć z %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\"" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Przerywanie instalacji" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Lista argumentów Acquire::gpgv::Options zbyt długa. Zakończenie." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Błąd wewnętrzny: Prawidłowy podpis, ale nie nie udało się ustalić odcisku " "klucza?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Napotkano przynajmniej jeden nieprawidłowy podpis." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Nie udało się uruchomić \"%s\" by zweryfikować podpis (czy gpgv jest " "zainstalowane?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Nieznany błąd podczas uruchamiania gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Następujące podpisy były błędne:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2083,47 +2088,47 @@ msgstr "Ten serwer HTTP nieprawidłowo obsługuje zakresy (ranges)" msgid "Unknown date format" msgstr "Nieznany format daty" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Operacja select nie powiodła się" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Przekroczenie czasu połączenia" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Błąd przy pisaniu do pliku wyjściowego" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Błąd przy pisaniu do pliku" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Błąd czytania z serwera: Zdalna strona zamknęła połączenie" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Błąd czytania z serwera" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Nie udało się uciąć zawartości pliku %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Błędne dane nagłówka" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Połączenie nie udało się" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Błąd wewnętrzny" @@ -2131,12 +2136,12 @@ msgstr "Błąd wewnętrzny" msgid "Can't mmap an empty file" msgstr "Nie można wykonać mmap na pustym pliku" -#: 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 "Nie udało się wykonać mmap %lu bajtów" -#: 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. " @@ -2145,6 +2150,13 @@ msgstr "" "Brak miejsca dla dynamicznego MMap. Proszę zwiększyć rozmiar APT::Cache-" "Limit. Aktualna wartość: %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 @@ -2174,53 +2186,53 @@ msgstr "%lis" msgid "Selection %s not found" msgstr "Nie odnaleziono wyboru %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Nierozpoznany skrót typu: \"%c\"" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Błąd składniowy %s:%u: Blok nie zaczyna się nazwą." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Błąd składniowy %s:%u: Błędny znacznik" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Błąd składniowy %s:%u: Po wartości występują śmieci" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Błąd składniowy %s:%u: Dyrektywy mogą występować tylko na najwyższym poziomie" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Błąd składniowy %s:%u: Zbyt wiele zagnieżdżonych operacji include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Błąd składniowy %s:%u: Włączony tutaj" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Błąd składniowy %s:%u: Nieobsługiwana dyrektywa \"%s\"" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Błąd składniowy %s:%u: Śmieci na końcu pliku" @@ -2296,75 +2308,75 @@ msgstr "Nie udało się przejść do %s" msgid "Failed to stat the cdrom" msgstr "Nie udało się wykonać operacji stat na CDROM-ie" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Dla pliku blokady %s tylko do odczytu nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nie udało się otworzyć pliku blokady %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Dla pliku blokady %s montowanego przez NFS nie zostanie użyta blokada" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nie udało się uzyskać blokady %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Oczekiwano na proces %s, ale nie było go" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Podproces %s spowodował naruszenie segmentacji." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "Podproces %s dostał sygnał %u." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s zwrócił kod błędu (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s zakończył się niespodziewanie" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nie udało się otworzyć pliku %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "należało przeczytać jeszcze %lu, ale nic nie zostało" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "należało zapisać jeszcze %lu, ale nie udało się to" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem przy zamykaniu pliku" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem przy usuwaniu pliku" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem przy zapisywaniu pliku na dysk" @@ -2481,52 +2493,52 @@ msgstr "Nie udało się zanalizować pliku pakietu %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nie udało się zanalizować pliku pakietu %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (dystrybucja)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (bezwzględna dystrybucja)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Nieprawidłowa linia %lu w liście źródeł %s (analiza dystrybucji)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Otwieranie %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u w liście źródeł %s jest zbyt długa." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (typ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" jest nieznany w linii %u listy źródeł %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Nieprawidłowa linia %u w liście źródeł %s (identyfikator producenta)" @@ -2652,17 +2664,17 @@ msgstr "Nie udało się otworzyć lub zanalizować zawartości list pakietów." msgid "You may want to run apt-get update to correct these problems" msgstr "Należy uruchomić apt-get update aby naprawić te problemy." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Nieprawidłowe informacje w pliku ustawień %s, brak nagłówka Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nierozpoznany typ przypinania %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Brak (lub zerowy) priorytet przypięcia" @@ -2749,16 +2761,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pakiet %s %s nie został odnaleziony podczas przetwarzania zależności plików" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nie udało się wykonać operacji stat na liście pakietów źródłowych %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Zbieranie zapewnień plików" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źródeł" @@ -2767,19 +2779,19 @@ msgstr "Błąd wejścia/wyjścia przy zapisywaniu podręcznego magazynu źróde msgid "rename failed, %s (%s -> %s)." msgstr "nie udało się zmienić nazwy, %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Błędna suma MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Błędna suma kontrolna" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Dla następujących identyfikatorów kluczy brakuje klucza publicznego:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2788,7 +2800,7 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet (z powodu brakującej architektury)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2797,14 +2809,14 @@ msgstr "" "Nie udało się odnaleźć pliku dla pakietu %s. Może to oznaczać, że trzeba " "będzie ręcznie naprawić ten pakiet." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "" "Pliki indeksu pakietów są uszkodzone. Brak pola Filename: dla pakietu %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Błędny rozmiar" @@ -2941,7 +2953,6 @@ msgstr "Zapisano %i rekordów z %i brakującymi plikami i %i niepasującymi\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Otwieranie pliku konfiguracyjnego %s" @@ -2952,7 +2963,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Błędna suma kontrolna" @@ -2973,7 +2983,6 @@ msgstr "Usuwanie %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Całkowicie usunięto %s" @@ -3064,14 +3073,30 @@ msgstr "" msgid "Not locked" msgstr "Nie zablokowany" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nie udało się nałożyć łatki na plik" +#: 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 "Połączenie zostało zamknięte przedwcześnie" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nie udało się uzyskać dostępu do bazy kluczy: \"%s\"" + +#~ msgid "Could not patch file" +#~ msgstr "Nie udało się nałożyć łatki na plik" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-09-09 20:54+0100\n" "Last-Translator: Miguel Figueiredo <elmig@debianpt.org>\n" "Language-Team: Portuguese <traduz@debianpt.org>\n" @@ -147,7 +147,7 @@ msgstr " Tabela de Versão:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -304,7 +304,7 @@ msgstr "" " -o=? Definir uma opção arbitrária de configuração, p.e.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Não conseguiu escrever para %s" @@ -438,8 +438,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "A base de dados é antiga, a tentar actualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "O formato da base de dados é inválido. Se actualizou a partir de uma versão " @@ -456,11 +457,11 @@ msgstr "Não foi possível abrir o ficheiro %s da base de dados: %s" msgid "Failed to stat %s" msgstr "Falha stat %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "O arquivo não tem registro de controlo" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Não foi possível obter um cursor" @@ -525,26 +526,26 @@ msgstr "*** Falhou ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arquivo não possuía campo package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " o maintainer de %s é %s, não %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui fonte de entrada de 'override'\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada binária de 'override'\n" @@ -648,7 +649,7 @@ msgstr "Falhou renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -809,11 +810,11 @@ msgstr "Pacotes precisam de ser removidos mas Remove está desabilitado." msgid "Internal error, Ordering didn't finish" msgstr "Erro Interno, Ordering não terminou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Impossível criar acesso exclusivo ao directório de downloads" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pôde ser lida." @@ -844,8 +845,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Após esta operação, será libertado %sB de espaço em disco.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -882,7 +883,7 @@ msgstr "Abortado." msgid "Do you want to continue [Y/n]? " msgstr "Deseja continuar [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou obter %s %s\n" @@ -891,7 +892,7 @@ msgstr "Falhou obter %s %s\n" msgid "Some files failed to download" msgstr "Falhou o download de alguns ficheiros" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Download completo e em modo de fazer apenas o download" @@ -990,35 +991,35 @@ msgstr "Não foi encontrada a versão '%s' para '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "Versão seleccionada %s (%s) para %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossível criar acesso exclusivo ao directório de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Não é suposto nós apagarmos coisas, não pode iniciar o AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1026,18 +1027,18 @@ msgstr "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes pacotes foram instalados automaticamente e já não são " "necessários:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Utilize 'apt-get autoremove' para os remover." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1055,43 +1056,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "A seguinte informação pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover estragou coisas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro Interno, AllUpgrade estragou algo" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Não foi possível encontrar a tarefa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Impossível encontrar o pacote %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Note, a seleccionar %s para a expressão regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s está definido para ser instalado manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar `apt-get -f install' para corrigir estes:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1099,7 +1100,7 @@ msgstr "" "Dependências não satisfeitas. Tente `apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,119 +1112,119 @@ msgstr "" "distribuição unstable em que alguns pacotes pedidos ainda não foram \n" "criados ou foram movidos do Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pacotes estragados" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Os seguintes pacotes extra serão instalados:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "A calcular a actualização... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Erro Interno, o solucionador de problemas estragou coisas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Tem de especificar pelo menos um pacote para obter o código fonte de" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Não foi possível encontrar um pacote de código fonte para %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "A saltar o ficheiro '%s', já tinha sido feito download'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "É necessário obter %sB/%sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "É necessário obter %sB de arquivos de código fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obter código fonte %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Falhou obter alguns arquivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "A saltar a descompactação do pacote de código fonte já descompactado em %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "O comando de descompactação '%s' falhou.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verifique se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "O comando de compilação '%s' falhou.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "O processo filho falhou" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve especificar pelo menos um pacote para verificar as dependências de " "compilação" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "" "Não foi possível obter informações de dependências de compilação para %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de compilação.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1232,7 +1233,7 @@ msgstr "" "a dependência de %s para %s não pôde ser satisfeita porque o pacote %s não " "pôde ser encontrado" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1241,32 +1242,32 @@ msgstr "" "a dependência de %s para %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requisitos de versão" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falha ao satisfazer a dependência %s para %s: O pacote instalado %s é " "demasiado novo" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falha ao satisfazer a dependência %s para %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Falhou processar as dependências de compilação" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Módulos Suportados:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1353,7 +1354,7 @@ msgstr "" "sources.list(5) e apt.conf(5)\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1604,11 +1605,10 @@ msgstr "O ficheiro %s/%s substitui o que está no pacote %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Não foi possível ler %s" @@ -1639,9 +1639,9 @@ msgstr "" "Os directórios info e temp precisam estar no mesmo sistema de ficheiros" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "A ler as listas de pacotes" @@ -1775,11 +1775,11 @@ msgid "File not found" msgstr "Ficheiro não 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 "Falhou o 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 "Falhou definir hora de modificação" @@ -1841,7 +1841,7 @@ msgstr "Foi atingido o tempo limite de ligação" msgid "Server closed the connection" msgstr "O servidor fechou a ligação" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1853,7 +1853,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1907,7 +1907,7 @@ msgstr "Ligação de socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar ligação" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema ao calcular o hash do ficheiro" @@ -1971,63 +1971,68 @@ msgstr "Não foi possível ligar em %s:%s (%s)." msgid "Connecting to %s" msgstr "A ligar a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária a resolver '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu ao resolver '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Não foi possível ligar a %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Não foi possível aceder à 'keyring': '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "A abortar a instalação." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: A lista de argumentos de Acquire::gpgv::Options é demasiado longa. A sair." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura válida, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Pelo menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar '%s' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido ao executar gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2078,47 +2083,47 @@ msgstr "Este servidor HTTP possui suporte de range errado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "A selecção falhou" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "O tempo da ligação expirou" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Erro ao escrever para o ficheiro de saída" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Erro ao escrever para ficheiro" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Erro ao escrever para o ficheiro" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Erro ao ler do servidor. O lado remoto fechou a ligação" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Erro ao ler do servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Falhou truncar o ficheiro" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Dados de cabeçalho errados" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "A ligação falhou" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Erro interno" @@ -2126,18 +2131,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Não é possível fazer mmap a um ficheiro vazio" -#: 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 "Não foi possível fazer 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 @@ -2167,53 +2179,53 @@ msgstr "" msgid "Selection %s not found" msgstr "A selecção %s não foi encontrada" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviatura de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "A abrir o ficheiro de configuração %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: O bloco começa sem nome." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag malformada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Directivas só podem ser feitas no nível mais alto" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Demasiados includes encadeados" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Directiva '%s' não suportada" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do ficheiro" @@ -2289,78 +2301,78 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar stat ao cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Não está a ser utilizado acesso exclusivo para apenas leitura ao ficheiro %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir ficheiro de lock %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Não está a ser utilizado o acesso exclusivo para o ficheiro %s, montado via " "nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter acesso exclusivo a %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperou por %s mas não estava lá" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "O sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "O sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "O sub-processo %s terminou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir ficheiro o %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "lido, ainda restam %lu para serem lidos mas não resta nenhum" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrito, ainda restam %lu para escrever mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema ao fechar o ficheiro" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema ao remover o link ao ficheiro" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema sincronizando o ficheiro" @@ -2477,52 +2489,52 @@ msgstr "Não foi possível fazer parse ao ficheiro do pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Não foi possível fazer parse ao ficheiro de pacote %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha malformada %lu na lista de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha malformada %lu na lista de fontes %s (parse de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha malformada %lu na lista de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linha malformada %lu na lista de fontes %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "A abrir %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u é demasiado longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha malformada %u na lista de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "O tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha malformada %u na lista de fontes %s (id de fornecedor)" @@ -2655,17 +2667,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registro inválido no ficheiro de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de marca (pin) %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para marcação (pin)" @@ -2755,16 +2767,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "O pacote %s %s não foi encontrado ao processar as dependências de ficheiros" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar stat à lista de pacotes de código fonte %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "A obter File Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Erro de I/O ao gravar a cache de código fonte" @@ -2773,21 +2785,21 @@ msgstr "Erro de I/O ao gravar a cache de código fonte" msgid "rename failed, %s (%s -> %s)." msgstr "falhou renomear, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum não coincide" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Código de verificação hash não coincide" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Não existe qualquer chave pública disponível para as seguintes IDs de " "chave:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2797,7 +2809,7 @@ msgstr "" "significar que você precisa corrigir manualmente este pacote. (devido a " "arquitectura em falta)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2806,7 +2818,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2814,7 +2826,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo Filename: " "para o pacote %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Tamanho incorrecto" @@ -2951,7 +2963,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "A abrir o ficheiro de configuração %s" @@ -2962,7 +2973,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Código de verificação hash não coincide" @@ -2983,7 +2993,6 @@ msgstr "A remover %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Remoção completa de %s" @@ -3069,14 +3078,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o 'patch' ao 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 "Ligação encerrada prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Não foi possível aceder à 'keyring': '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o 'patch' ao ficheiro" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/pt_BR.po b/po/pt_BR.po index 6ca0c52ff..b02214a9b 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-17 02:33-0200\n" "Last-Translator: Felipe Augusto van de Wiel (faw) <faw@debian.org>\n" "Language-Team: Brazilian Portuguese <debian-l10n-portuguese@lists.debian." @@ -149,7 +149,7 @@ msgstr " Tabela de versão:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para %s compilado em %s %s\n" @@ -308,7 +308,7 @@ msgstr "" " -o=? Define uma opção de configuração arbitrária, e.g.: -o dir::cache=/" "tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Impossível escrever para %s" @@ -443,8 +443,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "BD é antigo, tentando atualizar %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Formato do BD é inválido. Se você atualizou a partir de uma versão antiga do " @@ -461,11 +462,11 @@ msgstr "Impossível abrir o arquivo BD %s: %s" msgid "Failed to stat %s" msgstr "Falhou ao executar \"stat\" %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Repositório não possui registro de controle" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Impossível obter um cursor" @@ -530,26 +531,26 @@ msgstr "*** Falhou ao ligar %s a %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limite DeLink de %sB atingido.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Repositório não possuía campo pacote" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s não possui entrada override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " mantenedor de %s é %s, não %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s não possui entrada override fonte\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s também não possui entrada override binária\n" @@ -653,7 +654,7 @@ msgstr "Falhou ao renomear %s para %s" msgid "Y" msgstr "S" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Erro de compilação de regex - %s" @@ -815,11 +816,11 @@ msgstr "Pacotes precisam ser removidos mas a remoção está desabilitada." msgid "Internal error, Ordering didn't finish" msgstr "Erro interno, Ordenação não finalizou" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Impossível criar trava no diretório de download" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "A lista de fontes não pode ser lida." @@ -851,8 +852,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Depois desta operação, %sB de espaço em disco serão liberados.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Não foi possível determinar o espaço livre em %s" @@ -889,7 +890,7 @@ msgstr "Abortar." msgid "Do you want to continue [Y/n]? " msgstr "Você quer continuar [S/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Falhou ao buscar %s %s\n" @@ -898,7 +899,7 @@ msgstr "Falhou ao buscar %s %s\n" msgid "Some files failed to download" msgstr "Alguns arquivos falharam ao baixar" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Baixar completo e no modo somente baixar (\"download only\")" @@ -995,35 +996,35 @@ msgstr "Versão '%s' para '%s' não foi encontrada" msgid "Selected version %s (%s) for %s\n" msgstr "Versão selecionada %s (%s) para %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "O comando update não leva argumentos" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Impossível criar trava no diretório de listas" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nós não deveríamos apagar coisas, impossível iniciar AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" @@ -1031,18 +1032,18 @@ msgstr "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Os seguintes pacotes foram automaticamente instalados e não são mais " "requeridos:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Use 'apt-get autoremove' para removê-los." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1060,43 +1061,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "A informação a seguir pode ajudar a resolver a situação:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Erro Interno, o AutoRemover quebrou coisas" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Erro interno, AllUpgrade quebrou coisas" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Impossível achar tarefa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Impossível achar pacote %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Nota, selecionando %s para expressão regular '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s configurado para instalar manualmente.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Você deve querer executar 'apt-get -f install' para corrigí-los:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1104,7 +1105,7 @@ msgstr "" "Dependências desencontradas. Tente 'apt-get -f install' sem nenhum pacote " "(ou especifique uma solução)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1116,117 +1117,117 @@ msgstr "" "distribuição instável, que alguns pacotes requeridos não foram\n" "criados ainda ou foram retirados da \"Incoming\"." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pacotes quebrados" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Os pacotes extra a seguir serão instalados:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pacotes sugeridos:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pacotes recomendados:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculando atualização... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Falhou" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Pronto" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Erro interno, o solucionador de problemas quebrou coisas" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Deve-se especificar pelo menos um pacote para que se busque o fonte" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Impossível encontrar um pacote fonte para %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Pulando arquivo já baixado '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Você não possui espaço livre suficiente em %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Preciso obter %sB/%sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Preciso obter %sB de arquivos fonte.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Obter fonte %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Falhou ao buscar alguns arquivos." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Pulando o desempacotamento de fontes já desempacotados em %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comando de desempacotamento '%s' falhou.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Confira se o pacote 'dpkg-dev' está instalado.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comando de construção '%s' falhou.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Processo filho falhou" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Deve-se especificar pelo menos um pacote para que se cheque as dependências " "de construção" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Impossível conseguir informações de dependência de construção para %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s não tem dependências de construção.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1235,7 +1236,7 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque o pacote %s não " "pode ser encontrado" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1244,32 +1245,32 @@ msgstr "" "a dependência de %s por %s não pode ser satisfeita porque nenhuma versão " "disponível do pacote %s pode satisfazer os requerimentos de versão" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Falhou ao satisfazer a dependência de %s por %s: Pacote instalado %s é muito " "novo" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Falhou ao satisfazer a dependência de %s por %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Não foi possível satisfazer as dependências de compilação para %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Falhou ao processar as dependências de construção" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Módulos para os quais há suporte:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1355,7 +1356,7 @@ msgstr "" "para mais informações e opções.\n" " Este APT tem Poderes de Super Vaca.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1607,11 +1608,10 @@ msgstr "Arquivo %s/%s sobrescreve arquivo no pacote %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Impossível ler %s" @@ -1641,9 +1641,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Os diretórios info e temp precisam estar no mesmo sistema de arquivos" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Lendo listas de pacotes" @@ -1778,11 +1778,11 @@ msgid "File not found" msgstr "Arquivo não 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 "Falhou ao executar \"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 "Falhou ao definir hora de modificação" @@ -1844,7 +1844,7 @@ msgstr "Conexão expirou" msgid "Server closed the connection" msgstr "Servidor fechou a conexão" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Erro de leitura" @@ -1856,7 +1856,7 @@ msgstr "Uma resposta sobrecarregou o buffer" msgid "Protocol corruption" msgstr "Corrupção de protocolo" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Erro de escrita" @@ -1910,7 +1910,7 @@ msgstr "Conexão do socket de dados expirou" msgid "Unable to accept connection" msgstr "Impossível aceitar conexão" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema criando o hash do arquivo" @@ -1974,63 +1974,68 @@ msgstr "Não foi possível conectar em %s:%s (%s)." msgid "Connecting to %s" msgstr "Conectando a %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Não foi possível resolver '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Falha temporária resolvendo '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Algo estranho aconteceu resolvendo '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Impossível conectar em %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Não foi possível acessar o chaveiro: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abortando instalação." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumentos de Acquire::gpgv::Options muito extensa. Saindo." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Erro interno: Assinatura boa, mas não foi possível determinar a impressão " "digital da chave?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Ao menos uma assinatura inválida foi encontrada." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Não foi possível executar '%s' para verificar a assinatura (o gpgv está " "instalado?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Erro desconhecido executando gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "As seguintes assinaturas eram inválidas:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2081,47 +2086,47 @@ msgstr "Este servidor HTTP possui suporte a \"range\" quebrado" msgid "Unknown date format" msgstr "Formato de data desconhecido" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Seleção falhou" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Conexão expirou" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Erro escrevendo para arquivo de saída" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Erro escrevendo para arquivo" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Erro escrevendo para o arquivo" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Erro lendo do servidor. Ponto remoto fechou a conexão" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Erro lendo do servidor" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Falhou ao truncar arquivo" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Dados de cabeçalho ruins" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Conexão falhou" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Erro interno" @@ -2129,18 +2134,25 @@ msgstr "Erro interno" msgid "Can't mmap an empty file" msgstr "Não foi possível fazer \"mmap\" de um arquivo vazio" -#: 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 "Não foi possível fazer \"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 @@ -2170,53 +2182,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Seleção %s não encontrada" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviação de tipo desconhecida: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Abrindo arquivo de configuração %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Erro de sintaxe %s:%u: Bloco inicia sem nome." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Erro de sintaxe %s:%u: Tag mal formada" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Erro de sintaxe %s:%u: Lixo extra depois do valor" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Erro de sintaxe %s:%u: Diretivas podem ser feitas somente no nível mais alto" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Erro de sintaxe %s:%u: Muitos \"includes\" aninhados" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Erro de sintaxe %s:%u: Incluído a partir deste ponto" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Erro de sintaxe %s:%u: Não há suporte para a diretiva '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Erro de sintaxe %s:%u: Lixo extra no final do arquivo" @@ -2293,75 +2305,75 @@ msgstr "Impossível mudar para %s" msgid "Failed to stat the cdrom" msgstr "Impossível executar \"stat\" no cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Não usando travamento para arquivo de trava somente leitura %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Não foi possível abrir arquivo de trava %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Não usando travamento para arquivo de trava montado via nfs %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Não foi possível obter trava %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Esperado %s mas este não estava lá" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Sub-processo %s recebeu uma falha de segmentação." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Sub-processo %s retornou um código de erro (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Sub-processo %s finalizou inesperadamente" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Não foi possível abrir arquivo %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "leitura, ainda restam %lu para serem lidos mas nenhum deixado" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "escrita, ainda restam %lu para gravar mas não foi possível" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema fechando o arquivo" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema removendo o arquivo" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema sincronizando o arquivo" @@ -2478,53 +2490,53 @@ msgstr "Impossível analisar arquivo de pacote %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Impossível analisar arquivo de pacote %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linha mal formada %lu no arquivo de fontes %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linha mal formada %lu no arquivo de fontes %s (análise de URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linha mal formada %lu no arquivo de fontes %s (distribuição absoluta)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Linha mal formada %lu no arquivo de fontes %s (análise de distribuição)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Abrindo %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linha %u muito longa na lista de fontes %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linha mal formada %u no arquivo de fontes %s (tipo)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipo '%s' não é conhecido na linha %u na lista de fontes %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linha mal formada %u na lista de fontes %s (id de fornecedor)" @@ -2654,17 +2666,17 @@ msgstr "" msgid "You may want to run apt-get update to correct these problems" msgstr "Você terá que executar apt-get update para corrigir estes problemas" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Registro inválido no arquivo de preferências, sem cabeçalho Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Não foi possível entender o tipo de \"pin\" %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Nenhuma prioridade (ou zero) especificada para \"pin\"" @@ -2754,16 +2766,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Pacote %s %s não foi encontrado enquanto processando dependências de arquivo" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Não foi possível executar \"stat\" na lista de pacotes fonte %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Coletando Arquivo \"Provides\"" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Erro de E/S ao gravar cache fonte" @@ -2772,19 +2784,19 @@ msgstr "Erro de E/S ao gravar cache fonte" msgid "rename failed, %s (%s -> %s)." msgstr "renomeação falhou, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum incorreto" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum incorreto" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Não existem chaves públicas para os seguintes IDs de chaves:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2794,7 +2806,7 @@ msgstr "" "que você precisa consertar manualmente este pacote. (devido a arquitetura " "não especificada)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2803,7 +2815,7 @@ msgstr "" "Não foi possível localizar arquivo para o pacote %s. Isto pode significar " "que você precisa consertar manualmente este pacote." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2811,7 +2823,7 @@ msgstr "" "Os arquivos de índice de pacotes estão corrompidos. Nenhum campo \"Filename:" "\" para o pacote %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Tamanho incorreto" @@ -2948,7 +2960,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Abrindo arquivo de configuração %s" @@ -2959,7 +2970,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum incorreto" @@ -2980,7 +2990,6 @@ msgstr "Removendo %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "%s completamente removido" @@ -3064,14 +3073,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Não foi possível aplicar o patch" +#: 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ão encerrada prematuramente" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Não foi possível acessar o chaveiro: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Não foi possível aplicar o patch" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: ro\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-15 02:21+0200\n" "Last-Translator: Eddy Petrișor <eddy.petrisor@gmail.com>\n" "Language-Team: Romanian <debian-l10n-romanian@lists.debian.org>\n" @@ -150,7 +150,7 @@ msgstr " Tabela de versiuni:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s pentru %s compilat la %s %s\n" @@ -304,7 +304,7 @@ msgstr "" " -c=? Citește acest fișier de configurare\n" " -o=? Ajustează o opțiune de configurare arbitrară, ex. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Nu s-a putut scrie în %s" @@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB este vechi, se încearcă înnoirea %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Formatul DB este nevalid. Dacă l-ați înnoit pe apt de la o versiune mai " @@ -463,11 +464,11 @@ msgstr "Nu s-a putut deschide fișierul DB %s: %s" msgid "Failed to stat %s" msgstr "Eșec la „stat” pentru %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiva nu are înregistrare de control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Nu s-a putut obține un cursor" @@ -532,26 +533,26 @@ msgstr "*** Eșec la „link” între %s și %s" msgid " DeLink limit of %sB hit.\n" msgstr " Limita de %sB a dezlegării a fost atinsă.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arhiva nu are câmp de pachet" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nu are intrare de înlocuire\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s responsabil este %s nu %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s nu are nici o intrare sursă de înlocuire\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s nu are nici intrare binară de înlocuire\n" @@ -655,7 +656,7 @@ msgstr "Eșec la redenumirea lui %s în %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Eroare de compilare expresie regulată - %s" @@ -816,11 +817,11 @@ msgstr "Pachete trebuiesc șterse dar ștergerea este dezactivată." msgid "Internal error, Ordering didn't finish" msgstr "Eroare internă, Ordering nu s-a terminat" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Nu s-a putut bloca directorul de descărcare" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Lista surselor nu poate fi citită." @@ -850,8 +851,8 @@ msgstr "După această operație vor fi folosiți din disc încă %sB.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "După această operație se vor elibera %sB din spațiul ocupat pe disc.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "N-am putut determina spațiul disponibil în %s" @@ -889,7 +890,7 @@ msgstr "Renunțare." msgid "Do you want to continue [Y/n]? " msgstr "Vreți să continuați [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Eșec la aducerea lui %s %s\n" @@ -898,7 +899,7 @@ msgstr "Eșec la aducerea lui %s %s\n" msgid "Some files failed to download" msgstr "Descărcarea unor fișiere a eșuat" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Descărcare completă și în modul doar descărcare" @@ -995,51 +996,51 @@ msgstr "Versiunea '%s' pentru '%s' n-a fost găsită" msgid "Selected version %s (%s) for %s\n" msgstr "Versiune selectată %s (%s) pentru %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Nu pot determina starea listei surse de pachete %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Comanda de actualizare nu are argumente" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Nu pot încuia directorul cu lista" # XXX: orice sugestie este bine-venită -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Nu este voie să se șteargă lucruri, nu se poate porni AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Următoarele pachete au fost instalate automat și nu mai sunt necesare:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Folosiți 'apt-get autoremove' pentru a le șterge." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1058,43 +1059,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Următoarele informații ar putea să vă ajute la rezolvarea situației:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Eroare internă, AutoRemover a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Eroare internă, înnoire totală a defectat diverse chestiuni" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Nu s-a putut găsi sarcina %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Nu pot găsi pachetul %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Notă, selectare %s pentru expresie regulată '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s este marcat ca fiind instalat manual.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Ați putea porni 'apt-get -f install' pentru a corecta acestea:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1102,7 +1103,7 @@ msgstr "" "Dependențe neîndeplinite. Încercați 'apt-get -f install' fără nici un pachet " "(sau oferiți o altă soluție)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1115,118 +1116,118 @@ msgstr "" "pachete\n" "cerute n-au fost create încă sau au fost mutate din Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pachete deteriorate" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Următoarele extra pachete vor fi instalate:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Pachete sugerate:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Pachete recomandate:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Calculez înnoirea... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Eșec" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Terminat" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "" "Eroare internă, rezolvatorul de probleme a deteriorat diverse chestiuni" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Trebuie specificat cel puțin un pachet pentru a-i aduce sursa" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Nu s-a putut găsi o sursă pachet pentru %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Sar peste fișierul deja descărcat '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nu aveți suficient spațiu în %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Este nevoie să descărcați %sB/%sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Este nevoie să descărcați %sB din arhivele surselor.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Aducere sursa %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Eșec la aducerea unor arhive." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Sar peste despachetarea sursei deja despachetate în %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Comanda de despachetare '%s' eșuată.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Verificați dacă pachetul 'dpkg-dev' este instalat.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Comanda de construire '%s' eșuată.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Procesul copil a eșuat" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Trebuie specificat cel puțin un pachet pentru a-i verifica dependențele " "înglobate" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Nu pot prelua informațiile despre dependențele înglobate ale lui %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nu are dependențe înglobate.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1235,7 +1236,7 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece pachetul %s nu " "poate fi găsit" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1244,32 +1245,32 @@ msgstr "" "Dependența lui %s de %s nu poate fi satisfăcută deoarece nici o versiune " "disponibilă a pachetului %s nu poate satisface versiunile cerute" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Eșec la satisfacerea dependenței %s pentru %s: Pachetul instalat %s este " "prea nou" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Eșec la satisfacerea dependenței %s pentru %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Dependențele înglobate pentru %s nu pot fi satisfăcute." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Eșec la prelucrarea dependențelor de compilare" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Module suportate:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1356,7 +1357,7 @@ msgstr "" "pentru mai multe informații și opțiuni.\n" " Acest APT are puterile unei Super Vaci.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1608,11 +1609,10 @@ msgstr "Fișierul %s/%s îl suprascrie pe cel din pachetul %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Nu s-a putut citi %s" @@ -1642,9 +1642,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Directoarele info și temp trebuie să fie în același sistem de fișiere" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Citire liste de pachete" @@ -1783,11 +1783,11 @@ msgid "File not found" msgstr "Fișier negăsit" #: 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 "Eșec la „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 "Eșec la ajustarea timpului de modificare" @@ -1849,7 +1849,7 @@ msgstr "Timpul de conectare a expirat" msgid "Server closed the connection" msgstr "Serverul a închis conexiunea" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Eroare de citire" @@ -1861,7 +1861,7 @@ msgstr "Un răspuns a depășit zona de tampon." msgid "Protocol corruption" msgstr "Protocol corupt" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Eroare de scriere" @@ -1917,7 +1917,7 @@ msgstr "Timpul de conectare la socket-ul de date expirat" msgid "Unable to accept connection" msgstr "Nu s-a putut accepta conexiune" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problemă la calcularea dispersiei pentru fișierul" @@ -1982,62 +1982,67 @@ msgstr "Nu s-a putut realiza conexiunea cu %s:%s (%s)." msgid "Connecting to %s" msgstr "Conectare la %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Nu s-a putut rezolva „%s”" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Eșec temporar la rezolvarea lui „%s”" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "S-a întâmplat ceva „necurat” la rezolvarea lui „%s:%s” (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Nu s-a putut realiza conexiunea cu %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Nu s-a putut accesa inelul de chei: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Abandonez instalarea." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Lista de argumente din Acquire::gpgv::Options este prea lungă. Se iese." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Eroare internă: Semnătură corespunzătoare, dar nu s-a putut determina " "amprenta digitale a cheii?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Cel puțin o semnătură nevalidă a fost întâlnită." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Nu s-a putut executa „%s” pentru verificarea semnăturii (gpgv este instalat?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Eroare necunoscută în timp ce se execută gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Următoarele semnături nu au fost valide:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2088,48 +2093,48 @@ msgstr "Acest server HTTP are un suport defect de intervale" msgid "Unknown date format" msgstr "Format dată necunoscut" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Selecția a eșuat" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Timp de conectare expirat" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Eroare la scrierea fișierului de rezultat" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Eroare la scrierea în fișier" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Eroare la scrierea în fișierul" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "" "Eroare la citirea de la server. Conexiunea a fost închisă de la distanță" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Eroare la citirea de la server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Eșec la trunchierea fișierului" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Antet de date necorespunzător" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Conectare eșuată" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Eroare internă" @@ -2137,18 +2142,25 @@ msgstr "Eroare internă" msgid "Can't mmap an empty file" msgstr "Nu s-a putut executa „mmap” cu un fișier gol" -#: 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 "Nu s-a putut face mmap cu %lu octeți" -#: 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 @@ -2178,53 +2190,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Selecția %s nu a fost găsită" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Abreviere de tip nerecunoscut: „%c”" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Se deschide fișierul de configurare %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Eroare de sintaxă %s:%u: Blocul începe fără nume" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Eroare de sintaxă %s:%u: etichetă greșită" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare după valoare" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Eroare de sintaxă %s:%u: Directivele pot fi date doar la nivelul superior" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Eroare de sintaxă %s:%u: prea multe imbricări incluse" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Eroare de sintaxă %s:%u: incluse de aici" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Eroare de sintaxă %s:%u: directivă nesuportată '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Eroare de sintaxă %s:%u: mizerii suplimentare la sfârșitul fișierului" @@ -2301,75 +2313,75 @@ msgstr "Nu pot schimba la %s" msgid "Failed to stat the cdrom" msgstr "Eșec la „stat” pentru CD" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Nu s-a folosit închiderea pentru fișierul disponibil doar-citire %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Nu pot deschide fișierul blocat %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Nu este folosit blocajul pentru fișierul montat nfs %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Nu pot determina blocajul %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Așteptat %s, dar n-a fost acolo" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Subprocesul %s a primit o eroare de segmentare." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Subprocesul %s a întors un cod de eroare (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Subprocesul %s s-a terminat brusc" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Nu s-a putut deschide fișierul %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "citire, încă mai am %lu de citit dar n-a mai rămas nimic" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "scriere, încă mai am %lu de scris dar nu pot" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problemă la închiderea fișierului" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problemă la dezlegarea fișierului" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problemă în timpul sincronizării fișierului" @@ -2486,52 +2498,52 @@ msgstr "Nu s-a putut analiza fișierul pachet %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Nu s-a putut analiza fișierul pachet %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Linie greșită %lu în lista sursă %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Linie greșită %lu în lista sursă %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Linie greșită %lu în lista sursă %s (dist. absolută)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Linie greșită %lu în lista sursă %s (analiza dist.)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Deschidere %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Linia %u prea lungă în lista sursă %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Linie greșită %u în lista sursă %s (tip)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Tipul '%s' nu este cunoscut în linia %u din lista sursă %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Linie greșită %u în lista sursă %s (identificator vânzător)" @@ -2661,17 +2673,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Ați putea vrea să porniți 'apt-get update' pentru a corecta aceste probleme." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Înregistrare invalidă în fișierul de preferințe, fără antet de pachet" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Nu s-a înțeles tipul de pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Fără prioritate (sau zero) specificată pentru pin" @@ -2761,16 +2773,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Nu s-a găsit pachetul %s %s în timpul procesării dependențelor de fișiere" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Nu pot determina starea listei surse de pachete %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Colectare furnizori fișier" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Eroare IO în timpul salvării sursei cache" @@ -2779,21 +2791,21 @@ msgstr "Eroare IO în timpul salvării sursei cache" msgid "rename failed, %s (%s -> %s)." msgstr "redenumire eșuată, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Nepotrivire MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Nepotrivire la suma de căutare" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "" "Nu există nici o cheie publică disponibilă pentru următoarele " "identificatoare de chei:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2802,7 +2814,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să reparați manual acest pachet (din pricina unui arch lipsă)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2811,7 +2823,7 @@ msgstr "" "N-am putut localiza un fișier pentru pachetul %s. Aceasta ar putea însemna " "că aveți nevoie să depanați manual acest pachet." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2819,7 +2831,7 @@ msgstr "" "Fișierele index de pachete sunt deteriorate. Fără câmpul 'nume fișier:' la " "pachetul %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Nepotrivire dimensiune" @@ -2956,7 +2968,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Se deschide fișierul de configurare %s" @@ -2967,7 +2978,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Nepotrivire la suma de căutare" @@ -2988,7 +2998,6 @@ msgstr "Se șterge %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Șters complet %s" @@ -3073,14 +3082,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Nu s-a putut peteci fișierul" +#: 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 "Conexiune închisă prematur" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Nu s-a putut accesa inelul de chei: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Nu s-a putut peteci fișierul" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.25\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2010-01-08 09:47+0300\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -156,7 +156,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s для %s скомпилирован %s %s\n" @@ -306,7 +306,7 @@ msgstr "" " -c=? Читать указанный файл настройки\n" " -o=? Задать значение произвольной настройке, например, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Невозможно записать в %s" @@ -447,11 +447,8 @@ msgstr "DB устарела, попытка обновить %s" #: ftparchive/cachedb.cc:72 #, fuzzy -#| msgid "" -#| "DB format is invalid. If you upgraded from an older version of apt, " -#| "please remove and re-create the database." msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Некорректный формат базы данных (DB). Если вы обновляли версию apt, удалите " @@ -468,11 +465,11 @@ msgstr "Не удалось открыть DB файл %s: %s" msgid "Failed to stat %s" msgstr "Не удалось получить атрибуты %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архиве нет поля control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Невозможно получить курсор" @@ -537,26 +534,26 @@ msgstr "*** Не удалось создать ссылку %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr " Превышен лимит в %sB в DeLink.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "В архиве нет поля package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " Нет записи о переназначении (override) для %s\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакет %s сопровождает %s, а не %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " Нет записи source override для %s\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " Нет записи binary override для %s\n" @@ -661,7 +658,7 @@ msgstr "Не удалось переименовать %s в %s" msgid "Y" msgstr "д" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Ошибка компиляции регулярного выражения - %s" @@ -827,11 +824,11 @@ msgstr "Пакеты необходимо удалить, но удаление msgid "Internal error, Ordering didn't finish" msgstr "Внутренняя ошибка, Ordering не завершилась" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Невозможно заблокировать каталог, куда складываются скачиваемые файлы" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Не читается перечень источников." @@ -864,8 +861,8 @@ msgstr "" "После данной операции, объём занятого дискового пространства уменьшится на %" "sB.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не удалось определить количество свободного места в %s" @@ -904,7 +901,7 @@ msgstr "Аварийное завершение." msgid "Do you want to continue [Y/n]? " msgstr "Хотите продолжить [Д/н]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не удалось получить %s %s\n" @@ -913,7 +910,7 @@ msgstr "Не удалось получить %s %s\n" msgid "Some files failed to download" msgstr "Некоторые файлы скачать не удалось" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Указан режим \"только скачивание\", и скачивание завершено" @@ -1010,50 +1007,50 @@ msgstr "Версия '%s' для '%s' не найдена" msgid "Selected version %s (%s) for %s\n" msgstr "Выбрана версия %s (%s) для %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "Игнорируется недоступная версия '%s' пакета '%s'" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "Игнорируется недоступный выпуск '%s' пакета '%s'" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Используется '%s' в качестве исходного пакета вместо '%s'\n" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "Игнорируется недоступная версия '%s' пакета '%s'" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Команде update не нужны аргументы" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Невозможно заблокировать каталог со списками пакетов" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Не предполагалось удалять stuff, невозможно запустить AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Следующие пакеты устанавливались автоматически и больше не требуются:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "%lu пакетов было установлены автоматически и больше не требуются.\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Для их удаления используйте 'apt-get autoremove'." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1071,45 +1068,45 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Следующая информация, возможно, поможет вам:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутренняя ошибка, AutoRemover всё поломал" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутренняя ошибка, AllUpgrade всё поломал" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Не удалось найти задачу %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Не удалось найти пакет %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Заметьте, выбирается %s из-за регулярного выражения %s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s установлен вручную.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Возможно, для исправления этих ошибок вы захотите воспользоваться `apt-get -" "f install':" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1117,7 +1114,7 @@ msgstr "" "Неудовлетворённые зависимости. Попытайтесь выполнить 'apt-get -f install', " "не указывая имени пакета, (или найдите другое решение)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1128,118 +1125,118 @@ msgstr "" "или же используете нестабильную версию дистрибутива, где запрошенные вами\n" "пакеты ещё не созданы или были удалены из Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Сломанные пакеты" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Будут установлены следующие дополнительные пакеты:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Предлагаемые пакеты:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Рекомендуемые пакеты:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Расчёт обновлений... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Неудачно" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Готово" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Внутренняя ошибка, решатель проблем всё поломал" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Укажите как минимум один пакет, исходный код которого необходимо получить" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Невозможно найти пакет с исходным кодом для %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаем уже скачанный файл '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостаточно места в %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необходимо получить %sб/%sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Необходимо получить %sб архивов исходного кода.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Получение исходного кода %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Некоторые архивы не удалось получить." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Пропускается распаковка уже распакованного исходного кода в %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда распаковки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Проверьте, установлен ли пакет 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда сборки '%s' завершилась неудачно.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Порождённый процесс завершился неудачно" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для проверки зависимостей для сборки необходимо указать как минимум один " "пакет" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Невозможно получить информацию о зависимостях для сборки %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s не имеет зависимостей для сборки.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1248,7 +1245,7 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, так как пакет %s не " "найден" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1257,32 +1254,32 @@ msgstr "" "Зависимость типа %s для %s не может быть удовлетворена, поскольку ни одна из " "версий пакета %s не удовлетворяет требованиям" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не удалось удовлетворить зависимость типа %s для пакета %s: Установленный " "пакет %s новее, чем надо" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Невозможно удовлетворить зависимость типа %s для пакета %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Зависимости для сборки %s не могут быть удовлетворены." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Обработка зависимостей для сборки завершилась неудачно" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Поддерживаемые модули:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1369,7 +1366,7 @@ msgstr "" "содержится подробная информация и описание параметров.\n" " В APT есть коровья СУПЕРСИЛА.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1621,11 +1618,10 @@ msgstr "Файл %s/%s переписывает файл в пакете %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Невозможно прочитать %s" @@ -1655,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Каталоги info и temp должны находиться на одной файловой системе" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Чтение списков пакетов" @@ -1792,11 +1788,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 "Не удалось установить время модификации" @@ -1860,7 +1856,7 @@ msgstr "Допустимое время ожидания для соединен msgid "Server closed the connection" msgstr "Сервер прервал соединение" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Ошибка чтения" @@ -1872,7 +1868,7 @@ msgstr "Ответ переполнил буфер." msgid "Protocol corruption" msgstr "Искажение протокола" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Ошибка записи" @@ -1928,7 +1924,7 @@ msgstr "Время установления соединения для соке msgid "Unable to accept connection" msgstr "Невозможно принять соединение" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема при хешировании файла" @@ -1992,62 +1988,67 @@ msgstr "Не удаётся соединиться с %s:%s (%s)." msgid "Connecting to %s" msgstr "Соединение с %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Не удалось найти IP адрес для %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Временная ошибка при попытке получить IP адрес '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Что-то странное произошло при определении '%s:%s' (%i - %s)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "Невозможно соединиться с %s: %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Нет доступа к связке (keyring) ключей: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Аварийное завершение установки." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Слишком большой список параметров у Acquire::gpgv::Options. Завершение " "работы." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутренняя ошибка: Правильная подпись, но не удалось определить отпечаток " "ключа?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Найдена как минимум одна неправильная подпись." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Не удалось выполнить '%s' для проверки подписи (gpgv установлена?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Неизвестная ошибка при выполнении gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Следующие подписи неверные:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2098,47 +2099,47 @@ msgstr "Этот HTTP-сервер не поддерживает скачива msgid "Unknown date format" msgstr "Неизвестный формат данных" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Ошибка в select" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Время ожидания для соединения истекло" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Ошибка записи в выходной файл" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Ошибка записи в файл" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Ошибка записи в файл" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Ошибка чтения, удалённый сервер прервал соединение" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Ошибка чтения с сервера" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Не удалось обрезать файл" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Неверный заголовок данных" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Соединение разорвано" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Внутренняя ошибка" @@ -2146,12 +2147,12 @@ 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. " @@ -2160,6 +2161,13 @@ msgstr "" "Не хватает места для Dynamic MMap. Увеличьте значение APT::Cache-Limit. " "Текущее значение: %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 @@ -2189,54 +2197,54 @@ msgstr "%liс" msgid "Selection %s not found" msgstr "Не найдено: %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Неизвестная аббревиатура типа: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Открытие файла настройки %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксическая ошибка %s:%u: в начале блока нет имени." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксическая ошибка %s:%u: искажённый тег" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксическая ошибка %s:%u: лишние символы после значения" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксическая ошибка %s:%u: директивы могут задаваться только на верхнем " "уровне" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксическая ошибка %s:%u: слишком много вложенных include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксическая ошибка %s:%u вызвана include из этого места" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксическая ошибка %s:%u: не поддерживаемая директива '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксическая ошибка %s:%u: лишние символы в конце файла" @@ -2312,81 +2320,81 @@ msgstr "Невозможно сменить текущий каталог на % msgid "Failed to stat the cdrom" msgstr "Невозможно получить атрибуты cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s доступен только для " "чтения" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Не удалось открыть файл блокировки %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокировка не используется, так как файл блокировки %s находится на файловой " "системе nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Не удалось получить доступ к файлу блокировки %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Ожидалось завершение процесса %s, но он не был запущен" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "" "Нарушение защиты памяти (segmentation fault) в порождённом процессе %s." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "Порождённый процесс %s получил сигнал %u." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Порождённый процесс %s вернул код ошибки (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Порождённый процесс %s неожиданно завершился" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Не удалось открыть файл %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "ошибка при чтении. собирались прочесть ещё %lu байт, но ничего больше нет" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ошибка при записи, собирались записать ещё %lu байт, но не смогли" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Проблема закрытия файла" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Ошибка при удалении файла" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Проблема при синхронизации файловых буферов с диском" @@ -2503,53 +2511,53 @@ msgstr "Невозможно разобрать содержимое пакет msgid "Unable to parse package file %s (2)" msgstr "Невозможно разобрать содержимое пакета %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Искажённая строка %lu в списке источников %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Искажённая строка %lu в списке источников %s (проблема в имени дистрибутива)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Искажённая строка %lu в списке источников %s (анализ URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Искажённая строка %lu в списке источников %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Искажённая строка %lu в списке источников %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Открытие %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Строка %u в списке источников %s слишком длинна." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Искажённая строка %u в списке источников %s (тип)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Неизвестный тип '%s' в строке %u в списке источников %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Искажённая строка %u в списке источников %s (vendor id)" @@ -2680,17 +2688,17 @@ msgstr "Списки пакетов или status-файл не могут бы msgid "You may want to run apt-get update to correct these problems" msgstr "Вы можете запустить 'apt-get update' для исправления этих ошибок" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Неверная запись в файле параметров %s: отсутствует заголовок Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Неизвестный тип фиксации %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Для фиксации не указан приоритет (или указан нулевой)" @@ -2775,16 +2783,16 @@ msgstr "Произошла ошибка во время обработки %s (C msgid "Package %s %s was not found while processing file dependencies" msgstr "Во время обработки файла зависимостей не найден пакет %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не удалось получить атрибуты списка пакетов исходного кода %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Сбор информации о Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Ошибка ввода/вывода при попытке сохранить кэш источников" @@ -2793,19 +2801,19 @@ msgstr "Ошибка ввода/вывода при попытке сохран msgid "rename failed, %s (%s -> %s)." msgstr "переименовать не удалось, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum не совпадает" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Хеш сумма не совпадает" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2814,7 +2822,7 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет (возможно, пропущен arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2823,13 +2831,13 @@ msgstr "" "Не удалось обнаружить файл пакета %s. Это может означать, что вам придётся " "вручную исправить этот пакет." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "Не совпадает размер" @@ -3089,29 +3097,35 @@ msgstr "" msgid "Not locked" msgstr "Не заблокирован" -#: methods/rred.cc:219 -#, fuzzy -#| msgid "Could not open file %s" -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 "" +"Не удалось наложить заплату %s с использованием mmap и файловой операции -- " +"вероятно, повреждена заплата." + +#: 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 "" +"Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) -- " +"вероятно, повреждена заплата." #: methods/rsh.cc:330 msgid "Connection closed prematurely" msgstr "Соединение закрыто преждевременно" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Нет доступа к связке (keyring) ключей: '%s'" + +#, fuzzy +#~| msgid "Could not open file %s" +#~ msgid "Could not patch file" +#~ msgstr "Не удалось открыть файл %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" - -#~ msgid "" -#~ "Could not patch %s with mmap and with file operation usage - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "Не удалось наложить заплату %s с использованием mmap и файловой операции " -#~ "-- вероятно, повреждена заплата." - -#~ msgid "" -#~ "Could not patch %s with mmap (but no mmap specific fail) - the patch " -#~ "seems to be corrupt." -#~ msgstr "" -#~ "Не удалось наложить заплату %s с использованием mmap (но не из-за mmap) " -#~ "-- вероятно, повреждена заплата." @@ -436,9 +436,6 @@ msgstr "DB je neaktuálna, prebieha pokus o aktualizáciu %s" #: ftparchive/cachedb.cc:72 #, fuzzy -#| msgid "" -#| "DB format is invalid. If you upgraded from a older version of apt, please " -#| "remove and re-create the database." msgid "" "DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." @@ -1978,7 +1975,6 @@ msgstr "Nedá sa pripojiť k %s:%s:" #. TRANSLATOR: %s is the trusted keyring parts directory #: methods/gpgv.cc:78 #, fuzzy, c-format -#| msgid "Aborting install." msgid "No keyring installed in %s." msgstr "Inštalácia sa prerušuje." @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.5.5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2005-02-16 22:18+0100\n" "Last-Translator: Jure Cuhalev <gandalf@owca.info>\n" "Language-Team: Slovenian <sl@li.org>\n" @@ -145,7 +145,7 @@ msgstr " Tabela razliic:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s za %s %s preveden na %s %s\n" @@ -302,7 +302,7 @@ msgstr "" " -c=? Prebere podano datoteko z nastavitvami\n" " -o=? Nastavi poljubno nastavitveno monost, npr. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Ni mogoe pisati na %s" @@ -437,7 +437,7 @@ msgstr "ZP je stara, poskuam nadgraditi %s" #: ftparchive/cachedb.cc:72 msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" @@ -452,11 +452,11 @@ msgstr "Ni mogoe odprti datoteke ZP %s: %s" msgid "Failed to stat %s" msgstr "Napaka pri postavitvi %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arhiv nima nadzornega zapisa" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Ni mogoe najti kazalca" @@ -521,26 +521,26 @@ msgstr "*** Napaka pri povezovanju %s z %s" msgid " DeLink limit of %sB hit.\n" msgstr " Doseena meja RazVezovanja %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arhiv ni imel polja s paketom" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Vzdrevalec %s je %s in ne %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, fuzzy, c-format msgid " %s has no source override entry\n" msgstr " %s nima prekrivnega vnosa\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, fuzzy, c-format msgid " %s has no binary override entry either\n" msgstr " %s nima prekrivnega vnosa\n" @@ -644,7 +644,7 @@ msgstr "Ni mogoe preimenovati %s v %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Napaka pri prevajanju regex - %s" @@ -807,11 +807,11 @@ msgstr "Odstraniti je potrebno pakete, a je Odstranjevanje onemogoeno." msgid "Internal error, Ordering didn't finish" msgstr "Notranja napaka pri dodajanju odklona" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Ni mogoe zakleniti imenika za prenose" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Seznama virov ni mogoe brati." @@ -840,8 +840,8 @@ msgstr "Po odpakiranju bo uporabljenega %sB dodatnega prostora na disku.\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Po odpakiranju bo sproenega %sB prostora na disku.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, fuzzy, c-format msgid "Couldn't determine free space in %s" msgstr "Nimate dovolj prostora na %s" @@ -878,7 +878,7 @@ msgstr "Prekini." msgid "Do you want to continue [Y/n]? " msgstr "Ali elite nadaljevati [Y/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Ni mogoe dobiti %s %s\n" @@ -887,7 +887,7 @@ msgstr "Ni mogoe dobiti %s %s\n" msgid "Some files failed to download" msgstr "Prenos nekaterih datotek ni uspel" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Prenos dokonan in uporabljen nain samo prenos" @@ -984,51 +984,51 @@ msgstr "Razliice '%s' za '%s' ni mogoe najti" msgid "Selected version %s (%s) for %s\n" msgstr "Izbrana razliica %s (%s) za %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Ni mogoe doloiti seznama izvornih paketov %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Ukaz update ne potrebuje argumentov" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Imenika seznamov ni mogoe zakleniti" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Naslednji NOVI paketi bodo nameeni:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1044,44 +1044,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Naslednji podatki vam bodo morda pomagali reiti teavo:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Opomba: izbran %s namesto regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "vendar bo paket %s nameen" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Poskusite zagnati 'apt-get -f install', e elite popraviti:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1089,7 +1089,7 @@ msgstr "" "Nereene odvisnosti. Poskusite 'apt-get -f install' brez paketov (ali " "podajte reitev)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,126 +1100,126 @@ msgstr "" "nemogo poloaj, e uporabljate nestabilno izdajo pa, da nekateri zahtevani " "paketi e niso ustvarjeni ali preneeni iz Prihajajoe." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Pokvarjeni paketi" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Predlagani paketi:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Priporoeni paketi:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Preraunavanje nadgradnje ... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Spodletelo" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Opravljeno" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 #, fuzzy msgid "Internal error, problem resolver broke stuff" msgstr "Notranja napaka zaradi AllUpgrade." -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite dobiti izorno kodo" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Izvornega paketa za %s ni mogoe najti" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, fuzzy, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Nimate dovolj prostora na %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Potrebno je dobiti %sB/%sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Potrebno je dobiti %sB izvornih arhivov.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Dobi vir %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Nekaterih arhivov ni mogoe dobiti." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Odpakiranje e odpakiranih izvornih paketov v %s preskoeno\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Ukaz odpakiranja '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Ukaz gradnje '%s' ni uspel.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Otroki proces ni uspel" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Potrebno je navesti vsaj en paket, za katerega elite preveriti odvisnosti " "za gradnjo" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Ni mogoe dobiti informacij o odvisnostih za gradnjo za %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s nima odvisnosti za gradnjo.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "%s odvisnosti za %s ni mogoe zadostiti, ker ni mogoe najti paketa %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1228,31 +1228,31 @@ msgstr "" "%s odvisnosti za %s ni mogoe zadostiti, ker nobena razliica paketa %s ne " "more zadostiti zahtevi po razliici" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Ni mogoe zadostiti %s odvisnosti za %s. Nameen paket %s je preve nov" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Ni mogoe zadostiti %s odvisnosti za %s. %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Odvisnostim za gradnjo %s ni mogoe zadostiti." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Obdelava odvisnosti za gradnjo ni uspela" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Podprti moduli:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1335,7 +1335,7 @@ msgstr "" "sources.list(5) in apt.conf(5).\n" " APT ima mo Super Krave.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1583,11 +1583,10 @@ msgstr "Datoteka %s/%s prepisuje datoteko v paketu %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Ni mogoe brati %s" @@ -1617,9 +1616,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Podatki in zaasni imeniki morajo biti v istem datotenem sistemu" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Branje seznama paketov" @@ -1753,11 +1752,11 @@ msgid "File not found" msgstr "Datoteke ni mogoe najti" #: 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 "Doloitev ni uspela" -#: 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 "Nastavitev asa spremembe ni uspela" @@ -1819,7 +1818,7 @@ msgstr "Povezava potekla" msgid "Server closed the connection" msgstr "Strenik je zaprl povezavo" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Napaka pri branju" @@ -1831,7 +1830,7 @@ msgstr "Odgovor je prekorail vmesnik." msgid "Protocol corruption" msgstr "Okvara protokola" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Napaka pri pisanju" @@ -1885,7 +1884,7 @@ msgstr "Povezava podatkovne vtinice potekla" msgid "Unable to accept connection" msgstr "Ni mogoe sprejeti povezave" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Teava pri razprevanju datoteke" @@ -1949,59 +1948,64 @@ msgstr "Ni se mogoe povezati z %s:%s (%s)." msgid "Connecting to %s" msgstr "Povezujem se z %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Ni mogoe razreiti '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Zaasna napaka pri razreevanju '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Prilo je do napake pri razreevanju '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Ni se mogoe povezati z %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Ni mogoe razreiti '%s'" +msgid "No keyring installed in %s." +msgstr "Prekinjanje namestitve." -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" + +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 #, fuzzy msgid "The following signatures were invalid:\n" msgstr "Naslednji dodatni paketi bodo nameeni:" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2050,48 +2054,48 @@ msgstr "Ta strenik HTTP ima pokvarjen obseg podpore" msgid "Unknown date format" msgstr "Neznana oblika datuma" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Izbira ni uspela" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "as za povezavo se je iztekel" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Napaka pri pisanju v izhodno datoteko" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Napaka pri pisanju v datoteko" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Napaka pri branju oddaljene in zaprte povezave s strenika " -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Napaka pri branju s strenika" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Napaka pri pisanju datoteke %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Napani podatki glave" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Povezava ni uspela" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Notranja napaka" @@ -2099,18 +2103,25 @@ msgstr "Notranja napaka" msgid "Can't mmap an empty file" msgstr "mmap prazne datoteke ni mogo" -#: 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 "Ni mogoe narediti mmap %lu bajtov" -#: 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 @@ -2140,53 +2151,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Izbira %s ni mogoe najti" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Ne-prepoznan tip okrajave: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Odpiranje nastavitvene datoteke %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Skladenjska napaka %s:%u: Blok se zane brez imena." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Skladenjska napaka %s:%u: Nepravilna znaka." -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Skladenjska napaka %s:%u: Dodatno smetje za vrednostjo." -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Skladenjska napaka %s:%u: Napotki se lahko izvedejo le na vrhnjem nivoju." -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Skladenjska napaka %s:%u: Preve ugnezdenih vkljuitev." -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Skladenjska napaka %s:%u: Vkljuen od tu." -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Skladenjska napaka %s:%u: Nepodprt napotek '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Skladenjska napaka %s:%u: Dodatno smetje na koncu datoteke" @@ -2262,75 +2273,75 @@ msgstr "Ni mogoe spremeniti v %s" msgid "Failed to stat the cdrom" msgstr "Ni mogoe doloiti CD-ROM-a" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Brez uporabe zaklepanja za zaklenjeno datoteko samo za branje %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Ni mogoe odprti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Brez uporabe zaklepanja za datoteko %s, priklopljeno z NTFS" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Ni mogoe dobiti zaklenjene datoteke %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "akal, a %s ni bil tam" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Napaka pri razlenjenosti podprocesa %s." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Podproces %s je vrnil kodo napake (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Podproces %s se je nepriakovano zakljuil" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Ne morem odpreti datoteke %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "berem, e vedno %lu za branje, a nobeden ostal" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "piem, e vedno %lu za pisanje, a ni mogoe" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Teava pri zapiranju datoteke" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Teava pri odvezovanju datoteke" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Teava pri usklajevanju datoteke" @@ -2448,52 +2459,52 @@ msgstr "Ni mogoe razleniti paketne datoteke %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Ni mogoe razleniti paketne datoteke %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Napana vrstica %lu v seznamu virov %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Napana vrstica %lu v seznamu virov %s (distribucija)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Napana vrstica %lu v seznamu virov %s (absolutna distribucija)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Napana vrstica %lu v seznamu virov %s (razlenitev distribucije)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Odpiram %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Vrstica %u v seznamu virov %s je predolga." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Napana vrstica %u v seznamu virov %s (vrsta)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, fuzzy, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Vrsta '%s' v vrstici %u v seznamu virov %s ni znana" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Napana vrstica %u v seznamu virov %s (ID ponudnika)" @@ -2621,17 +2632,17 @@ msgstr "Ni mogoe odprti ali razleniti seznama paketov ali datoteke stanja." msgid "You may want to run apt-get update to correct these problems" msgstr "e elite odpraviti teave, poskusite zagnati apt-get update." -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Napaen zapis v datoteki z nastavitvami. Ni glave paketa" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Ni mogoe razumeti vrste zaponke %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Prioriteta zaponke ni doloena ali pa je ni." @@ -2716,16 +2727,16 @@ msgstr "Prilo je do napake pri obdelavi %s (Zberi dobavitelje datotek)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketa %s %s ni bilo mogoe najti med obdelavo odvisnosti" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Ni mogoe doloiti seznama izvornih paketov %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Zbiranje dobaviteljev datotek" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Napaka IO pri shranjevanju predpomnilnika virov" @@ -2734,20 +2745,20 @@ msgstr "Napaka IO pri shranjevanju predpomnilnika virov" msgid "rename failed, %s (%s -> %s)." msgstr "preimenovanje spodletelo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Neujemanje vsote MD5" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2756,7 +2767,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket (zaradi manjkajoega arhiva)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2765,7 +2776,7 @@ msgstr "" "Ni bilo mogoe najti datoteke za paket %s. Morda boste morali rono " "popraviti ta paket." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2773,7 +2784,7 @@ msgstr "" "Datoteke s kazali paketov so pokvarjene. Brez imena datotek: polje alu paket " "%s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Neujemanje velikosti" @@ -2909,7 +2920,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Odpiranje nastavitvene datoteke %s" @@ -3023,15 +3033,32 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -#, fuzzy -msgid "Could not patch file" -msgstr "Ne morem odpreti datoteke %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 "Povezava se je prezgodaj zaprla" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Ni mogoe razreiti '%s'" + +#, fuzzy +#~ msgid "Could not patch file" +#~ msgstr "Ne morem odpreti datoteke %s" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-03-03 23:15+0100\n" "Last-Translator: Daniel Nylander <po@danielnylander.se>\n" "Language-Team: Swedish <debian-l10n-swedish@debian.org>\n" @@ -147,7 +147,7 @@ msgstr " Versionstabell:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s för %s kompilerad den %s %s\n" @@ -300,7 +300,7 @@ msgstr "" " -c=? Läs denna konfigurationsfil.\n" " -o=? Ställ in en godtycklig konfigurationsflagga, t.ex -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Kunde inte skriva till %s" @@ -434,8 +434,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB är gammal, försöker uppgradera %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "DB-formatet är ogiltigt. Ta bort och återskapa databasen om du uppgraderar " @@ -452,11 +453,11 @@ msgstr "Kunde inte öppna DB-filen %s: %s" msgid "Failed to stat %s" msgstr "Misslyckades med att ta status på %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Arkivet har ingen styrpost" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Kunde inte få tag i någon markör" @@ -523,27 +524,27 @@ msgid " DeLink limit of %sB hit.\n" msgstr " Avlänkningsgränsen på %sB nåddes.\n" # Fält vid namn "Package" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Arkivet har inget package-fält" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s har ingen post i override-filen\n" # parametrar: paket, ny, gammal -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ansvarig för paketet %s är %s ej %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s har ingen källåsidosättningspost\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s har heller ingen binär åsidosättningspost\n" @@ -649,7 +650,7 @@ msgstr "Misslyckades med att byta namn på %s till %s" msgid "Y" msgstr "J" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Fel vid kompilering av reguljärt uttryck - %s" @@ -811,11 +812,11 @@ msgstr "Paketen måste tas bort men \"Remove\" är inaktiverat." msgid "Internal error, Ordering didn't finish" msgstr "Internt fel. Sorteringen färdigställdes inte" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Kunde inte låsa hämtningskatalogen" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Listan över källor kunde inte läsas." @@ -847,8 +848,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Efter denna åtgärd kommer %sB att frigöras på disken.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Kunde inte fastställa ledigt utrymme i %s" @@ -886,7 +887,7 @@ msgstr "Avbryter." msgid "Do you want to continue [Y/n]? " msgstr "Vill du fortsätta [J/n]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Misslyckades med att hämta %s %s\n" @@ -895,7 +896,7 @@ msgstr "Misslyckades med att hämta %s %s\n" msgid "Some files failed to download" msgstr "Misslyckades med att hämta vissa filer" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Hämtningen färdig i \"endast-hämta\"-läge" @@ -993,53 +994,53 @@ msgstr "Version \"%s\" för \"%s\" hittades inte" msgid "Selected version %s (%s) for %s\n" msgstr "Vald version %s (%s) för %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Kunde inte ta status på källkodspaketlistan %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Uppdateringskommandot tar inga argument" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Kunde inte låsa listkatalogen" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" "Det är inte meningen att vi ska ta bort något, kan inte starta AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Följande paket har installerats automatiskt och är inte längre nödvändiga:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Använd \"apt-get autoremove\" för att ta bort dem." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1057,44 +1058,44 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Följande information kan vara till hjälp för att lösa situationen:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Internt fel, AutoRemover förstörde något" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internt fel, AllUpgrade förstörde något" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Kunde inte hitta funktionen %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Kunde inte hitta paketet %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Observera, väljer %s för det reguljära uttrycket \"%s\"\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s är satt till manuellt installerad.\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Du kan möjligen rätta till detta genom att köra \"apt-get -f install\":" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1102,7 +1103,7 @@ msgstr "" "Otillfredsställda beroenden. Prova med \"apt-get -f install\" utan paket " "(eller ange en lösning)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1114,115 +1115,115 @@ msgstr "" "att några nödvändiga paket ännu inte har skapats eller flyttats\n" "ut från \"Incoming\"." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Trasiga paket" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Följande ytterligare paket kommer att installeras:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Föreslagna paket:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Rekommenderade paket:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Beräknar uppgradering... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Misslyckades" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Färdig" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Internt fel, problemlösaren förstörde någonting" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Du måste ange minst ett paket att hämta källkod för" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Kunde inte hitta något källkodspaket för %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Hoppar över redan hämtade filen \"%s\"\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Du har inte tillräckligt mycket ledigt utrymme i %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Behöver hämta %sB/%sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Behöver hämta %sB källkodsarkiv.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Hämtar källkoden %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Misslyckades med att hämta vissa arkiv." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Packar inte upp redan uppackad källkod i %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Uppackningskommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Försäkra dig om att paketet \"dpkg-dev\" är installerat.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Byggkommandot \"%s\" misslyckades.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Barnprocessen misslyckades" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Du måste ange minst ett paket att kontrollera byggberoenden för" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Kunde inte hämta information om byggberoenden för %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s har inga byggberoenden.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1231,7 +1232,7 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom paketet %s inte kan " "hittas" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1240,32 +1241,32 @@ msgstr "" "%s-beroendet på %s kan inte tillfredsställas eftersom inga tillgängliga " "versioner av paketet %s tillfredsställer versionskraven" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Misslyckades med att tillfredsställa %s-beroendet för %s: Det installerade " "paketet %s är för nytt" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Misslyckades med att tillfredsställa %s-beroendet för %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Byggberoenden för %s kunde inte tillfredsställas." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Misslyckades med att behandla byggberoenden" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Moduler som stöds:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1349,7 +1350,7 @@ msgstr "" "för mer information och flaggor.\n" " Denna APT har Speciella Ko-Krafter.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1602,11 +1603,10 @@ msgstr "Filen %s/%s skriver över den i paketet %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Kunde inte läsa %s" @@ -1636,9 +1636,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Katalogerna info och temp måste vara på samma filsystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Läser paketlistor" @@ -1773,11 +1773,11 @@ msgid "File not found" msgstr "Filen hittades inte" #: 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 "Kunde inte ta status" -#: 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 "Misslyckades ställa in ändringstid" @@ -1839,7 +1839,7 @@ msgstr "Tidsgränsen för anslutningen överskreds" msgid "Server closed the connection" msgstr "Servern stängde anslutningen" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Läsfel" @@ -1851,7 +1851,7 @@ msgstr "Ett svar spillde bufferten." msgid "Protocol corruption" msgstr "Protokollet skadat" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Skrivfel" @@ -1905,7 +1905,7 @@ msgstr "Anslutet datauttag (socket) fick inte svar inom tidsgränsen" msgid "Unable to accept connection" msgstr "Kunde inte ta emot anslutningen" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problem med att lägga filen till hashtabellen" @@ -1972,62 +1972,67 @@ msgstr "Kunde inte ansluta till %s:%s (%s)." msgid "Connecting to %s" msgstr "Ansluter till %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Kunde inte slå upp \"%s\"" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Temporärt fel vid uppslagning av \"%s\"" # Okänd felkod; %i = koden -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Något konstigt hände när \"%s:%s\" slogs upp (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Kunde inte ansluta till %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Kunde inte komma åt nyckelring: \"%s\"" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Avbryter installationen." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Argumentslistan från Acquire::gpgv::Options är för lång. Avslutar." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Internt fel: Korrekt signatur men kunde inte fastställa nyckelns " "fingeravtryck?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Minst en ogiltig signatur träffades på." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Kunde inte köra \"%s\" för att verifiera signatur (är gpgv installerad?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Okänt fel vid körning av gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Följande signaturer är ogiltiga:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2079,47 +2084,47 @@ msgstr "Den här http-serverns stöd för delvis hämtning fungerar inte" msgid "Unknown date format" msgstr "Okänt datumformat" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "\"Select\" misslyckades" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Anslutningen överskred tidsgränsen" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Fel vid skrivning till utdatafil" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Fel vid skrivning till fil" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Fel vid skrivning till filen" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Fel vid läsning från server: Andra änden stängde förbindelsen" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Fel vid läsning från server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Misslyckades med att kapa av filen" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Felaktiga data i huvud" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Anslutningen misslyckades" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Internt fel" @@ -2127,12 +2132,12 @@ msgstr "Internt fel" msgid "Can't mmap an empty file" msgstr "Kan inte utföra mmap på 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 "Kunde inte utföra mmap på %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. " @@ -2141,6 +2146,13 @@ msgstr "" "Dynamisk MMap fick slut på utrymme. Öka storleken för APT::Cache-Limit. " "Aktuellt värde: %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 @@ -2170,52 +2182,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Valet %s hittades inte" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Okänd typförkortning: \"%c\"" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Öppnar konfigurationsfilen %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntaxfel %s:%u: Block börjar utan namn." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntaxfel %s:%u: Felformat märke" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntaxfel %s:%u: Överflödigt skräp efter värde" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Syntaxfel %s:%u: Direktiv kan endast utföras på toppnivån" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntaxfel %s:%u: För många nästlade inkluderingar" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntaxfel %s:%u: Inkluderad härifrån" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntaxfel %s:%u: Direktivet \"%s\" stöds inte" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntaxfel %s:%u: Överflödigt skräp vid filens slut" @@ -2293,75 +2305,75 @@ msgstr "Kunde inte byta till %s" msgid "Failed to stat the cdrom" msgstr "Kunde inte ta status på cd-romen." -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Använder inte låsning för skrivskyddade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Kunde inte öppna låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Använder inte låsning för nfs-monterade låsfilen %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Kunde inte erhålla låset %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Väntade på %s men den fanns inte där" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Underprocessen %s råkade ut för ett segmenteringsfel." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Underprocessen %s svarade med en felkod (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Underprocessen %s avslutades oväntat" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Kunde inte öppna filen %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "läsning, har fortfarande %lu att läsa men ingenting finns kvar" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "skrivning, har fortfarande %lu att skriva men kunde inte" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problem med att stänga filen" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problem med att länka ut filen" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problem med att synkronisera filen" @@ -2481,52 +2493,52 @@ msgstr "Kunde inte tolka paketfilen %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Kunde inte tolka paketfilen %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Rad %lu i källistan %s har (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Rad %lu i källistan %s har fel format (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Rad %lu i källistan %s har fel format (URI-tolkning)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Rad %lu i källistan %s har fel format (Absolut dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Rad %lu i källistan %s har fel format (dist-tolkning)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Öppnar %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Rad %u är för lång i källistan %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Rad %u i källistan %s har fel format (typ)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Typ \"%s\" är inte känd på rad %u i listan över källor %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Rad %u i källistan %s har fel format (leverantörs-id)" @@ -2655,17 +2667,17 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "Du kan möjligen rätta till problemet genom att köra \"apt-get update\"" # "Package" är en sträng i konfigurationsfilen -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Ogiltig post i konfigurationsfilen, \"Package\"-rubriken saknas" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Förstod inte nåltypen %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Prioritet ej angiven (eller noll) för nål" @@ -2751,17 +2763,17 @@ msgstr "Fel uppstod vid hantering av %s (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "Paketet %s %s hittades inte när filberoenden hanterades" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Kunde inte ta status på källkodspaketlistan %s" # Bättre ord? -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Samlar filtillhandahållningar" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "In-/utfel vid lagring av källcache" @@ -2770,19 +2782,19 @@ msgstr "In-/utfel vid lagring av källcache" msgid "rename failed, %s (%s -> %s)." msgstr "namnbyte misslyckades, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash-kontrollsumman stämmer inte" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Det finns ingen öppen nyckel tillgänglig för följande nyckel-id:n:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2791,7 +2803,7 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket (på grund av saknad arkitektur)." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2800,13 +2812,13 @@ msgstr "" "Jag kunde inte hitta någon fil för paketet %s. Detta kan betyda att du " "manuellt måste reparera detta paket." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "Paketindexfilerna är skadede. Inget \"Filename:\"-fält för paketet %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Storleken stämmer inte" @@ -2941,7 +2953,6 @@ msgstr "Skrev %i poster med %i saknade filer och %i filer som inte stämmer\n" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Öppnar konfigurationsfilen %s" @@ -2952,7 +2963,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash-kontrollsumman stämmer inte" @@ -2973,7 +2983,6 @@ msgstr "Tar bort %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Tog bort hela %s" @@ -3058,14 +3067,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Kunde inte lägga på programfix på filen" +#: 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 "Anslutningen stängdes i förtid" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Kunde inte komma åt nyckelring: \"%s\"" + +#~ msgid "Could not patch file" +#~ msgstr "Kunde inte lägga på programfix på filen" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-11-06 15:54+0700\n" "Last-Translator: Theppitak Karoonboonyanan <thep@linux.thai.net>\n" "Language-Team: Thai <thai-l10n@googlegroups.com>\n" @@ -147,7 +147,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s สำหรับ %s คอมไพล์เมื่อ %s %s\n" @@ -301,7 +301,7 @@ msgstr "" " -c=? อ่านแฟ้มค่าตั้งนี้\n" " -o=? กำหนดตัวเลือกค่าตั้งเป็นรายตัว เช่น -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "ไม่สามารถเขียนลงแฟ้ม %s" @@ -431,8 +431,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB เป็นรุ่นเก่า จะพยายามปรับรุ่น %s ขึ้น" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "ฟอร์แมตของ DB ผิด ถ้าคุณเพิ่งปรับรุ่นมาจาก apt รุ่นเก่า กรุณาลบฐานข้อมูลแล้วสร้างใหม่" @@ -447,11 +448,11 @@ msgstr "ไม่สามารถเปิดแฟ้ม DB %s: %s" msgid "Failed to stat %s" msgstr "stat %s ไม่สำเร็จ" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "แพกเกจไม่มีระเบียนควบคุม" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "ไม่สามารถนำตัวชี้ตำแหน่งมาใช้ได้" @@ -516,26 +517,26 @@ msgstr "*** ลิงก์ %s ไปยัง %s ไม่สำเร็จ" msgid " DeLink limit of %sB hit.\n" msgstr " มาถึงขีดจำกัดการ DeLink ที่ %sB แล้ว\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "แพกเกจไม่มีช่องข้อมูล 'Package'" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s ไม่มีข้อมูล override\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " ผู้ดูแล %s คือ %s ไม่ใช่ %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s ไม่มีข้อมูล override สำหรับซอร์ส\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ไม่มีข้อมูล override สำหรับไบนารีเช่นกัน\n" @@ -639,7 +640,7 @@ msgstr "ไม่สามารถเปลี่ยนชื่อ %s ไป msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "คอมไพล์นิพจน์เรกิวลาร์ไม่สำเร็จ - %s" @@ -800,11 +801,11 @@ msgstr "มีแพกเกจที่จำเป็นต้องถอด msgid "Internal error, Ordering didn't finish" msgstr "ข้อผิดพลาดภายใน: การเรียงลำดับไม่เสร็จสิ้น" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "ไม่สามารถล็อคไดเรกทอรีดาวน์โหลด" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "ไม่สามารถอ่านรายชื่อแหล่งแพกเกจได้" @@ -833,8 +834,8 @@ msgstr "หลังจากการกระทำนี้ ต้องใ msgid "After this operation, %sB disk space will be freed.\n" msgstr "หลังจากการกระทำนี้ เนื้อที่บนดิสก์จะว่างเพิ่มอีก %sB\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "ไม่สามารถคำนวณพื้นที่ว่างใน %s" @@ -871,7 +872,7 @@ msgstr "เลิกทำ" msgid "Do you want to continue [Y/n]? " msgstr "คุณต้องการจะดำเนินการต่อไปหรือไม่ [Y/n]?" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "ไม่สามารถดาวน์โหลด %s %s\n" @@ -880,7 +881,7 @@ msgstr "ไม่สามารถดาวน์โหลด %s %s\n" msgid "Some files failed to download" msgstr "ดาวน์โหลดบางแฟ้มไม่สำเร็จ" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "ดาวน์โหลดสำเร็จแล้ว และอยู่ในโหมดดาวน์โหลดอย่างเดียว" @@ -976,50 +977,50 @@ msgstr "ไม่พบรุ่น '%s' ของ '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "เลือกรุ่น %s (%s) สำหรับ %s แล้ว\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "คำสั่ง update ไม่รับอาร์กิวเมนต์เพิ่ม" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "ไม่สามารถล็อคไดเรกทอรีรายชื่อแพกเกจ" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "apt ถูกกำหนดไม่ให้มีการลบใดๆ จึงไม่สามารถดำเนินการถอดถอนอัตโนมัติได้" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "แพกเกจต่อไปนี้ถูกติดตั้งแบบอัตโนมัติไว้ และไม่ต้องใช้อีกต่อไปแล้ว:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "ใช้ 'apt-get autoremove' เพื่อลบแพกเกจดังกล่าวได้" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1037,43 +1038,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "ข้อมูลต่อไปนี้อาจช่วยแก้ปัญหาได้:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AutoRemover ทำความเสียหาย" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: AllUpgrade ทำความเสียหาย" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "ไม่พบงาน %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "ไม่พบแพกเกจ %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "หมายเหตุ: จะเลือก %s สำหรับนิพจน์เรกิวลาร์ '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "กำหนด %s ให้เป็นการติดตั้งแบบเลือกเองแล้ว\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "คุณอาจเรียก `apt-get -f install' เพื่อแก้ปัญหานี้ได้:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1081,7 +1082,7 @@ msgstr "" "มีปัญหาความขึ้นต่อกันระหว่างแพกเกจ กรุณาลองใช้ 'apt-get -f install' โดยไม่ระบุแพกเกจ " "(หรือจะระบุทางแก้ก็ได้)" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1092,122 +1093,122 @@ msgstr "" "หรือถ้าคุณกำลังใช้รุ่น unstable ก็เป็นไปได้ว่าแพกเกจที่จำเป็นบางรายการ\n" "ยังไม่ถูกสร้างขึ้น หรือถูกย้ายออกจาก Incoming" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "แพกเกจมีปัญหา" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "จะติดตั้งแพกเกจเพิ่มเติมต่อไปนี้:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "แพกเกจที่แนะนำ:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "แพกเกจที่ควรใช้ร่วมกัน:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "กำลังคำนวณการปรับรุ่น... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "ล้มเหลว" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "เสร็จแล้ว" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "เกิดข้อผิดพลาดภายใน: กลไกการแก้ปัญหาทำความเสียหาย" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะดาวน์โหลดซอร์สโค้ด" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "ไม่พบแพกเกจซอร์สโค้ดสำหรับ %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "จะข้ามแฟ้ม '%s' ที่ดาวน์โหลดไว้แล้ว\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "คุณมีพื้นที่ว่างเหลือไม่พอใน %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB/%sB\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "ต้องดาวน์โหลดซอร์สโค้ด %sB\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "ดาวน์โหลดซอร์ส %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "ไม่สามารถดาวน์โหลดบางแฟ้ม" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "จะข้ามการแตกซอร์สของซอร์สที่แตกไว้แล้วใน %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "คำสั่งแตกแฟ้ม '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "กรุณาตรวจสอบว่าได้ติดตั้งแพกเกจ 'dpkg-dev' แล้ว\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "คำสั่ง build '%s' ล้มเหลว\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "โพรเซสลูกล้มเหลว" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "ต้องระบุแพกเกจอย่างน้อยหนึ่งแพกเกจที่จะตรวจสอบสิ่งที่ต้องการสำหรับการ build" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "ไม่สามารถอ่านข้อมูลสิ่งที่ต้องการสำหรับการ build ของ %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s ไม่ต้องการสิ่งใดสำหรับ build\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, 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:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1216,30 +1217,30 @@ msgstr "" "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้ เพราะไม่มีแพกเกจ %s " "รุ่นที่จะสอดคล้องกับความต้องการรุ่นของแพกเกจได้" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: แพกเกจ %s ที่ติดตั้งไว้ใหม่เกินไป" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "ไม่สามารถติดตั้งสิ่งเชื่อมโยง %s สำหรับ %s ได้: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "ไม่สามารถติดตั้งสิ่งที่จำเป็นสำหรับการ build ของ %s ได้" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "ติดตั้งสิ่งที่จำเป็นสำหรับการ build ไม่สำเร็จ" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "มอดูลที่รองรับ:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1323,7 +1324,7 @@ msgstr "" "และ apt.conf(5)\n" " APT นี้มีพลังของ Super Cow\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1568,11 +1569,10 @@ msgstr "แฟ้ม %s/%s เขียนทับแฟ้มในแพก #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "ไม่สามารถอ่าน %s" @@ -1602,9 +1602,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "ไดเรกทอรี info และ temp ต้องอยู่ในระบบแฟ้มเดียวกัน" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "กำลังอ่านรายชื่อแพกเกจ" @@ -1736,11 +1736,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 "กำหนดเวลาแก้ไขไม่สำเร็จ" @@ -1800,7 +1800,7 @@ msgstr "หมดเวลารอเชื่อมต่อ" msgid "Server closed the connection" msgstr "เซิร์ฟเวอร์ปิดการเชื่อมต่อ" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "การอ่านข้อมูลผิดพลาด" @@ -1812,7 +1812,7 @@ msgstr "คำตอบท่วมบัฟเฟอร์" msgid "Protocol corruption" msgstr "มีความเสียหายของโพรโทคอล" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "การเขียนข้อมูลผิดพลาด" @@ -1866,7 +1866,7 @@ msgstr "หมดเวลารอเชื่อมต่อซ็อกเก msgid "Unable to accept connection" msgstr "ไม่สามารถรับการเชื่อมต่อ" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "เกิดปัญหาขณะคำนวณค่าแฮชของแฟ้ม" @@ -1930,58 +1930,63 @@ msgstr "ไม่สามารถเชื่อมต่อไปยัง %s msgid "Connecting to %s" msgstr "เชื่อมต่อไปยัง %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "ไม่สามารถเปิดหาที่อยู่ '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "เกิดข้อผิดพลาดชั่วคราวขณะเปิดหาที่อยู่ '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "เกิดปัญหาร้ายแรงบางอย่างขณะเปิดหาที่อยู่ '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "ไม่สามารถเชื่อมต่อไปยัง %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "จะล้มเลิกการติดตั้ง" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: รายการอาร์กิวเมนต์ใน Acquire::gpgv::Options ยาวเกินไป จะจบการทำงาน" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "ข้อผิดพลาดภายใน: ลายเซ็นใช้การได้ แต่ไม่สามารถระบุลายนิ้วมือของกุญแจ?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "พบลายเซ็นที่ใช้การไม่ได้อย่างน้อยหนึ่งรายการ" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "ไม่สามารถเรียก '%s' เพื่อตรวจสอบลายเซ็น (ได้ติดตั้ง gpgv ไว้หรือไม่?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "เกิดข้อผิดพลาดไม่ทราบสาเหตุขณะเรียก gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "ลายเซ็นต่อไปนี้ใช้การไม่ได้:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2030,47 +2035,47 @@ msgstr "การสนับสนุน Content-Range ที่เซิร์ msgid "Unknown date format" msgstr "พบรูปแบบวันที่ที่ไม่รู้จัก" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select ไม่สำเร็จ" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "หมดเวลารอเชื่อมต่อ" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้มผลลัพธ์" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "เกิดข้อผิดพลาดขณะเขียนลงแฟ้ม" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์ ปลายทางอีกด้านหนึ่งปิดการเชื่อมต่อ" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "เกิดข้อผิดพลาดขณะอ่านข้อมูลจากเซิร์ฟเวอร์" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "ไม่สามารถตัดท้ายแฟ้ม" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "ข้อมูลส่วนหัวผิดพลาด" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "เชื่อมต่อไม่สำเร็จ" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "ข้อผิดพลาดภายใน" @@ -2078,18 +2083,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 @@ -2119,52 +2131,52 @@ msgstr "" msgid "Selection %s not found" msgstr "ไม่พบรายการเลือก %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "พบตัวย่อของชนิดที่ข้อมูลไม่รู้จัก: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "ไวยากรณ์ผิดพลาด %s:%u: เริ่มบล็อคโดยไม่มีชื่อ" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "ไวยากรณ์ผิดพลาด %s:%u: แท็กผิดรูปแบบ" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังค่า" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "ไวยากรณ์ผิดพลาด %s:%u: สามารถใช้ directive ที่ระดับบนสุดได้เท่านั้น" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "ไวยากรณ์ผิดพลาด %s:%u: ใช้ include ซ้อนกันมากเกินไป" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "ไวยากรณ์ผิดพลาด %s:%u: include จากที่นี่" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "ไวยากรณ์ผิดพลาด %s:%u: พบ directive '%s' ที่ไม่รองรับ" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "ไวยากรณ์ผิดพลาด %s:%u: มีขยะเกินหลังจบแฟ้ม" @@ -2240,75 +2252,75 @@ msgstr "ไม่สามารถเปลี่ยนไดเรกทอร msgid "Failed to stat the cdrom" msgstr "ไม่สามารถ stat ซีดีรอม" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่อ่านได้อย่างเดียว" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "ไม่สามารถเปิดแฟ้มล็อค %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "จะไม่ใช้การล็อคกับแฟ้มล็อค %s ที่เมานท์ผ่าน nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "ไม่สามารถล็อค %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "รอโพรเซส %s แต่ตัวโพรเซสไม่อยู่" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "โพรเซสย่อย %s เกิดข้อผิดพลาดของการใช้ย่านหน่วยความจำ (segmentation fault)" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "โพรเซสย่อย %s คืนค่าข้อผิดพลาด (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "โพรเซสย่อย %s จบการทำงานกระทันหัน" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "ไม่สามารถเปิดแฟ้ม %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "read: ยังเหลือ %lu ที่ยังไม่ได้อ่าน แต่ข้อมูลหมดแล้ว" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "write: ยังเหลือ %lu ที่ยังไม่ได้เขียน แต่ไม่สามารถเขียนได้" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "เกิดปัญหาขณะปิดแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "เกิดปัญหาขณะลบแฟ้ม" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "เกิดปัญหาขณะ sync แฟ้ม" @@ -2425,52 +2437,52 @@ msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (1 msgid "Unable to parse package file %s (2)" msgstr "ไม่สามารถแจงแฟ้มแพกเกจ %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (dist แบบสัมบูรณ์)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "บรรทัด %lu ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ขณะแจง dist)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "กำลังเปิด %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ยาวเกินไป" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (ชนิด)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "ไม่รู้จักชนิด '%s' ที่บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "บรรทัด %u ในแฟ้มรายชื่อแหล่งแพกเกจ %s ผิดรูปแบบ (id ผู้ผลิต)" @@ -2593,17 +2605,17 @@ msgstr "ไม่สามารถแจงหรือเปิดรายช msgid "You may want to run apt-get update to correct these problems" msgstr "คุณอาจเรียก `apt-get update' เพื่อแก้ปัญหาเหล่านี้ได้" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "ระเบียนผิดรูปแบบในแฟ้มค่าปรับแต่ง: ไม่มีข้อมูลส่วนหัว 'Package'" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "ไม่เข้าใจชนิดการตรึง %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "ไม่ได้ระบุลำดับความสำคัญ (หรือค่าศูนย์) สำหรับการตรึง" @@ -2687,16 +2699,16 @@ msgstr "เกิดข้อผิดพลาดขณะประมวลผ msgid "Package %s %s was not found while processing file dependencies" msgstr "ไม่พบแพกเกจ %s %s ขณะประมวลผลความขึ้นต่อแฟ้ม" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "ไม่สามารถ stat รายการแพกเกจซอร์ส %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "กำลังเก็บข้อมูลแฟ้มที่ตระเตรียมให้" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "เกิดข้อผิดพลาด IO ขณะบันทึกแคชของซอร์ส" @@ -2705,39 +2717,39 @@ msgstr "เกิดข้อผิดพลาด IO ขณะบันทึ msgid "rename failed, %s (%s -> %s)." msgstr "เปลี่ยนชื่อไม่สำเร็จ: %s (%s -> %s)" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum ไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "ผลรวมแฮชไม่ตรงกัน" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, 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 "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง (ไม่มี arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, 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 "ไม่พบแฟ้มสำหรับแพกเกจ %s คุณอาจต้องแก้ปัญหาแพกเกจนี้เอง" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "ขนาดไม่ตรงกัน" @@ -2872,7 +2884,6 @@ msgstr "เขียนแล้ว %i ระเบียน โดยมีแ #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "ขณะเปิดแฟ้มค่าตั้ง %s" @@ -2883,7 +2894,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "ผลรวมแฮชไม่ตรงกัน" @@ -2904,7 +2914,6 @@ msgstr "กำลังถอดถอน %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "ถอดถอน %s อย่างสมบูรณ์แล้ว" @@ -2990,14 +2999,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "ไม่สามารถเข้าใช้พวงกุญแจ: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "ไม่สามารถแพตช์แฟ้ม" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -10,7 +10,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2007-03-29 21:36+0800\n" "Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n" "Language-Team: Tagalog <debian-tl@banwa.upm.edu.ph>\n" @@ -152,7 +152,7 @@ msgstr " Talaang Bersyon:" #: 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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, fuzzy, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s para sa %s %s kinompile noong %s %s\n" @@ -309,7 +309,7 @@ msgstr "" " -c=? Basahin ang talaksang pagkaayos na ito\n" " -o=? Itakda ang isang optiong pagkaayos, hal. -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Hindi makapagsulat sa %s" @@ -447,8 +447,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Luma ang DB, sinusubukang maupgrade ang %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Hindi tanggap ang anyo ng DB. Kung kayo ay nagsariwa mula sa nakaraang " @@ -465,11 +466,11 @@ msgstr "Hindi mabuksan ang talaksang DB %s: %s" msgid "Failed to stat %s" msgstr "Bigo ang pag-stat ng %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Walang kontrol rekord ang arkibo" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Hindi makakuha ng cursor" @@ -534,26 +535,26 @@ msgstr "*** Bigo ang pag-link ng %s sa %s" msgid " DeLink limit of %sB hit.\n" msgstr " DeLink limit na %sB tinamaan.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Walang field ng pakete ang arkibo" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s ay walang override entry\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " Tagapangalaga ng %s ay %s hindi %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s ay walang override entry para sa pinagmulan\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s ay wala ring override entry na binary\n" @@ -657,7 +658,7 @@ msgstr "Bigo ang pagpangalan muli ng %s tungong %s" msgid "Y" msgstr "O" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Error sa pag-compile ng regex - %s" @@ -822,11 +823,11 @@ msgstr "" msgid "Internal error, Ordering didn't finish" msgstr "Error na internal, hindi natapos ang pagsaayos na pagkasunud-sunod" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Hindi maaldaba ang directory ng download" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Hindi mabasa ang talaan ng pagkukunan (sources)." @@ -858,8 +859,8 @@ msgstr "" msgid "After this operation, %sB disk space will be freed.\n" msgstr "Matapos magbuklat ay %sB na puwang sa disk ang mapapalaya.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Hindi matantsa ang libreng puwang sa %s" @@ -896,7 +897,7 @@ msgstr "Abort." msgid "Do you want to continue [Y/n]? " msgstr "Nais niyo bang magpatuloy [O/h]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Bigo sa pagkuha ng %s %s\n" @@ -905,7 +906,7 @@ msgstr "Bigo sa pagkuha ng %s %s\n" msgid "Some files failed to download" msgstr "May mga talaksang hindi nakuha" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Kumpleto ang pagkakuha ng mga talaksan sa modong pagkuha lamang" @@ -1003,51 +1004,51 @@ msgstr "Bersyon '%s' para sa '%s' ay hindi nahanap" msgid "Selected version %s (%s) for %s\n" msgstr "Ang napiling bersyon %s (%s) para sa %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Ang utos na update ay hindi tumatanggap ng mga argumento" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Hindi maaldaba ang directory ng talaan" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "Ang sumusunod na mga paketeng BAGO ay iluluklok:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1063,46 +1064,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "" "Ang sumusunod na impormasyon ay maaaring makatulong sa pag-ayos ng problema:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Internal error, nakasira ng bagay-bagay ang AllUpgrade" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Hindi mahanap ang paketeng %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Paunawa, pinili ang %s para sa regex '%s'\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "ngunit ang %s ay iluluklok" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Maaaring patakbuhin niyo ang `apt-get -f install' upang ayusin ang mga ito:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1110,7 +1111,7 @@ msgstr "" "May mga dependensiyang kulang. Subukan ang 'apt-get -f install' na walang " "mga pakete (o magtakda ng solusyon)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1121,115 +1122,115 @@ msgstr "" "o kung kayo'y gumagamit ng pamudmod na unstable ay may ilang mga paketeng\n" "kailangan na hindi pa nalikha o linipat mula sa Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Sirang mga pakete" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Ang mga sumusunod na extra na pakete ay luluklokin:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Mga paketeng mungkahi:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Mga paketeng rekomendado:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Sinusuri ang pag-upgrade... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Bigo" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Tapos" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Error na internal, may nasira ang problem resolver" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Kailangang magtakda ng kahit isang pakete na kunan ng source" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Hindi mahanap ang paketeng source para sa %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Linaktawan ang nakuha na na talaksan '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Kulang kayo ng libreng puwang sa %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Kailangang kumuha ng %sB/%sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Kailangang kumuha ng %sB ng arkibong source.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Kunin ang Source %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Bigo sa pagkuha ng ilang mga arkibo." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Linaktawan ang pagbuklat ng nabuklat na na source sa %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Bigo ang utos ng pagbuklat '%s'.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Paki-siguro na nakaluklok ang paketeng 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Utos na build '%s' ay bigo.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Bigo ang prosesong anak" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "Kailangang magtakda ng kahit isang pakete na susuriin ang builddeps" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Hindi makuha ang impormasyong build-dependency para sa %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "Walang build depends ang %s.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1238,7 +1239,7 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil ang paketeng %s ay hindi " "mahanap" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1247,32 +1248,32 @@ msgstr "" "Dependensiyang %s para sa %s ay hindi mabuo dahil walang magamit na bersyon " "ng paketeng %s na tumutugon sa kinakailangang bersyon" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Bigo sa pagbuo ng dependensiyang %s para sa %s: Ang naka-instol na paketeng %" "s ay bagong-bago pa lamang." -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Bigo sa pagbuo ng dependensiyang %s para sa %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Hindi mabuo ang build-dependencies para sa %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Bigo sa pagproseso ng build dependencies" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Suportadong mga Module:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1355,7 +1356,7 @@ msgstr "" "para sa karagdagang impormasyon at mga option.\n" " Ang APT na ito ay may Kapangyarihan Super Kalabaw.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1604,11 +1605,10 @@ msgstr "Ang talaksang %s/%s ay pumapatong sa isang talaksan sa paketeng %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Hindi mabasa ang %s" @@ -1638,9 +1638,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Ang info at temp directory ay kailangang nasa parehong filesystem" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Binabasa ang Listahan ng mga Pakete" @@ -1775,11 +1775,11 @@ msgid "File not found" msgstr "Hindi Nahanap ang Talaksan" #: 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 "Bigo ang pag-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 "Bigo ang pagtakda ng oras ng pagbago" @@ -1841,7 +1841,7 @@ msgstr "Lumipas ang koneksyon" msgid "Server closed the connection" msgstr "Sinarhan ng server ang koneksyon" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Error sa pagbasa" @@ -1853,7 +1853,7 @@ msgstr "May sagot na bumubo sa buffer." msgid "Protocol corruption" msgstr "Sira ang protocol" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Error sa pagsulat" @@ -1907,7 +1907,7 @@ msgstr "Nag-timeout ang socket ng datos" msgid "Unable to accept connection" msgstr "Hindi makatanggap ng koneksyon" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Problema sa pag-hash ng talaksan" @@ -1971,63 +1971,68 @@ msgstr "Hindi maka-konekta sa %s:%s (%s)." msgid "Connecting to %s" msgstr "Kumokonekta sa %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Hindi maresolba ang '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Pansamantalang kabiguan sa pagresolba ng '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "May naganap na kababalaghan sa pagresolba ng '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Hindi maka-konekta sa %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Hindi mabasa ang keyring: '%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Ina-abort ang pag-instol." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Sobrang haba ng talaan ng argumento mula sa Acquire::gpgv::Options. " "Lalabas." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Error na internal: Tanggap na lagda, ngunit hindi malaman ang key " "fingerprint?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Hindi kukulang sa isang hindi tanggap na lagda ang na-enkwentro." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Hindi maitakbo ang '%s' upang maberipika ang lagda (nakaluklok ba ang gpgv?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Hindi kilalang error sa pag-execute ng gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Ang sumusunod na mga lagda ay imbalido:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2078,48 +2083,48 @@ msgstr "Sira ang range support ng HTTP server na ito" msgid "Unknown date format" msgstr "Di kilalang anyo ng petsa" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Bigo ang pagpili" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Nag-timeout ang koneksyon" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Error sa pagsulat ng talaksang output" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Error sa pagsulat sa talaksan" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Error sa pagsusulat sa talaksan" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Error sa pagbasa mula sa server, sinarhan ng remote ang koneksyon" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Error sa pagbasa mula sa server" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Bigo sa pagsulat ng talaksang %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Maling datos sa panimula" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Bigo ang koneksyon" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Internal na error" @@ -2127,18 +2132,25 @@ msgstr "Internal na error" msgid "Can't mmap an empty file" msgstr "Hindi mai-mmap ang talaksang walang laman" -#: 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 "Hindi makagawa ng mmap ng %lu na 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 @@ -2168,53 +2180,53 @@ msgstr "" msgid "Selection %s not found" msgstr "Piniling %s ay hindi nahanap" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Hindi kilalang katagang uri: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Syntax error %s:%u: Nag-umpisa ang block na walang pangalan." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Syntax error %s:%u: Maling anyo ng Tag" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Syntax error %s:%u: May basura matapos ng halaga" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Syntax error %s:%u: Maaari lamang gawin ang mga direktiba sa tuktok na antas" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Syntax error %s:%u: Labis ang pagkaka-nest ng mga include" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Syntax error %s:%u: Sinama mula dito" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Syntax error %s:%u: Di suportadong direktiba '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Syntax error %s:%u: May basura sa dulo ng talaksan" @@ -2292,78 +2304,78 @@ msgstr "Di makalipat sa %s" msgid "Failed to stat the cdrom" msgstr "Bigo sa pag-stat ng cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Hindi ginagamit ang pagaldaba para sa basa-lamang na talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Hindi mabuksan ang talaksang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Hindi gumagamit ng pag-aldaba para sa talaksang aldaba %s na naka-mount sa " "nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "hindi makuha ang aldaba %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Naghintay, para sa %s ngunit wala nito doon" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Nakatanggap ang sub-process %s ng segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Naghudyat ang sub-process %s ng error code (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Ang sub-process %s ay lumabas ng di inaasahan" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Hindi mabuksan ang talaksang %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "pagbasa, mayroong %lu na babasahin ngunit walang natira" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "pagsulat, mayroon pang %lu na isusulat ngunit hindi makasulat" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Problema sa pagsara ng talaksan" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Problema sa pag-unlink ng talaksan" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Problema sa pag-sync ng talaksan" @@ -2481,52 +2493,52 @@ msgstr "Hindi ma-parse ang talaksang pakete %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Hindi ma-parse ang talaksang pakete %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (URI parse)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Maling anyo ng linyang %lu sa talaan ng pagkukunan %s (dist parse)<" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Binubuksan %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Labis ang haba ng linyang %u sa talaksang pagkukunan %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (uri)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Hindi kilalang uri '%s' sa linyang %u sa talaksan ng pagkukunan %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Maling anyo ng linyang %u sa talaksang pagkukunan %s (vendor id)" @@ -2658,17 +2670,17 @@ msgstr "" "Maaaring patakbuhin niyo ang apt-get update upang ayusin ang mga problemang " "ito" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Di tanggap na record sa talaksang pagtatangi, walang Package header" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Hindi naintindihan ang uri ng pin %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Walang prioridad (o sero) na nakatakda para sa pin" @@ -2755,16 +2767,16 @@ msgid "Package %s %s was not found while processing file dependencies" msgstr "" "Hindi nahanap ang paketeng %s %s habang prinoseso ang mga dependensiya." -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Hindi ma-stat ang talaan ng pagkukunan ng pakete %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Kinukuha ang Talaksang Provides" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "IO Error sa pag-imbak ng source cache" @@ -2773,20 +2785,20 @@ msgstr "IO Error sa pag-imbak ng source cache" msgid "rename failed, %s (%s -> %s)." msgstr "pagpalit ng pangalan ay bigo, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Di tugmang MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Walang public key na magamit para sa sumusunod na key ID:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2795,7 +2807,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito. (dahil sa walang arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2804,7 +2816,7 @@ msgstr "" "Hindi ko mahanap ang talaksan para sa paketeng %s. Maaaring kailanganin " "niyong ayusin ng de kamay ang paketeng ito." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2812,7 +2824,7 @@ msgstr "" "Sira ang talaksang index ng mga pakete. Walang Filename: field para sa " "paketeng %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Di tugmang laki" @@ -2950,7 +2962,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Binubuksan ang talaksang pagsasaayos %s" @@ -2981,7 +2992,6 @@ msgstr "Tinatanggal ang %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Natanggal ng lubusan ang %s" @@ -3065,14 +3075,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Hindi mai-patch ang talaksan" +#: 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 "Nagsara ng maaga ang koneksyon" +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Hindi mabasa ang keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Hindi mai-patch ang talaksan" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt-all\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2006-07-29 15:57+0300\n" "Last-Translator: Artem Bondarenko <artem.brz@gmail.com>\n" "Language-Team: Українська <uk@li.org>\n" @@ -148,7 +148,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 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" @@ -302,7 +302,7 @@ msgstr "" " -c=? Читати зазначений конфігураційний файл\n" " -o=? Вказати довільну опцію, наприклад, -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Неможливо записати в %s" @@ -445,8 +445,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB застаріла, намагаюсь оновити %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Формати DB не є правильним. Якщо ви оновилися зі старої версії apt, будь-" @@ -463,11 +464,11 @@ msgstr "Не вдалося відкрити DB файл %s: %s" msgid "Failed to stat %s" msgstr "Не вдалося одержати атрибути %s" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "В архіві немає поля control" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Неможливо одержати курсор" @@ -532,26 +533,26 @@ msgstr "*** Не вдалося створити посилання %s на %s" msgid " DeLink limit of %sB hit.\n" msgstr "Перевищено ліміт в %s в DeLink.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "В архіві немає поля package" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " Відсутній запис про перепризначення для %s\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " пакунок %s супроводжує %s, а не %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr "" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr "" @@ -655,7 +656,7 @@ msgstr "Не вдалося перейменувати %s в %s" msgid "Y" msgstr "Т" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Помилка компіляції регулярного виразу - %s" @@ -820,11 +821,11 @@ msgstr "Пакунки необхідно видалити, але видале msgid "Internal error, Ordering didn't finish" msgstr "Внутрішня помилка, Ordering не завершилася" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Неможливо заблокувати теку для завантаження" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Неможливо прочитати перелік джерел." @@ -854,8 +855,8 @@ msgid "After this operation, %sB disk space will be freed.\n" msgstr "" "Після розпакування об'єм зайнятого дискового простору зменшиться на %sB.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Не вдалося визначити кількість вільного місця в %s" @@ -894,7 +895,7 @@ msgstr "Перервано." msgid "Do you want to continue [Y/n]? " msgstr "Бажаєте продовжити [Т/н]? " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Не вдалося завантажити %s %s\n" @@ -903,7 +904,7 @@ msgstr "Не вдалося завантажити %s %s\n" msgid "Some files failed to download" msgstr "Деякі файли не вдалося завантажити" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Вказано режим \"тільки завантаження\", і завантаження завершено" @@ -1003,51 +1004,51 @@ msgstr "Версія '%s' для '%s' не знайдена" msgid "Selected version %s (%s) for %s\n" msgstr "Обрана версія %s (%s) для %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Команді update не потрібні аргументи" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Неможливо заблокувати теку з переліками пакунків" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 #, fuzzy msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "НОВІ пакунки були встановлені автоматично і більше не потрібні:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Використовуйте 'apt-get autoremove' щоб видалити їх." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1065,46 +1066,46 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Наступна інформація можливо допоможе Вам:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 #, fuzzy msgid "Internal Error, AutoRemover broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Внутрішня помилка, AllUpgrade все поламав" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, fuzzy, c-format msgid "Couldn't find task %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Не можу знайти пакунок %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Помітьте, регулярний вираз %2$s призводить до вибору %1$s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, fuzzy, c-format msgid "%s set to manually installed.\n" msgstr "але %s буде встановлений" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "" "Можливо, для виправлення цих помилок Ви захочете скористатися 'apt-get -f " "install':" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1112,7 +1113,7 @@ msgstr "" "Незадоволені залежності. Спробуйте виконати 'apt-get -f install', не " "вказуючи імені пакунка (або знайдіть інше рішення)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,121 +1124,121 @@ msgstr "" "або ж використаєте нестабільний дистрибутив, і запитані Вами пакунки\n" "ще не створені або були вилучені з Incoming." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Зламані пакунки" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Будуть встановлені наступні додаткові пакунки:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Пропоновані пакунки:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Рекомендовані пакунки:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Обчислення оновлень... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Невдача" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Виконано" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Внутрішня помилка, вирішувач проблем все поламав" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "" "Вкажіть як мінімум один пакунок, для якого необхідно завантажити вихідні " "тексти" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Неможливо знайти пакунок з вихідними текстами для %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Пропускаємо вже завантажений файл '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Недостатньо місця в %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Необхідно завантажити %sB/%sB з архівів вихідних текстів.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Потрібно завантажити %sB архівів з вихідними текстами.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Завантаження вихідних текстів %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Деякі архіви не вдалося завантажити." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "" "Розпакування вихідних текстів пропущено, тому що в %s вже перебувають " "розпаковані вихідні тексти\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Команда розпакування '%s' завершилася невдало.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Перевірте, чи встановлений пакунок 'dpkg-dev'.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Команда побудови '%s' закінчилася невдало.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Породжений процес завершився невдало" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Для перевірки залежностей для побудови необхідно вказати як мінімум один " "пакунок" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Неможливо одержати інформацію про залежності для побудови %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s не має залежностей для побудови.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " @@ -1245,7 +1246,7 @@ msgid "" msgstr "" "Залежність типу %s для %s не може бути задоволена, бо пакунок %s не знайдено" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1254,32 +1255,32 @@ msgstr "" "Залежність типу %s для %s не може бути задоволена, бо ні одна з версій " "пакунка %s не задовольняє умови" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Не вдалося задовольнити залежність типу %s для пакунка %s: Встановлений " "пакунок %s новіше, аніж треба" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Неможливо задовольнити залежність типу %s для пакунка %s: %s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Залежності для побудови %s не можуть бути задоволені." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Обробка залежностей для побудови закінчилася невдало" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Підтримувані модулі:" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1366,7 +1367,7 @@ msgstr "" "містять більше інформації.\n" " This APT has Super Cow Powers.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1617,11 +1618,10 @@ msgstr "Файл %s/%s перезаписує інший з пакету %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Неможливо прочитати %s" @@ -1651,9 +1651,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "Теки info і temp повинні бути на тій самій файловій системі" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Читання переліків пакетів" @@ -1790,11 +1790,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 "Не вдалося встановити час модифікації" @@ -1856,7 +1856,7 @@ msgstr "Час з'єднання вичерпався" msgid "Server closed the connection" msgstr "Сервер закрив з'єднання" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Помилка читання" @@ -1868,7 +1868,7 @@ msgstr "Відповідь переповнила буфер." msgid "Protocol corruption" msgstr "Спотворений протокол" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Помилка запису" @@ -1924,7 +1924,7 @@ msgstr "Час з'єднання з сокетом даних вичерпавс msgid "Unable to accept connection" msgstr "Неможливо прийняти з'єднання" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Проблема хешування файла" @@ -1988,61 +1988,66 @@ msgstr "Не можливо під'єднатися до %s:%s (%s)." msgid "Connecting to %s" msgstr "З'єднання з %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Не можу знайти IP адрес для %s" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Тимчасова помилка при отриманні IP адреси '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Сталося щось дивне при спробі отримати IP адрес для '%s:%s' (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Не можливо під'єднатися до %s %s:" -#: methods/gpgv.cc:71 +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 #, fuzzy, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Неможливо отримати доступ до keyring: '%s'" +msgid "No keyring installed in %s." +msgstr "Переривається встановлення." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "" "E: Перелік аргументів з Acquire::gpgv::Options занадто довгий. Відміна." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "" "Внутрішня помилка: Вірний підпис (signature), але не можливо визначити його " "відбиток?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Знайдено як мінімум один невірний підпис." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "Неможливо виконати '%s' для перевірки підпису, gpgv встановлено?" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Невідома помилка виконання gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Слідуючі підписи були невірними:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2093,50 +2098,50 @@ msgstr "Цей HTTP сервер має поламану підтримку 'ran msgid "Unknown date format" msgstr "Невідомий формат дати" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Вибір не вдався" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Час очікування з'єднання вийшов" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Помилка запису в вихідний файл" -#: methods/http.cc:849 +#: methods/http.cc:850 #, fuzzy msgid "Error writing to file" msgstr "Помилка запису в файл" -#: methods/http.cc:877 +#: methods/http.cc:878 #, fuzzy msgid "Error writing to the file" msgstr "Помилка запису в файл" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Помилка читання з сервера. Віддалена сторона закрила з'єднання" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Помилка читання з сервера" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 #, fuzzy msgid "Failed to truncate file" msgstr "Не вдалося записати файл %s" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Погана заголовкова інформація" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "З'єднання не вдалося" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Внутрішня помилка" @@ -2144,18 +2149,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 @@ -2185,54 +2197,54 @@ msgstr "" msgid "Selection %s not found" msgstr "Вибір %s не знайдено" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Нерозпізнаваний тип абревіатури: '%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Відкривається конфігураційний файл %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Синтаксова помилка %s:%u: Блок починається без назви." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Синтаксова помилка %s:%u: спотворений тег" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Синтаксова помилка %s:%u: зайві символи після величини" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, fuzzy, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "" "Синтаксова помилка %s:%u: Директиви можуть бути виконані тільки на " "найвищому рівні" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Синтаксова помилка %s:%u: Забагато вмонтованих включень" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Синтаксова помилка %s:%u: Включена звідси" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Синтаксова помилка %s:%u: Директива '%s' не підтримується" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Синтаксова помилка %s:%u: зайві символи в кінці файла" @@ -2308,80 +2320,80 @@ msgstr "Неможливо зробити зміни у %s" msgid "Failed to stat the cdrom" msgstr "Не вдалося прочитати атрибути cdrom" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s доступний тільки " "для читання" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Не можливо відкрити lock файл %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "" "Блокування не використовується, так як файл блокування %s знаходиться на " "файловій системі nfs" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, fuzzy, c-format msgid "Could not get lock %s" msgstr "Не можливо отримати lock %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Очікується на %s але його тут немає" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Підпроцес %s отримав segmentation fault." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Підпроцес %s отримав segmentation fault." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Підпроцес %s повернув код помилки (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Підпроцес %s раптово завершився" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Не можливо відкрити файл %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "" "помилка при читанні. мали прочитати ще %lu байт, але нічого більше нема" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "помилка при записі, мали прочитати ще %lu байт, але не змогли" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Проблема з закриттям файла" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Проблема з роз'єднанням файла" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Проблема з синхронізацією файла" @@ -2499,53 +2511,53 @@ msgstr "Неможливо обробити файл %s пакунку (1)" msgid "Unable to parse package file %s (2)" msgstr "Неможливо обробити файл %s пакунку (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Спотворена лінія %lu у переліку джерел %s (проблема в URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "" "Спотворена лінія %lu у переліку джерел %s (проблема в назві дистрибутиву)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "Спотворена лінія %lu у переліку джерел %s (обробка URI)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "Спотворена лінія %lu у переліку джерел %s (absolute dist)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "Спотворена лінія %lu у переліку джерел %s (dist parse)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Відкриття %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Лінія %u занадто довга в переліку джерел %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Спотворена лінія %u у переліку джерел %s (тип)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Невідомий тип '%s' в лінії %u в переліку джерел %s" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Спотворена лінія %u у переліку джерел %s (vendor id)" @@ -2673,17 +2685,17 @@ msgstr "Не можу обробити чи відкрити перелік па msgid "You may want to run apt-get update to correct these problems" msgstr "Можливо, для виправлення цих помилок Ви захочете запустити apt-get" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "Невірний запис в preferences файлі, відсутній заголовок Package" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Не зрозумів тип %s для pin" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Не встановлено пріоритету (або встановлено 0) для pin" @@ -2768,17 +2780,17 @@ msgstr "Помилка, яка була викликана внаслідок о msgid "Package %s %s was not found while processing file dependencies" msgstr "Пакунок %s %s не був знайдений під час обробки залежностей файла" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Не вдалося прочитати атрибути переліку вихідних текстів%s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 #, fuzzy msgid "Collecting File Provides" msgstr "Збирання інформації про файлів " -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Помилка IO під час збереження джерельного кешу" @@ -2787,21 +2799,21 @@ msgstr "Помилка IO під час збереження джерельно msgid "rename failed, %s (%s -> %s)." msgstr "Не вдалося перейменувати, %s (%s -> %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 #, fuzzy msgid "Hash Sum mismatch" msgstr "Невідповідність MD5Sum" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 #, fuzzy 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2810,7 +2822,7 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок. (due to missing arch)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2819,14 +2831,14 @@ msgstr "" "Я не можу знайти файл для пакунку %s. Можливо, Ви захочете власноруч " "виправити цей пакунок." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, 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:1447 msgid "Size mismatch" msgstr "Невідповідність розміру" @@ -2960,7 +2972,6 @@ msgstr "Записано %i записів з %i відсутніми і %i не #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Відкривається конфігураційний файл %s" @@ -2991,7 +3002,6 @@ msgstr "Видаляється %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Повністю видалено %s" @@ -3076,14 +3086,31 @@ 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 "З'єднання завершено передчасно" +#, fuzzy +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Неможливо отримати доступ до keyring: '%s'" + +#~ msgid "Could not patch file" +#~ msgstr "Неможливо накласти латку на файл" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: apt 0.7.14\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2008-12-22 19:04+1030\n" "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n" "Language-Team: Vietnamese <vi-VN@googlegroups.com>\n" @@ -148,7 +148,7 @@ msgstr " Bảng phiên bả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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s cho %s được biên dịch trên %s %s\n" @@ -314,7 +314,7 @@ msgstr "" " -c=? \t\tĐọc tập tin cấu hình này\n" " -o=? \t\tLập một tùy chọn cấu hình nhiệm ý, v.d. « -o dir::cache=/tmp »\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "Không thể ghi vào %s" @@ -463,8 +463,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "Cơ sở dữ liệu cũ nên đang cố nâng cấp lên %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "Dạng thức co sở dữ liệu không hợp lệ. Nếu bạn đã nâng cấp từ một phiên bản " @@ -481,11 +482,11 @@ msgstr "Không thể mở tập tin cơ sở dữ liệu %s: %s." msgid "Failed to stat %s" msgstr "Việc lấy thông tin toàn bộ cho %s bị lỗi" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "Kho không có mục ghi điều khiển" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "Không thể lấy con chạy" @@ -550,26 +551,26 @@ msgstr "*** Việc liên kết %s đến %s bị lỗi" msgid " DeLink limit of %sB hit.\n" msgstr " Hết hạn bỏ liên kết của %sB.\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "Kho không có trường gói" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s không có mục ghi đè\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " người bảo quản %s là %s không phải %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s không có mục ghi đè nguồn\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s cũng không có mục ghi đè nhị phân\n" @@ -673,7 +674,7 @@ msgstr "Việc đổi tên %s thành %s bị lỗi" msgid "Y" msgstr "C" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "Lỗi biên dich biểu thức chính quy - %s" @@ -836,11 +837,11 @@ msgstr "Cần phải gỡ bỏ một số gói, nhưng mà khả năng Gỡ bỏ msgid "Internal error, Ordering didn't finish" msgstr "Gặp lỗi nội bộ: tiến trình Sắp xếp chưa xong" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "Không thể khóa thư mục tải về" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "Không thể đọc danh sách nguồn." @@ -870,8 +871,8 @@ msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được chiếm.\ msgid "After this operation, %sB disk space will be freed.\n" msgstr "Sau thao tác này, %sB sức chứa đĩa thêm sẽ được giải phóng.\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "Không thể quyết định chỗ rảnh trong %s" @@ -909,7 +910,7 @@ msgstr "Hủy bỏ." msgid "Do you want to continue [Y/n]? " msgstr "Bạn có muốn tiếp tục không? [Y/n] [C/k] " -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "Việc gói %s bị lỗi %s\n" @@ -918,7 +919,7 @@ msgstr "Việc gói %s bị lỗi %s\n" msgid "Some files failed to download" msgstr "Một số tập tin không tải về được" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "Mới tải về xong và trong chế độ chỉ tải về" @@ -1017,52 +1018,52 @@ msgstr "Không tìm thấy phiên bản « %s » cho « %s »" msgid "Selected version %s (%s) for %s\n" msgstr "Đã chọn phiên bản %s (%s) cho %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "Lệnh cập nhật không chấp nhật đối số" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "Không thể khóa thư mục danh sách" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "Không nên xoá gì thì không thể khởi chạy Bộ Gỡ bỏ Tự động" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "" "Theo đây có những gói đã được cài đặt tự động nên không còn cần thiết lại:" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "Hãy sử dụng lệnh « apt-get autoremove » để gỡ bỏ chúng." -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1080,43 +1081,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "Có lẽ thông tin theo đây sẽ giúp đỡ quyết định trường hợp:" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "Lỗi nội bộ : Bộ Gỡ bỏ Tự động đã làm hư gì." -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "Lỗi nội bộ: AllUpgrade (toàn bộ nâng cấp) đã ngắt gì" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "Không tìm thấy tác vụ %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "Không tìm thấy gói %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "Ghi chú : đang chọn %s cho biểu thức chính quy « %s »\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s được đặt thành « được cài đặt bằng tay ».\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "Có lẽ bạn hãy chạy lênh « apt-get -f install » để sửa hết:" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1124,7 +1125,7 @@ msgstr "" "Gói còn phụ thuộc vào phần mềm chưa có. Hãy cố chạy lệnh « apt-get -f install " "» mà không có gói nào (hoặc ghi rõ cách quyết định)." -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1136,123 +1137,123 @@ msgstr "" "bất định, có lẽ chưa tạo một số gói cần thiết,\n" "hoặc chưa di chuyển chúng ra phần Incoming (Đến)." -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "Gói bị ngắt" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "Những gói thêm theo đây sẽ được cài đặt:" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "Gói được đệ nghị:" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "Gói được khuyên:" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "Đang tính nâng cấp... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "Bị lỗi" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "Xong" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "Lỗi nội bộ: bộ tháo gỡ vấn đề đã ngắt gì" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "Phải ghi rõ ít nhất một gói cần lấy nguồn cho nó" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "Không tìm thấy gói nguồn cho %s" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "Đang bỏ qua tập tin đã được tải về « %s »\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "Không đủ sức chứa còn rảnh trong %s" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "Cần phải lấy %sB/%sB kho nguồn.\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "Cần phải lấy %sB kho nguồn.\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "Lấy nguồn %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "Việc lấy một số kho bị lỗi." -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "Đang bỏ qua giải nén nguồn đã giải nén trong %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "Lệnh giải nén « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "Hãy kiểm tra xem gói « dpkg-dev » có được cài đặt chưa.\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "Lệnh xây dụng « %s » bị lỗi.\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "Tiến trình con bị lỗi" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "" "Phải ghi rõ ít nhất một gói cần kiểm tra cách phụ thuộc khi xây dụng cho nó" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "Không thể lấy thông tin về cách phụ thuộc khi xây dụng cho %s" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s không phụ thuộc vào gì khi xây dụng.\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "cách phụ thuộc %s cho %s không thể được thỏa vì không tìm thấy gọi %s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1261,31 +1262,31 @@ msgstr "" "cách phụ thuộc %s cho %s không thể được thỏa vì không có phiên bản sẵn sàng " "của gói %s có thể thỏa điều kiện phiên bản." -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, c-format msgid "Failed to satisfy %s dependency for %s: Installed package %s is too new" msgstr "" "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi vì gói đã cài đặt %s quá mới" -#: cmdline/apt-get.cc:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "Việc cố thỏa cách phụ thuộc %s cho %s bị lỗi: %s." -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "Không thể thỏa cách phụ thuộc khi xây dụng cho %s." -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "Việc xử lý cách phụ thuộc khi xây dụng bị lỗi" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "Mô-đun đã hỗ trợ :" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1377,7 +1378,7 @@ msgstr "" "sources.list(5) và apt.conf(5).\n" " Trình APT này có năng lực của siêu bò.\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1628,11 +1629,10 @@ msgstr "Tập tin %s/%s ghi đè lên điều trong gói %s" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "Không thể đọc %s" @@ -1664,9 +1664,9 @@ msgstr "" "thống tập tin" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "Đang đọc các danh sách gói..." @@ -1802,11 +1802,11 @@ msgid "File not found" msgstr "Không tìm thấy tập tin" #: 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 "Việc lấy các thông tin bị lỗi" -#: 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 "Việc lập giờ sửa đổi bị lỗi" @@ -1868,7 +1868,7 @@ msgstr "Thời hạn kết nối" msgid "Server closed the connection" msgstr "Máy phục vụ đã đóng kết nối" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "Lỗi đọc" @@ -1880,7 +1880,7 @@ msgstr "Một trả lời đã tràn bộ đệm." msgid "Protocol corruption" msgstr "Giao thức bị hỏng" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "Lỗi ghi" @@ -1934,7 +1934,7 @@ msgstr "Kết nối ổ cắm dữ liệu đã quá giờ" msgid "Unable to accept connection" msgstr "Không thể chấp nhận kết nối" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "Gặp khó khăn băm tập tin" @@ -1998,59 +1998,64 @@ msgstr "Không thể kết nối đến %s:%s (%s)." msgid "Connecting to %s" msgstr "Đang kết nối đến %s..." -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "Không thể tháo gỡ « %s »" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "Việc tháo gỡ « %s » bị lỗi tạm thời" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "Gặp lỗi nghiệm trọng khi tháo gỡ « %s:%s » (%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "Không thể kết nối đến %s %s:" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "Không thể truy cập vòng khoá « %s »" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "Đang hủy bỏ cài đặt." + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "E: Danh sách lệnh từ « Acquire::gpgv::Options » quá dài nên thoát." -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "Lỗi nội bộ: chữ ký đúng, nhưng không thể quyết định vân tay khóa ?!" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "Gặp ít nhất một chữ ký không hợp lệ." -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "" "Không thể thực hiện « %s » để kiểm chứng chữ ký (gpgv có được cài đặt chưa?)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "Gặp lỗi lạ khi thực hiện gpgv" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "Những chữ ký theo đây là không hợp lệ:\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2104,47 +2109,47 @@ msgstr "Máy phục vụ HTTP đã ngắt cách hỗ trợ phạm vị" msgid "Unknown date format" msgstr "Không biết dạng ngày" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "Việc chọn bị lỗi" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "Kết nối đã quá giờ" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "Gặp lỗi khi ghi vào tập tin xuất" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "Gặp lỗi khi ghi vào tập tin" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "Gặp lỗi khi ghi vào tập tin đó" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "Gặp lỗi khi đọc từ máy phục vụ : cuối ở xa đã đóng kết nối" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "Gặp lỗi khi đọc từ máy phục vụ" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "Lỗi cắt ngắn tập tin" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "Dữ liệu dòng đầu sai" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "Kết nối bị ngắt" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "Gặp lỗi nội bộ" @@ -2152,18 +2157,25 @@ msgstr "Gặp lỗi nội bộ" msgid "Can't mmap an empty file" msgstr "Không thể mmap (ảnh xạ bộ nhớ) tâp tin rỗng" -#: 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 "Không thể tạo mmap (ảnh xạ bộ nhớ) kích cỡ %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 @@ -2193,52 +2205,52 @@ msgstr "" msgid "Selection %s not found" msgstr "Không tìm thấy vùng chọn %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "Không nhận biết viết tắt kiểu: « %c »" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "Đang mở tập tin cấu hình %s..." -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "Gặp lỗi cú pháp %s:%u: khối bắt đầu không có tên." -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "Gặp lỗi cú pháp %s:%u: thẻ dạng sai" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "Gặp lỗi cú pháp %s:%u: có rác thêm sau giá trị" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "Gặp lỗi cú pháp %s:%u: có thể thực hiện chỉ thị chỉ tại mức đầu" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "Gặp lỗi cú pháp %s:%u: quá nhiều điều bao gồm lồng nhau" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "Gặp lỗi cú pháp %s:%u: đã bao gồm từ đây" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "Gặp lỗi cú pháp %s:%u: chưa hỗ trợ chỉ thị « %s »" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "Gặp lỗi cú pháp %s:%u: rác thêm tại kết thúc tập tin" @@ -2314,75 +2326,75 @@ msgstr "Không thể chuyển đổi sang %s" msgid "Failed to stat the cdrom" msgstr "Việc lấy cac thông tin cho đĩa CD-ROM bị lỗi" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa chỉ đọc %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "Không thể mở tập tin khóa %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "Không dùng khả năng khóa cho tập tin khóa đã lắp kiểu NFS %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "Không thể lấy khóa %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "Đã đợi %s nhưng mà chưa gặp nó" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "Tiến trình con %s đã nhận một lỗi chia ra từng đoạn." -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "Tiến trình con %s đã trả lời mã lỗi (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "Tiến trình con %s đã thoát bất ngờ" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "Không thể mở tập tin %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "đọc, còn cần đọc %lu nhưng mà không có điều còn lại" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "ghi, còn cần ghi %lu nhưng mà không thể" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "Gặp lỗi khi đóng tập tin đó" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "Gặp lỗi khi bỏ liên kết tập tin đó" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "Gặp lỗi khi đồng bộ hóa tập tin đó" @@ -2499,55 +2511,55 @@ msgstr "Không thể phân tách tập tin gói %s (1)" msgid "Unable to parse package file %s (2)" msgstr "Không thể phân tách tập tin gói %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (địa chỉ URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách địa chỉ URI)." -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (bản phân phối tuyệt đối)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "" "Gặp dòng dạng sai %lu trong danh sách nguồn %s (phân tách bản phân phối)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "Đang mở %s..." -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "Dòng %u quá dài trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (kiểu)." -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "Không biết kiểu « %s » trên dòng %u trong danh sách nguồn %s." -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "Gặp dòng dạng sai %u trong danh sách nguồn %s (mã nhận biết nhà bán)" @@ -2674,19 +2686,19 @@ msgid "You may want to run apt-get update to correct these problems" msgstr "" "Có lẽ bạn muốn chạy « apt-get update » (lấy cập nhật) để sửa các vấn đề này" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "" "Gặp mục ghi không hợp lệ trong tập tin tùy thích: không có phần đầu Package " "(Gói)." -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "Không hiểu kiểu ghim %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "Chưa ghi rõ ưu tiên (hay số không) cho ghim" @@ -2772,16 +2784,16 @@ msgstr "" msgid "Package %s %s was not found while processing file dependencies" msgstr "Không tìm thấy gói %s %s khi xử lý cách phụ thuộc của/vào tập tin" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "Không thể lấy các thông tin về danh sách gói nguồn %s" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "Đang tập hợp các trường hợp « tập tin miễn là »" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" @@ -2790,19 +2802,19 @@ msgstr "Lỗi nhập/xuất khi lưu bộ nhớ tạm nguồn" msgid "rename failed, %s (%s -> %s)." msgstr "việc thay đổi tên bị lỗi, %s (%s → %s)." -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum (tổng kiểm) không khớp được" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Sai khớp tổng băm (hash sum)" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 msgid "There is no public key available for the following key IDs:\n" msgstr "Không có khóa công sẵn sàng cho những ID khóa theo đây:\n" -#: apt-pkg/acquire-item.cc:1216 +#: apt-pkg/acquire-item.cc:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2811,7 +2823,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này, do thiếu kiến trúc." -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2820,7 +2832,7 @@ msgstr "" "Không tìm thấy tập tin liên quan đến gói %s. Có lẽ bạn cần phải tự sửa gói " "này." -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." @@ -2828,7 +2840,7 @@ msgstr "" "Các tập tin chỉ mục của gói này bị hỏng. Không có trường Filename: (Tên tập " "tin:) cho gói %s." -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "Kích cỡ không khớp được" @@ -2964,7 +2976,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "Đang mở tập tin cấu hình %s..." @@ -2975,7 +2986,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Sai khớp tổng băm (hash sum)" @@ -2996,7 +3006,6 @@ msgstr "Đang gỡ bỏ %s..." #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "Mới gỡ bỏ hoàn toàn %s" @@ -3080,14 +3089,30 @@ msgstr "" msgid "Not locked" msgstr "" -#: methods/rred.cc:219 -msgid "Could not patch file" -msgstr "Không thể vá lỗi trong tập tin %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 "Kết nối bị đóng quá sớm." +#~ msgid "Couldn't access keyring: '%s'" +#~ msgstr "Không thể truy cập vòng khoá « %s »" + +#~ msgid "Could not patch file" +#~ msgstr "Không thể vá lỗi trong tập tin %s" + # Variable: do not translate/ biến: đừng dịch #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 8f4e1440c..56c64e451 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: apt\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-12-02 01:00+0800\n" "Last-Translator: Aron Xu <happyaron.xu@gmail.com>\n" "Language-Team: Debian Chinese [GB] <debian-chinese-gb@lists.debian.org>\n" @@ -148,7 +148,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s，用于 %s 构架，编译于 %s %s\n" @@ -300,7 +300,7 @@ msgstr "" " -c=? 读指定的配置文件\n" " -o=? 设置任意指定的配置选项，例如 -o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "无法写入 %s" @@ -433,8 +433,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "数据库已过期，现尝试进行升级 %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "数据库格式无效。如果您是从一个老版本的 apt 升级而来，请删除数据库并重建它。" @@ -450,11 +451,11 @@ msgstr "无法打开数据库文件 %s：%s" msgid "Failed to stat %s" msgstr "无法获得 %s 的状态" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "归档文件没有包含控制字段" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "无法获得游标" @@ -519,26 +520,26 @@ msgstr "*** 无法将 %s 链接到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 达到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "归档文件没有包含 package 字段" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s 中没有 override 项\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的维护者 %s 并非 %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s 没有源代码的 override 项\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 中没有二进制文件的 override 项\n" @@ -642,7 +643,7 @@ msgstr "无法将 %s 重命名为 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "编译正则表达式时出错 - %s" @@ -803,11 +804,11 @@ msgstr "有软件包需要被卸载，但是卸载动作被程序设置所禁止 msgid "Internal error, Ordering didn't finish" msgstr "内部错误，Ordering 未能完成" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "无法锁定下载目录" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "无法读取源列表。" @@ -836,8 +837,8 @@ msgstr "解压缩后会消耗掉 %sB 的额外空间。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "解压缩后将会空出 %sB 的空间。\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "无法获知您在 %s 上的可用空间" @@ -874,7 +875,7 @@ msgstr "中止执行。" msgid "Do you want to continue [Y/n]? " msgstr "您希望继续执行吗？[Y/n]" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "无法下载 %s %s\n" @@ -883,7 +884,7 @@ msgstr "无法下载 %s %s\n" msgid "Some files failed to download" msgstr "有一些文件无法下载" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "下载完毕，目前是“仅下载”模式" @@ -980,51 +981,50 @@ msgstr "未找到“%2$s”的“%1$s”版本" msgid "Selected version %s (%s) for %s\n" msgstr "选定了版本为 %s (%s) 的 %s\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format -#| msgid "Couldn't stat source package list %s" msgid "Picking '%s' as source package instead of '%s'\n" msgstr "无法获取源软件包列表 %s 的状态" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr " update 命令不需要参数" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "无法对状态列表目录加锁" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我们不应该进行删除，无法启动自动删除器" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "下列软件包是自动安装的并且现在不需要了：" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "%lu 个自动安装的的软件包现在不需要了\n" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用'apt-get autoremove'来删除它们" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1040,43 +1040,43 @@ msgstr "似乎自动删除工具损坏了一些软件，这不应该发生。请 #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "下列信息可能会对解决问题有所帮助：" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "内部错误，自动删除工具坏事了" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "内部错误，全部升级工具坏事了" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "无法找到任务 %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "无法找到软件包 %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根据正则表达式“%2$s”选中了 %1$s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被设置为手动安装。\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您可能需要运行“apt-get -f install”来纠正下列错误：" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1084,7 +1084,7 @@ msgstr "" "有未能满足的依赖关系。请尝试不指明软件包的名字来运行“apt-get -f install”(也可" "以指定一个解决办法)。" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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,122 +1095,122 @@ msgstr "" "因为系统无法达到您要求的状态造成的。该版本中可能会有一些您需要的软件\n" "包尚未被创建或是它们已被从新到(Incoming)目录移出。" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "破损的软件包" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "将会安装下列额外的软件包：" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "建议安装的软件包：" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "推荐安装的软件包：" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "正在对升级进行计算... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失败" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "内部错误，问题解决工具坏事了" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "要下载源代码，必须指定至少一个对应的软件包" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "无法找到与 %s 对应的源代码包" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "忽略已下载过的文件“%s”\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "您在 %s 上没有足够的可用空间" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下载 %sB/%sB 的源代码包。\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下载 %sB 的源代码包。\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "下载源代码 %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "有一些包文件无法下载。" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "忽略已经被解包到 %s 目录的源代码包\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "运行解包的命令“%s”出错。\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "请检查是否安装了“dpkg-dev”软件包。\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "执行构造软件包命令“%s”失败。\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "子进程出错" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "要检查生成软件包的构建依赖关系，必须指定至少一个软件包" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "无法获得 %s 的构建依赖关系信息" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr " %s 没有构建依赖关系信息。\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "由于无法找到软件包 %3$s ，因此不能满足 %2$s 所要求的 %1$s 依赖关系" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1219,30 +1219,30 @@ msgstr "" "由于无法找到符合要求的软件包 %3$s 的可用版本，因此不能满足 %2$s 所要求的 %1" "$s 依赖关系" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "无法满足 %2$s 所要求 %1$s 依赖关系：%3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "不能满足软件包 %s 所要求的构建依赖关系。" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "无法处理构建依赖关系" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "支持的模块：" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 msgid "" "Usage: apt-get [options] command\n" " apt-get [options] install|remove pkg1 [pkg2 ...]\n" @@ -1325,7 +1325,7 @@ msgstr "" "以获取更多信息和选项。\n" " 本 APT 具有超级牛力。\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1571,11 +1571,10 @@ msgstr "文件 %s/%s 会覆盖属于软件包 %s 中的同名文件" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "无法读取 %s" @@ -1605,9 +1604,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "info 和 temp 目录要求处于同一文件系统之下" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "正在读取软件包列表" @@ -1740,11 +1739,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 "无法设置文件的修改日期" @@ -1805,7 +1804,7 @@ msgstr "连接超时" msgid "Server closed the connection" msgstr "服务器关闭了连接" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "读错误" @@ -1817,7 +1816,7 @@ msgstr "回应超出了缓存区大小。" msgid "Protocol corruption" msgstr "协议有误" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "写出错" @@ -1871,7 +1870,7 @@ msgstr "数据套接字连接超时" msgid "Unable to accept connection" msgstr "无法接受连接" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "把文件加入哈希表时出错" @@ -1935,59 +1934,63 @@ msgstr "无法连接上 %s:%s (%s)。" msgid "Connecting to %s" msgstr "正在连接 %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "无法解析域名“%s”" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暂时不能解析域名“%s”" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format -#| msgid "Something wicked happened resolving '%s:%s' (%i)" msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "解析“%s:%s”时，出现了某些故障(%i)" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, c-format msgid "Unable to connect to %s:%s:" msgstr "不能连接到 %s：%s：" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "无法访问密钥环：“%s”" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "中止安装。" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "错误：Acquire::gpgv::Options 的参数列表太长。结束运行。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "内部错误：签名正确无误，但是无法确认密钥指纹？！" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "至少发现一个无效的签名。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "无法运行“%s”以验证签名(您安装了 gpgv 吗？)" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "运行 gpgv 时发生未知错误" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "下列签名无效：\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2036,47 +2039,47 @@ msgstr "该 HTTP 服务器的 range 支持不正常" msgid "Unknown date format" msgstr "无法识别的日期格式" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "select 调用出错" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "连接超时" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "写输出文件时出错" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "写入文件出错" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "写入文件出错" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "从服务器读取数据时出错，对方关闭了连接" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "从服务器读取数据出错" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "无法截断文件" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "错误的报头数据" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "连接失败" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "内部错误" @@ -2084,12 +2087,12 @@ 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. " @@ -2098,6 +2101,13 @@ msgstr "" "动态 MMap 没有空间了。请增大 APT::Cache-Limit 的大小。当前值：%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 @@ -2127,52 +2137,52 @@ msgstr "%li秒" msgid "Selection %s not found" msgstr "找不到您选则的 %s" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "无法识别的类型缩写：“%c”" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "正在打开配置文件 %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "语法错误 %s:%u：配置小节没有以名字开头" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "语法错误 %s:%u：标签格式有误" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "语法错误 %s:%u: 配置值后有多余的无意义数据" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "语法错误 %s:%u: 只能在顶层配置文件中使用指示" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "语法错误 %s:%u：太多的嵌套 include 命令" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "语法错误 %s:%u: Included from here" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "语法错误 %s:%u: 不支持的指令“%s”" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "语法错误 %s:%u: 文件尾部有多余的无意义的数据" @@ -2248,75 +2258,75 @@ msgstr "无法切换工作目录到 %s" msgid "Failed to stat the cdrom" msgstr "无法读取盘片的状态" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "由于文件系统为只读，因而无法使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "无法打开锁文件 %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "无法在 nfs 文件系统上使用文件锁 %s" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "无法获得锁 %s" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待子进程 %s 的退出，但是它并不存在" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子进程 %s 发生了段错误" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, c-format msgid "Sub-process %s received signal %u." msgstr "子进程 %s 收到信号 %u。" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子进程 %s 返回了一个错误号 (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子进程 %s 异常退出" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "无法打开文件 %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "读取文件出错，还剩 %lu 字节没有读出" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "写入文件出错，还剩 %lu 字节没有保存" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "关闭文件出错" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "用 unlink 删除文件出错" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "同步文件出错" @@ -2433,52 +2443,52 @@ msgstr "无法解析软件包文件 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "无法解析软件包文件 %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "安装源配置文件“%2$s”第 %1$lu 行的格式有误(URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版)" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(URI 解析)" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(独立发行版)" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "安装源配置文件“%2$s”第 %1$lu 行有错误(发行版解析)" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "正在打开 %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "源列表 %2$s 的第 %1$u 行太长了。" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "在源列表 %2$s 中第 %1$u 行的格式有误(类型)" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "无法识别在源列表 %3$s 里，第 %2$u 行中的软件包类别“%1$s”" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "在源列表中 %2$s 中第 %1$u 行的格式有误(供应商 ID)" @@ -2603,17 +2613,17 @@ msgstr "无法解析或打开软件包的列表或是状态文件。" msgid "You may want to run apt-get update to correct these problems" msgstr "您可能需要运行 apt-get update 来解决这些问题" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "首选项文件 %s 中发现有无效的记录，无 Package 字段头" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "无法识别锁定的类型 %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "没有为版本锁定指定优先级(或为零)" @@ -2697,16 +2707,16 @@ msgstr "处理 %s (CollectFileProvides)时出错" msgid "Package %s %s was not found while processing file dependencies" msgstr "当处理文件依赖关系时，无法找到软件包 %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "无法获取源软件包列表 %s 的状态" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "正在收集文件所提供的软件包" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "无法读取或写入软件源缓存" @@ -2715,19 +2725,19 @@ msgstr "无法读取或写入软件源缓存" msgid "rename failed, %s (%s -> %s)." msgstr "无法重命名文件，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5 校验和不符" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash 校验和不符" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2736,7 +2746,7 @@ msgstr "" "我无法找到一个对应 %s 软件包的文件。在这种情况下可能需要您手动修正这个软件" "包。(缘于架构缺失)" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, c-format msgid "" "I wasn't able to locate file for the %s package. This might mean you need to " @@ -2744,13 +2754,13 @@ msgid "" msgstr "" "我无法找到对应 %s 软件包的文件。在这种情况下您可能需要手动修正这个软件包。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "软件包的索引文件已损坏。找不到对应软件包 %s 的 Filename: 字段。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "大小不符" @@ -3000,14 +3010,30 @@ msgstr "dpkg 被中断，您必须手工运行 'dpkg --configure -a' 解决此 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 "Couldn't access keyring: '%s'" +#~ msgstr "无法访问密钥环：“%s”" + +#~ msgid "Could not patch file" +#~ msgstr "无法打开补丁文件" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 2a5c87e59..7033d8d7b 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 0.5.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-01-01 19:13+0100\n" +"POT-Creation-Date: 2010-01-11 15:17+0100\n" "PO-Revision-Date: 2009-01-28 10:41+0800\n" "Last-Translator: Tetralet <tetralet@gmail.com>\n" "Language-Team: Debian-user in Chinese [Big5] <debian-chinese-big5@lists." @@ -148,7 +148,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:2665 cmdline/apt-sortpkgs.cc:144 +#: cmdline/apt-get.cc:2675 cmdline/apt-sortpkgs.cc:144 #, c-format msgid "%s %s for %s compiled on %s %s\n" msgstr "%s %s 是用於 %s 並在 %s %s 上編譯的\n" @@ -301,7 +301,7 @@ msgstr "" " -c=? 讀取指定的設定檔\n" " -o=? 指定任意的設定選項，例如:-o dir::cache=/tmp\n" -#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:830 +#: cmdline/apt-extracttemplates.cc:267 apt-pkg/pkgcachegen.cc:863 #, c-format msgid "Unable to write to %s" msgstr "無法寫入 %s" @@ -432,8 +432,9 @@ msgid "DB is old, attempting to upgrade %s" msgstr "DB 過舊，嘗試升級 %s" #: ftparchive/cachedb.cc:72 +#, fuzzy msgid "" -"DB format is invalid. If you upgraded from a older version of apt, please " +"DB format is invalid. If you upgraded from an older version of apt, please " "remove and re-create the database." msgstr "" "資料庫格式不正確。如果您是由舊版的 apt 升級上來的，請移除並重新建立資料庫。" @@ -449,11 +450,11 @@ msgstr "無法開啟 DB 檔 %s: %s" msgid "Failed to stat %s" msgstr "無法取得 %s 的狀態" -#: ftparchive/cachedb.cc:238 +#: ftparchive/cachedb.cc:242 msgid "Archive has no control record" msgstr "套件檔沒有 control 記錄" -#: ftparchive/cachedb.cc:444 +#: ftparchive/cachedb.cc:448 msgid "Unable to get a cursor" msgstr "無法取得遊標" @@ -518,26 +519,26 @@ msgstr "*** 無法將 %s 連結到 %s" msgid " DeLink limit of %sB hit.\n" msgstr " 達到了 DeLink 的上限 %sB。\n" -#: ftparchive/writer.cc:388 +#: ftparchive/writer.cc:389 msgid "Archive had no package field" msgstr "套件檔裡沒有套件資訊" -#: ftparchive/writer.cc:396 ftparchive/writer.cc:627 +#: ftparchive/writer.cc:397 ftparchive/writer.cc:628 #, c-format msgid " %s has no override entry\n" msgstr " %s 沒有重新定義項目\n" -#: ftparchive/writer.cc:457 ftparchive/writer.cc:715 +#: ftparchive/writer.cc:458 ftparchive/writer.cc:716 #, c-format msgid " %s maintainer is %s not %s\n" msgstr " %s 的維護者是 %s，而非 %s\n" -#: ftparchive/writer.cc:637 +#: ftparchive/writer.cc:638 #, c-format msgid " %s has no source override entry\n" msgstr " %s 沒有原始碼重新定義項目\n" -#: ftparchive/writer.cc:641 +#: ftparchive/writer.cc:642 #, c-format msgid " %s has no binary override entry either\n" msgstr " %s 也沒有二元碼重新定義項目\n" @@ -641,7 +642,7 @@ msgstr "無法將 %s 更名為 %s" msgid "Y" msgstr "Y" -#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1730 +#: cmdline/apt-get.cc:149 cmdline/apt-get.cc:1740 #, c-format msgid "Regex compilation error - %s" msgstr "編譯正規表示式時發生錯誤 - %s" @@ -802,11 +803,11 @@ msgstr "有套件需要被移除，但卻被禁止移除。" msgid "Internal error, Ordering didn't finish" msgstr "內部錯誤，排序未能完成" -#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2072 cmdline/apt-get.cc:2105 +#: cmdline/apt-get.cc:811 cmdline/apt-get.cc:2082 cmdline/apt-get.cc:2115 msgid "Unable to lock the download directory" msgstr "無法鎖定下載目錄" -#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2153 cmdline/apt-get.cc:2406 +#: cmdline/apt-get.cc:821 cmdline/apt-get.cc:2163 cmdline/apt-get.cc:2416 #: apt-pkg/cachefile.cc:65 msgid "The list of sources could not be read." msgstr "無法讀取來源列表。" @@ -835,8 +836,8 @@ msgstr "此操作完成之後，會多佔用 %sB 的磁碟空間。\n" msgid "After this operation, %sB disk space will be freed.\n" msgstr "此操作完成之後，會空出 %sB 的磁碟空間。\n" -#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2249 -#: cmdline/apt-get.cc:2252 +#: cmdline/apt-get.cc:867 cmdline/apt-get.cc:870 cmdline/apt-get.cc:2259 +#: cmdline/apt-get.cc:2262 #, c-format msgid "Couldn't determine free space in %s" msgstr "無法確認 %s 的未使用空間" @@ -873,7 +874,7 @@ msgstr "放棄執行。" msgid "Do you want to continue [Y/n]? " msgstr "是否繼續進行 [Y/n]？" -#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2303 apt-pkg/algorithms.cc:1389 +#: cmdline/apt-get.cc:993 cmdline/apt-get.cc:2313 apt-pkg/algorithms.cc:1389 #, c-format msgid "Failed to fetch %s %s\n" msgstr "無法取得 %s，%s\n" @@ -882,7 +883,7 @@ msgstr "無法取得 %s，%s\n" msgid "Some files failed to download" msgstr "有部份檔案無法下載" -#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2312 +#: cmdline/apt-get.cc:1012 cmdline/apt-get.cc:2322 msgid "Download complete and in download only mode" msgstr "下載完成，且這是『僅下載』模式" @@ -978,50 +979,50 @@ msgstr "找不到 '%s' 版的 '%s'" msgid "Selected version %s (%s) for %s\n" msgstr "選定的版本為 %3$s 的 %1$s (%2$s)\n" -#. if (VerTag.empty() == false && Last == 0) -#: cmdline/apt-get.cc:1311 cmdline/apt-get.cc:1379 -#, c-format -msgid "Ignore unavailable version '%s' of package '%s'" -msgstr "" - -#: cmdline/apt-get.cc:1313 +#: cmdline/apt-get.cc:1321 #, c-format msgid "Ignore unavailable target release '%s' of package '%s'" msgstr "" -#: cmdline/apt-get.cc:1342 +#: cmdline/apt-get.cc:1352 #, fuzzy, c-format msgid "Picking '%s' as source package instead of '%s'\n" msgstr "無法取得來源套件列表 %s 的狀態" -#: cmdline/apt-get.cc:1395 +#. if (VerTag.empty() == false && Last == 0) +#: cmdline/apt-get.cc:1389 +#, c-format +msgid "Ignore unavailable version '%s' of package '%s'" +msgstr "" + +#: cmdline/apt-get.cc:1405 msgid "The update command takes no arguments" msgstr "update 指令不需任何參數" -#: cmdline/apt-get.cc:1408 +#: cmdline/apt-get.cc:1418 msgid "Unable to lock the list directory" msgstr "無法鎖定列表目錄" -#: cmdline/apt-get.cc:1464 +#: cmdline/apt-get.cc:1474 msgid "We are not supposed to delete stuff, can't start AutoRemover" msgstr "我們沒有計劃要刪除任何東西，無法啟動 AutoRemover" -#: cmdline/apt-get.cc:1513 +#: cmdline/apt-get.cc:1523 msgid "" "The following packages were automatically installed and are no longer " "required:" msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1515 +#: cmdline/apt-get.cc:1525 #, fuzzy, c-format msgid "%lu packages were automatically installed and are no longer required.\n" msgstr "以下套件是被自動安裝進來的，且已不再會被用到了：" -#: cmdline/apt-get.cc:1516 +#: cmdline/apt-get.cc:1526 msgid "Use 'apt-get autoremove' to remove them." msgstr "使用 'apt-get autoremove' 來將其移除。" -#: cmdline/apt-get.cc:1521 +#: cmdline/apt-get.cc:1531 msgid "" "Hmm, seems like the AutoRemover destroyed something which really\n" "shouldn't happen. Please file a bug report against apt." @@ -1039,43 +1040,43 @@ msgstr "" #. "that package should be filed.") << endl; #. } #. -#: cmdline/apt-get.cc:1524 cmdline/apt-get.cc:1814 +#: cmdline/apt-get.cc:1534 cmdline/apt-get.cc:1824 msgid "The following information may help to resolve the situation:" msgstr "以下的資訊或許有助於解決當前的情況：" -#: cmdline/apt-get.cc:1528 +#: cmdline/apt-get.cc:1538 msgid "Internal Error, AutoRemover broke stuff" msgstr "內部錯誤，AutoRemover 處理失敗" -#: cmdline/apt-get.cc:1547 +#: cmdline/apt-get.cc:1557 msgid "Internal error, AllUpgrade broke stuff" msgstr "內部錯誤，AllUpgrade 造成了損壞" -#: cmdline/apt-get.cc:1602 +#: cmdline/apt-get.cc:1612 #, c-format msgid "Couldn't find task %s" msgstr "無法找到主題 %s" -#: cmdline/apt-get.cc:1717 cmdline/apt-get.cc:1753 +#: cmdline/apt-get.cc:1727 cmdline/apt-get.cc:1763 #, c-format msgid "Couldn't find package %s" msgstr "無法找到套件 %s" -#: cmdline/apt-get.cc:1740 +#: cmdline/apt-get.cc:1750 #, c-format msgid "Note, selecting %s for regex '%s'\n" msgstr "注意，根據正規表示式 '%2$s' 而選擇了 %1$s\n" -#: cmdline/apt-get.cc:1771 +#: cmdline/apt-get.cc:1781 #, c-format msgid "%s set to manually installed.\n" msgstr "%s 被設定為手動安裝。\n" -#: cmdline/apt-get.cc:1784 +#: cmdline/apt-get.cc:1794 msgid "You might want to run `apt-get -f install' to correct these:" msgstr "您也許得執行 `apt-get -f install' 以修正這些問題：" -#: cmdline/apt-get.cc:1787 +#: cmdline/apt-get.cc:1797 msgid "" "Unmet dependencies. Try 'apt-get -f install' with no packages (or specify a " "solution)." @@ -1083,7 +1084,7 @@ msgstr "" "未能滿足相依關係。請試著不指定套件來執行 'apt-get -f install'（或採取其它的解" "決方案）。" -#: cmdline/apt-get.cc:1799 +#: cmdline/apt-get.cc:1809 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" @@ -1093,122 +1094,122 @@ msgstr "" "有些套件無法安裝。這可能意謂著您的要求難以解決，或是若您使用的是\n" "unstable 發行版，可能有些必要的套件尚未建立，或是被移出 Incoming 了。" -#: cmdline/apt-get.cc:1817 +#: cmdline/apt-get.cc:1827 msgid "Broken packages" msgstr "損毀的套件" -#: cmdline/apt-get.cc:1846 +#: cmdline/apt-get.cc:1856 msgid "The following extra packages will be installed:" msgstr "下列的額外套件將被安裝：" -#: cmdline/apt-get.cc:1935 +#: cmdline/apt-get.cc:1945 msgid "Suggested packages:" msgstr "建議套件：" -#: cmdline/apt-get.cc:1936 +#: cmdline/apt-get.cc:1946 msgid "Recommended packages:" msgstr "推薦套件：" -#: cmdline/apt-get.cc:1965 +#: cmdline/apt-get.cc:1975 msgid "Calculating upgrade... " msgstr "籌備升級中... " -#: cmdline/apt-get.cc:1968 methods/ftp.cc:708 methods/connect.cc:112 +#: cmdline/apt-get.cc:1978 methods/ftp.cc:708 methods/connect.cc:112 msgid "Failed" msgstr "失敗" -#: cmdline/apt-get.cc:1973 +#: cmdline/apt-get.cc:1983 msgid "Done" msgstr "完成" -#: cmdline/apt-get.cc:2040 cmdline/apt-get.cc:2048 +#: cmdline/apt-get.cc:2050 cmdline/apt-get.cc:2058 msgid "Internal error, problem resolver broke stuff" msgstr "內部錯誤，問題排除器造成了損壞" -#: cmdline/apt-get.cc:2148 +#: cmdline/apt-get.cc:2158 msgid "Must specify at least one package to fetch source for" msgstr "在取得原始碼時必須至少指定一個套件" -#: cmdline/apt-get.cc:2178 cmdline/apt-get.cc:2424 +#: cmdline/apt-get.cc:2188 cmdline/apt-get.cc:2434 #, c-format msgid "Unable to find a source package for %s" msgstr "無法找到 %s 的原始碼套件" -#: cmdline/apt-get.cc:2227 +#: cmdline/apt-get.cc:2237 #, c-format msgid "Skipping already downloaded file '%s'\n" msgstr "略過已下載的檔案 '%s'\n" -#: cmdline/apt-get.cc:2262 +#: cmdline/apt-get.cc:2272 #, c-format msgid "You don't have enough free space in %s" msgstr "在 %s 裡沒有足夠的的未使用空間" -#: cmdline/apt-get.cc:2268 +#: cmdline/apt-get.cc:2278 #, c-format msgid "Need to get %sB/%sB of source archives.\n" msgstr "需要下載 %sB/%sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:2271 +#: cmdline/apt-get.cc:2281 #, c-format msgid "Need to get %sB of source archives.\n" msgstr "需要下載 %sB 的原始套件檔。\n" -#: cmdline/apt-get.cc:2277 +#: cmdline/apt-get.cc:2287 #, c-format msgid "Fetch source %s\n" msgstr "取得原始碼 %s\n" -#: cmdline/apt-get.cc:2308 +#: cmdline/apt-get.cc:2318 msgid "Failed to fetch some archives." msgstr "無法取得某些套件檔。" -#: cmdline/apt-get.cc:2336 +#: cmdline/apt-get.cc:2346 #, c-format msgid "Skipping unpack of already unpacked source in %s\n" msgstr "不解開，因原始碼已解開至 %s\n" -#: cmdline/apt-get.cc:2348 +#: cmdline/apt-get.cc:2358 #, c-format msgid "Unpack command '%s' failed.\n" msgstr "解開指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2349 +#: cmdline/apt-get.cc:2359 #, c-format msgid "Check if the 'dpkg-dev' package is installed.\n" msgstr "請檢查是否已安裝了 'dpkg-dev' 套件。\n" -#: cmdline/apt-get.cc:2366 +#: cmdline/apt-get.cc:2376 #, c-format msgid "Build command '%s' failed.\n" msgstr "編譯指令 '%s' 失敗。\n" -#: cmdline/apt-get.cc:2385 +#: cmdline/apt-get.cc:2395 msgid "Child process failed" msgstr "子程序失敗" -#: cmdline/apt-get.cc:2401 +#: cmdline/apt-get.cc:2411 msgid "Must specify at least one package to check builddeps for" msgstr "在檢查編譯相依關係時必須至少指定一個套件" -#: cmdline/apt-get.cc:2429 +#: cmdline/apt-get.cc:2439 #, c-format msgid "Unable to get build-dependency information for %s" msgstr "無法取得 %s 的編譯相依關係資訊" -#: cmdline/apt-get.cc:2449 +#: cmdline/apt-get.cc:2459 #, c-format msgid "%s has no build depends.\n" msgstr "%s 沒有編譯相依關係。\n" -#: cmdline/apt-get.cc:2501 +#: cmdline/apt-get.cc:2511 #, c-format msgid "" "%s dependency for %s cannot be satisfied because the package %s cannot be " "found" msgstr "無法滿足 %2$s 所要求的 %1$s 相依關係，因為找不到套件 %3$s" -#: cmdline/apt-get.cc:2554 +#: cmdline/apt-get.cc:2564 #, c-format msgid "" "%s dependency for %s cannot be satisfied because no available versions of " @@ -1216,30 +1217,30 @@ msgid "" msgstr "" "無法滿足 %2$s 所要求的 %1$s 相依關係，因為套件 %3$s 沒有版本符合其版本需求" -#: cmdline/apt-get.cc:2590 +#: cmdline/apt-get.cc:2600 #, 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:2617 +#: cmdline/apt-get.cc:2627 #, c-format msgid "Failed to satisfy %s dependency for %s: %s" msgstr "無法滿足 %2$s 的相依關係 %1$s：%3$s" -#: cmdline/apt-get.cc:2633 +#: cmdline/apt-get.cc:2643 #, c-format msgid "Build-dependencies for %s could not be satisfied." msgstr "無法滿足套件 %s 的編譯相依關係。" -#: cmdline/apt-get.cc:2638 +#: cmdline/apt-get.cc:2648 msgid "Failed to process build dependencies" msgstr "無法處理編譯相依關係" -#: cmdline/apt-get.cc:2670 +#: cmdline/apt-get.cc:2680 msgid "Supported modules:" msgstr "已支援模組：" -#: cmdline/apt-get.cc:2711 +#: cmdline/apt-get.cc:2721 #, fuzzy msgid "" "Usage: apt-get [options] command\n" @@ -1323,7 +1324,7 @@ msgstr "" "以取得更多資訊和選項。\n" " 該 APT 有著超級牛力。\n" -#: cmdline/apt-get.cc:2879 +#: cmdline/apt-get.cc:2889 msgid "" "NOTE: This is only a simulation!\n" " apt-get needs root privileges for real execution.\n" @@ -1567,11 +1568,10 @@ msgstr "檔案 %s/%s 覆寫了套件 %s 中的相同檔案" #. Only warn if there are no sources.list.d. #. Only warn if there is no sources.list file. -#: apt-inst/extract.cc:464 apt-pkg/contrib/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:90 apt-pkg/init.cc:98 apt-pkg/clean.cc:33 -#: apt-pkg/policy.cc:281 apt-pkg/policy.cc:287 +#: apt-inst/extract.cc:464 apt-pkg/contrib/cdromutl.cc:157 +#: apt-pkg/contrib/fileutl.cc:240 apt-pkg/sourcelist.cc:159 +#: apt-pkg/sourcelist.cc:165 apt-pkg/acquire.cc:419 apt-pkg/init.cc:90 +#: apt-pkg/init.cc:98 apt-pkg/clean.cc:33 apt-pkg/policy.cc:279 #, c-format msgid "Unable to read %s" msgstr "無法讀取 %s" @@ -1601,9 +1601,9 @@ msgid "The info and temp directories need to be on the same filesystem" msgstr "資料目錄與暫存目錄需位於同一檔案系統中" #. Build the status cache -#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:763 -#: apt-pkg/pkgcachegen.cc:832 apt-pkg/pkgcachegen.cc:837 -#: apt-pkg/pkgcachegen.cc:961 +#: apt-inst/deb/dpkgdb.cc:135 apt-pkg/pkgcachegen.cc:793 +#: apt-pkg/pkgcachegen.cc:865 apt-pkg/pkgcachegen.cc:870 +#: apt-pkg/pkgcachegen.cc:1008 msgid "Reading package lists" msgstr "正在讀取套件清單" @@ -1735,11 +1735,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 "無法設定修改時間" @@ -1800,7 +1800,7 @@ msgstr "連線逾時" msgid "Server closed the connection" msgstr "伺服器已關閉連線" -#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:543 methods/rsh.cc:190 +#: methods/ftp.cc:344 apt-pkg/contrib/fileutl.cc:667 methods/rsh.cc:190 msgid "Read error" msgstr "讀取錯誤" @@ -1812,7 +1812,7 @@ msgstr "回應超過緩衝區長度。" msgid "Protocol corruption" msgstr "協定失敗" -#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:582 methods/rsh.cc:232 +#: methods/ftp.cc:452 apt-pkg/contrib/fileutl.cc:706 methods/rsh.cc:232 msgid "Write error" msgstr "寫入錯誤" @@ -1866,7 +1866,7 @@ msgstr "Data socket 連線逾時" msgid "Unable to accept connection" msgstr "無法接受連線" -#: methods/ftp.cc:870 methods/http.cc:999 methods/rsh.cc:303 +#: methods/ftp.cc:870 methods/http.cc:1000 methods/rsh.cc:303 msgid "Problem hashing file" msgstr "有問題的雜湊檔" @@ -1930,58 +1930,63 @@ msgstr "無法和 %s:%s (%s) 連線。" msgid "Connecting to %s" msgstr "正連線至 %s" -#: methods/connect.cc:165 methods/connect.cc:184 +#: methods/connect.cc:166 methods/connect.cc:185 #, c-format msgid "Could not resolve '%s'" msgstr "無法解析 '%s'" -#: methods/connect.cc:190 +#: methods/connect.cc:191 #, c-format msgid "Temporary failure resolving '%s'" msgstr "暫時無法解析 '%s'" -#: methods/connect.cc:193 +#: methods/connect.cc:194 #, fuzzy, c-format msgid "Something wicked happened resolving '%s:%s' (%i - %s)" msgstr "在解析 '%s:%s' (%i) 時出了怪事" -#: methods/connect.cc:240 +#: methods/connect.cc:241 #, fuzzy, c-format msgid "Unable to connect to %s:%s:" msgstr "無法連線至 %s %s：" -#: methods/gpgv.cc:71 -#, c-format -msgid "Couldn't access keyring: '%s'" -msgstr "無法存取鑰匙圈：'%s'" +#. TRANSLATOR: %s is the trusted keyring parts directory +#: methods/gpgv.cc:78 +#, fuzzy, c-format +msgid "No keyring installed in %s." +msgstr "放棄安裝。" + +#: methods/gpgv.cc:104 +msgid "E: Too many keyrings should be passed to gpgv. Exiting." +msgstr "" -#: methods/gpgv.cc:107 +#: methods/gpgv.cc:121 msgid "E: Argument list from Acquire::gpgv::Options too long. Exiting." msgstr "錯誤：Acquire::gpgv::Options 的參數列表過長。結束執行。" -#: methods/gpgv.cc:223 +#: methods/gpgv.cc:237 msgid "" "Internal error: Good signature, but could not determine key fingerprint?!" msgstr "內部錯誤：簽章無誤，但卻無法辨識密鑰的指紋碼？！" -#: methods/gpgv.cc:228 +#: methods/gpgv.cc:242 msgid "At least one invalid signature was encountered." msgstr "至少發現一個無效的簽章。" -#: methods/gpgv.cc:232 +#: methods/gpgv.cc:246 #, c-format msgid "Could not execute '%s' to verify signature (is gpgv installed?)" msgstr "無法執行 '%s' 來驗證簽章（gpgv 是否安裝了？）" -#: methods/gpgv.cc:237 +#: methods/gpgv.cc:251 msgid "Unknown error executing gpgv" msgstr "在執行 gpgv 時發生未知的錯誤" -#: methods/gpgv.cc:271 methods/gpgv.cc:278 +#: methods/gpgv.cc:285 methods/gpgv.cc:292 msgid "The following signatures were invalid:\n" msgstr "以下簽名無效：\n" -#: methods/gpgv.cc:285 +#: methods/gpgv.cc:299 msgid "" "The following signatures couldn't be verified because the public key is not " "available:\n" @@ -2030,47 +2035,47 @@ msgstr "這個 HTTP 伺服器的範圍支援有問題" msgid "Unknown date format" msgstr "未知的資料格式" -#: methods/http.cc:790 +#: methods/http.cc:791 msgid "Select failed" msgstr "選擇失敗" -#: methods/http.cc:795 +#: methods/http.cc:796 msgid "Connection timed out" msgstr "連線逾時" -#: methods/http.cc:818 +#: methods/http.cc:819 msgid "Error writing to output file" msgstr "在寫入輸出檔時發生錯誤" -#: methods/http.cc:849 +#: methods/http.cc:850 msgid "Error writing to file" msgstr "在寫入檔案時發生錯誤" -#: methods/http.cc:877 +#: methods/http.cc:878 msgid "Error writing to the file" msgstr "在寫入該檔時發生錯誤" -#: methods/http.cc:891 +#: methods/http.cc:892 msgid "Error reading from server. Remote end closed connection" msgstr "在讀取伺服器時發生錯誤，遠端主機已關閉連線" -#: methods/http.cc:893 +#: methods/http.cc:894 msgid "Error reading from server" msgstr "在讀取伺服器時發生錯誤" -#: methods/http.cc:984 apt-pkg/contrib/mmap.cc:215 +#: methods/http.cc:985 apt-pkg/contrib/mmap.cc:233 msgid "Failed to truncate file" msgstr "無法截短檔案" -#: methods/http.cc:1149 +#: methods/http.cc:1150 msgid "Bad header data" msgstr "錯誤的標頭資料" -#: methods/http.cc:1166 methods/http.cc:1221 +#: methods/http.cc:1167 methods/http.cc:1222 msgid "Connection failed" msgstr "連線失敗" -#: methods/http.cc:1313 +#: methods/http.cc:1314 msgid "Internal error" msgstr "內部錯誤" @@ -2078,12 +2083,12 @@ 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. " @@ -2092,6 +2097,13 @@ msgstr "" "動態 MMap 已用完所有空間。請增加 APT::Cache-Limit 的大小。目前大小為：%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 @@ -2121,52 +2133,52 @@ msgstr "" msgid "Selection %s not found" msgstr "選項 %s 找不到" -#: apt-pkg/contrib/configuration.cc:458 +#: apt-pkg/contrib/configuration.cc:452 #, c-format msgid "Unrecognized type abbreviation: '%c'" msgstr "無法辨識的縮寫類型：'%c'" -#: apt-pkg/contrib/configuration.cc:516 +#: apt-pkg/contrib/configuration.cc:510 #, c-format msgid "Opening configuration file %s" msgstr "開啟設定檔 %s" -#: apt-pkg/contrib/configuration.cc:684 +#: apt-pkg/contrib/configuration.cc:678 #, c-format msgid "Syntax error %s:%u: Block starts with no name." msgstr "語法錯誤 %s:%u：區塊開頭沒有名稱。" -#: apt-pkg/contrib/configuration.cc:703 +#: apt-pkg/contrib/configuration.cc:697 #, c-format msgid "Syntax error %s:%u: Malformed tag" msgstr "語法錯誤 %s:%u：標籤格式錯誤" -#: apt-pkg/contrib/configuration.cc:720 +#: apt-pkg/contrib/configuration.cc:714 #, c-format msgid "Syntax error %s:%u: Extra junk after value" msgstr "語法錯誤 %s:%u：數值後有多餘的垃圾" -#: apt-pkg/contrib/configuration.cc:760 +#: apt-pkg/contrib/configuration.cc:754 #, c-format msgid "Syntax error %s:%u: Directives can only be done at the top level" msgstr "語法錯誤 %s:%u：指令只能於最高層級執行" -#: apt-pkg/contrib/configuration.cc:767 +#: apt-pkg/contrib/configuration.cc:761 #, c-format msgid "Syntax error %s:%u: Too many nested includes" msgstr "語法錯誤 %s:%u: 太多巢狀引入檔" -#: apt-pkg/contrib/configuration.cc:771 apt-pkg/contrib/configuration.cc:776 +#: apt-pkg/contrib/configuration.cc:765 apt-pkg/contrib/configuration.cc:770 #, c-format msgid "Syntax error %s:%u: Included from here" msgstr "語法錯誤 %s:%u：從此引入" -#: apt-pkg/contrib/configuration.cc:780 +#: apt-pkg/contrib/configuration.cc:774 #, c-format msgid "Syntax error %s:%u: Unsupported directive '%s'" msgstr "語法錯誤 %s:%u：不支援的指令 '%s'" -#: apt-pkg/contrib/configuration.cc:831 +#: apt-pkg/contrib/configuration.cc:825 #, c-format msgid "Syntax error %s:%u: Extra junk at end of file" msgstr "語法錯誤 %s:%u：在檔案結尾有多餘的垃圾" @@ -2242,75 +2254,75 @@ msgstr "無法切換至 %s" msgid "Failed to stat the cdrom" msgstr "無法取得 CD-ROM 的狀態" -#: apt-pkg/contrib/fileutl.cc:149 +#: apt-pkg/contrib/fileutl.cc:151 #, c-format msgid "Not using locking for read only lock file %s" msgstr "不在唯讀檔案 %s 上使用檔案鎖定" -#: apt-pkg/contrib/fileutl.cc:154 +#: apt-pkg/contrib/fileutl.cc:156 #, c-format msgid "Could not open lock file %s" msgstr "無法開啟鎖定檔 %s" -#: apt-pkg/contrib/fileutl.cc:172 +#: apt-pkg/contrib/fileutl.cc:174 #, c-format msgid "Not using locking for nfs mounted lock file %s" msgstr "不在以 nfs 掛載的檔案 %s 上使用檔案鎖定" -#: apt-pkg/contrib/fileutl.cc:176 +#: apt-pkg/contrib/fileutl.cc:178 #, c-format msgid "Could not get lock %s" msgstr "無法將 %s 鎖定" -#: apt-pkg/contrib/fileutl.cc:444 +#: apt-pkg/contrib/fileutl.cc:568 #, c-format msgid "Waited for %s but it wasn't there" msgstr "等待 %s 但是它並不存在" -#: apt-pkg/contrib/fileutl.cc:456 +#: apt-pkg/contrib/fileutl.cc:580 #, c-format msgid "Sub-process %s received a segmentation fault." msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/contrib/fileutl.cc:458 +#: apt-pkg/contrib/fileutl.cc:582 #, fuzzy, c-format msgid "Sub-process %s received signal %u." msgstr "子程序 %s 收到一個記憶體錯誤。" -#: apt-pkg/contrib/fileutl.cc:462 +#: apt-pkg/contrib/fileutl.cc:586 #, c-format msgid "Sub-process %s returned an error code (%u)" msgstr "子程序 %s 傳回錯誤碼 (%u)" -#: apt-pkg/contrib/fileutl.cc:464 +#: apt-pkg/contrib/fileutl.cc:588 #, c-format msgid "Sub-process %s exited unexpectedly" msgstr "子程序 %s 不預期得結束" -#: apt-pkg/contrib/fileutl.cc:508 +#: apt-pkg/contrib/fileutl.cc:632 #, c-format msgid "Could not open file %s" msgstr "無法開啟檔案 %s" -#: apt-pkg/contrib/fileutl.cc:564 +#: apt-pkg/contrib/fileutl.cc:688 #, c-format msgid "read, still have %lu to read but none left" msgstr "讀取，仍有 %lu 未讀但已無空間" -#: apt-pkg/contrib/fileutl.cc:594 +#: apt-pkg/contrib/fileutl.cc:718 #, c-format msgid "write, still have %lu to write but couldn't" msgstr "寫入，仍有 %lu 待寫入但已沒辨法" -#: apt-pkg/contrib/fileutl.cc:669 +#: apt-pkg/contrib/fileutl.cc:793 msgid "Problem closing the file" msgstr "在關閉檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:675 +#: apt-pkg/contrib/fileutl.cc:799 msgid "Problem unlinking the file" msgstr "在刪除檔案時發生問題" -#: apt-pkg/contrib/fileutl.cc:686 +#: apt-pkg/contrib/fileutl.cc:810 msgid "Problem syncing the file" msgstr "在同步檔案時發生問題" @@ -2427,52 +2439,52 @@ msgstr "無法辨識套件檔 %s (1)" msgid "Unable to parse package file %s (2)" msgstr "無法辨識套件檔 %s (2)" -#: apt-pkg/sourcelist.cc:90 +#: apt-pkg/sourcelist.cc:83 #, c-format msgid "Malformed line %lu in source list %s (URI)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤 (URI)" -#: apt-pkg/sourcelist.cc:92 +#: apt-pkg/sourcelist.cc:85 #, c-format msgid "Malformed line %lu in source list %s (dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版）" -#: apt-pkg/sourcelist.cc:95 +#: apt-pkg/sourcelist.cc:88 #, c-format msgid "Malformed line %lu in source list %s (URI parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（URI 分析）" -#: apt-pkg/sourcelist.cc:101 +#: apt-pkg/sourcelist.cc:94 #, c-format msgid "Malformed line %lu in source list %s (absolute dist)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（絕對發行版）" -#: apt-pkg/sourcelist.cc:108 +#: apt-pkg/sourcelist.cc:101 #, c-format msgid "Malformed line %lu in source list %s (dist parse)" msgstr "來源列表 %2$s 中的 %1$lu 行的格式錯誤（發行版分析）" -#: apt-pkg/sourcelist.cc:206 +#: apt-pkg/sourcelist.cc:199 #, c-format msgid "Opening %s" msgstr "正在開啟 %s" -#: apt-pkg/sourcelist.cc:223 apt-pkg/cdrom.cc:445 +#: apt-pkg/sourcelist.cc:216 apt-pkg/cdrom.cc:445 #, c-format msgid "Line %u too long in source list %s." msgstr "來源列表 %2$s 中的第 %1$u 行太長。" -#: apt-pkg/sourcelist.cc:243 +#: apt-pkg/sourcelist.cc:236 #, c-format msgid "Malformed line %u in source list %s (type)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（類型）" -#: apt-pkg/sourcelist.cc:247 +#: apt-pkg/sourcelist.cc:240 #, c-format msgid "Type '%s' is not known on line %u in source list %s" msgstr "未知的類型 '%1$s'，位於在來源列表 %3$s 中的第 %2$u 行" -#: apt-pkg/sourcelist.cc:255 apt-pkg/sourcelist.cc:258 +#: apt-pkg/sourcelist.cc:248 apt-pkg/sourcelist.cc:251 #, c-format msgid "Malformed line %u in source list %s (vendor id)" msgstr "來源列表 %2$s 中的第 %1$u 行的格式錯誤（提供者 ID）" @@ -2593,17 +2605,17 @@ msgstr "無法分析或開啟套件清單或狀況檔。" msgid "You may want to run apt-get update to correct these problems" msgstr "您也許得執行 apt-get update 以修正這些問題" -#: apt-pkg/policy.cc:347 +#: apt-pkg/policy.cc:316 #, fuzzy, c-format msgid "Invalid record in the preferences file %s, no Package header" msgstr "個人設定檔中有些不正確資料，沒有以 Package 開頭" -#: apt-pkg/policy.cc:369 +#: apt-pkg/policy.cc:338 #, c-format msgid "Did not understand pin type %s" msgstr "無法分析鎖定類型 %s" -#: apt-pkg/policy.cc:377 +#: apt-pkg/policy.cc:346 msgid "No priority (or zero) specified for pin" msgstr "銷定並沒有優先順序之分（或零）" @@ -2687,16 +2699,16 @@ msgstr "在處理 %s 時發生錯誤 (CollectFileProvides)" msgid "Package %s %s was not found while processing file dependencies" msgstr "在計算檔案相依性時找不到套件 %s %s" -#: apt-pkg/pkgcachegen.cc:693 +#: apt-pkg/pkgcachegen.cc:706 #, c-format msgid "Couldn't stat source package list %s" msgstr "無法取得來源套件列表 %s 的狀態" -#: apt-pkg/pkgcachegen.cc:778 +#: apt-pkg/pkgcachegen.cc:808 msgid "Collecting File Provides" msgstr "正在收集檔案提供者" -#: apt-pkg/pkgcachegen.cc:907 apt-pkg/pkgcachegen.cc:914 +#: apt-pkg/pkgcachegen.cc:952 apt-pkg/pkgcachegen.cc:959 msgid "IO Error saving source cache" msgstr "在儲存來源快取時 IO 錯誤" @@ -2705,19 +2717,19 @@ msgstr "在儲存來源快取時 IO 錯誤" msgid "rename failed, %s (%s -> %s)." msgstr "無法重新命名，%s (%s -> %s)。" -#: apt-pkg/acquire-item.cc:395 +#: apt-pkg/acquire-item.cc:432 msgid "MD5Sum mismatch" msgstr "MD5Sum 不符" -#: apt-pkg/acquire-item.cc:649 apt-pkg/acquire-item.cc:1411 +#: apt-pkg/acquire-item.cc:693 apt-pkg/acquire-item.cc:1455 msgid "Hash Sum mismatch" msgstr "Hash Sum 不符" -#: apt-pkg/acquire-item.cc:1106 +#: apt-pkg/acquire-item.cc:1150 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:1260 #, c-format msgid "" "I wasn't able to locate a file for the %s package. This might mean you need " @@ -2726,20 +2738,20 @@ msgstr "" "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。（因為找不到平" "台）" -#: apt-pkg/acquire-item.cc:1275 +#: apt-pkg/acquire-item.cc:1319 #, 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 "找不到 %s 套件的某個檔案。這意味著您可能要手動修復這個套件。" -#: apt-pkg/acquire-item.cc:1316 +#: apt-pkg/acquire-item.cc:1360 #, c-format msgid "" "The package index files are corrupted. No Filename: field for package %s." msgstr "這個套件的索引檔損壞了。沒有套件 %s 的 Filename: 欄位。" -#: apt-pkg/acquire-item.cc:1403 +#: apt-pkg/acquire-item.cc:1447 msgid "Size mismatch" msgstr "大小不符" @@ -2872,7 +2884,6 @@ msgstr "寫入 %i 筆紀綠，其中有 %i 個檔案遺失了，有 %i 個檔案 #: apt-pkg/indexcopy.cc:530 #, fuzzy, c-format -#| msgid "Opening configuration file %s" msgid "Skipping nonexistent file %s" msgstr "開啟設定檔 %s" @@ -2883,7 +2894,6 @@ msgstr "" #: apt-pkg/indexcopy.cc:542 #, fuzzy, c-format -#| msgid "Hash Sum mismatch" msgid "Hash mismatch for: %s" msgstr "Hash Sum 不符" @@ -2904,7 +2914,6 @@ msgstr "正在移除 %s" #: apt-pkg/deb/dpkgpm.cc:52 #, fuzzy, c-format -#| msgid "Completely removed %s" msgid "Completely removing %s" msgstr "已完整移除 %s" @@ -2988,14 +2997,30 @@ 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 "Couldn't access keyring: '%s'" +#~ msgstr "無法存取鑰匙圈：'%s'" + +#~ msgid "Could not patch file" +#~ msgstr "無法修補檔案" + #~ msgid " %4i %s\n" #~ msgstr " %4i %s\n" diff --git a/test/libapt/commandlineasstring_test.cc b/test/libapt/commandlineasstring_test.cc new file mode 100644 index 000000000..a38957d7e --- /dev/null +++ b/test/libapt/commandlineasstring_test.cc @@ -0,0 +1,39 @@ +#include <apt-pkg/cmndline.h> +#include <apt-pkg/configuration.h> + +#include <string> + +#include "assert.h" + +class CLT: public CommandLine { + + public: + std::string static AsString(const char * const * const argv, + unsigned int const argc) { + std::string const static conf = "Commandline::AsString"; + _config->Clear(conf); + SaveInConfig(argc, argv); + return _config->Find(conf); + } +}; + +#define CMD(y,z) equals(CLT::AsString(argv, y), z); + +int main() { + { + const char* const argv[] = {"apt-get", "install", "-sf"}; + CMD(3, "apt-get install -sf"); + } + { + const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Test"}; + CMD(5, "apt-cache -s apt -so Debug::test=Test"); + } + { + const char* const argv[] = {"apt-cache", "-s", "apt", "-so", "Debug::test=Das ist ein Test"}; + CMD(5, "apt-cache -s apt -so Debug::test=\"Das ist ein Test\""); + } + { + const char* const argv[] = {"apt-cache", "-s", "apt", "--hallo", "test=1.0"}; + CMD(5, "apt-cache -s apt --hallo test=1.0"); + } +} diff --git a/test/libapt/compareversion_test.cc b/test/libapt/compareversion_test.cc new file mode 100644 index 000000000..b6213e84c --- /dev/null +++ b/test/libapt/compareversion_test.cc @@ -0,0 +1,123 @@ +// -*- mode: cpp; mode: fold -*- +// Description /*{{{*/ +/* ###################################################################### + + Version Test - Simple program to run through a file and comare versions. + + Each version is compared and the result is checked against an expected + result in the file. The format of the file is + a b Res + Where Res is -1, 1, 0. dpkg -D=1 --compare-versions a "<" b can be + used to determine what Res should be. # at the start of the line + is a comment and blank lines are skipped + + The runner will also call dpkg --compare-versions to check if APT and + dpkg have (still) the same idea. + + ##################################################################### */ + /*}}}*/ +#include <apt-pkg/macros.h> +#include <apt-pkg/error.h> +#include <apt-pkg/version.h> +#include <apt-pkg/debversion.h> +#include <apt-pkg/fileutl.h> +#include <iostream> +#include <fstream> + +#include <stdlib.h> +#include <unistd.h> +#include <sys/types.h> +#include <sys/wait.h> + +using namespace std; + +bool callDPkg(const char *val, const char *ref, const char &op) { + pid_t Process = ExecFork(); + if (Process == 0) + { + const char * args[6]; + args[0] = "/usr/bin/dpkg"; + args[1] = "--compare-versions"; + args[2] = val; + args[3] = (op == 1) ? ">>" : ( (op == 0) ? "=" : "<<"); + args[4] = ref; + args[5] = 0; + execv(args[0], (char**) args); + exit(1); + } + int Ret; + waitpid(Process, &Ret, 0); + return WIFEXITED(Ret) == true && WEXITSTATUS(Ret) == 0; +} + +void assertVersion(int const &CurLine, string const &A, string const &B, int const &Expected) { + int Res = debVS.CmpVersion(A.c_str(), B.c_str()); + bool const dpkg = callDPkg(A.c_str(),B.c_str(), Expected); + Res = (Res < 0) ? -1 : ( (Res > 0) ? 1 : Res); + + if (Res != Expected) + _error->Error("Comparison failed on line %u. '%s' '%s' '%s' %i != %i",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")) ,B.c_str(),Res,Expected); + if (dpkg == false) + _error->Error("DPkg differ with line: %u. '%s' '%s' '%s' == false",CurLine,A.c_str(),((Expected == 1) ? "<<" : ( (Expected == 0) ? "=" : ">>")),B.c_str()); +} + +bool RunTest(const char *File) +{ + ifstream F(File,ios::in); + if (!F != 0) + return false; + + char Buffer[300]; + int CurLine = 0; + + while (1) + { + F.getline(Buffer,sizeof(Buffer)); + CurLine++; + if (F.eof() != 0) + return true; + if (!F != 0) + return _error->Error("Line %u in %s is too long",CurLine,File); + + // Comment + if (Buffer[0] == '#' || Buffer[0] == 0) + continue; + + // First version + char *I; + char *Start = Buffer; + for (I = Buffer; *I != 0 && *I != ' '; I++); + string A(Start, I - Start); + + if (*I == 0) + return _error->Error("Invalid line %u",CurLine); + + // Second version + I++; + Start = I; + for (I = Start; *I != 0 && *I != ' '; I++); + string B(Start,I - Start); + + if (*I == 0 || I[1] == 0) + return _error->Error("Invalid line %u",CurLine); + + // Result + I++; + int const Expected = atoi(I); + assertVersion(CurLine, A, B, Expected); + // Check the reverse as well + assertVersion(CurLine, B, A, Expected*-1); + } +} + +int main(int argc, char *argv[]) +{ + if (argc <= 1) + RunTest("../versions.lst"); + else + RunTest(argv[1]); + + // Print any errors or warnings found + _error->DumpErrors(); + return 0; +} diff --git a/test/libapt/makefile b/test/libapt/makefile index 08f581e6d..98bdb3348 100644 --- a/test/libapt/makefile +++ b/test/libapt/makefile @@ -23,3 +23,15 @@ PROGRAM = GetListOfFilesInDir${BASENAME} SLIBS = -lapt-pkg SOURCE = getlistoffilesindir_test.cc include $(PROGRAM_H) + +# Program for testing CommandLine reconstruction +PROGRAM = commandlineasstring${BASENAME} +SLIBS = -lapt-pkg +SOURCE = commandlineasstring_test.cc +include $(PROGRAM_H) + +# Program for testing debians version comparing +PROGRAM = compareversion${BASENAME} +SLIBS = -lapt-pkg +SOURCE = compareversion_test.cc +include $(PROGRAM_H) diff --git a/test/makefile b/test/makefile index fb9123d0a..b8c104eae 100644 --- a/test/makefile +++ b/test/makefile @@ -25,13 +25,6 @@ SOURCE = scratch.cc include $(PROGRAM_H) # Version compare tester -PROGRAM=versiontest -SLIBS = -lapt-pkg -LIB_MAKES = apt-pkg/makefile -SOURCE = versiontest.cc -include $(PROGRAM_H) - -# Version compare tester PROGRAM=testextract SLIBS = -lapt-pkg -lapt-inst LIB_MAKES = apt-pkg/makefile apt-inst/makefile diff --git a/test/versions.lst b/test/versions.lst index efc19c4f0..517214151 100644 --- a/test/versions.lst +++ b/test/versions.lst @@ -10,10 +10,11 @@ 1.3 1.2.2 1 # Important attributes -- . -1 -p - -1 -a - -1 -z - -1 +# disabled as dpkg --compare-versions doesn't like them… +#- . -1 +#p - -1 +#a - -1 +#z - -1 a . -1 z . -1 @@ -22,6 +23,10 @@ z . -1 1:1.25-4 1:1.25-8 -1 0:1.18.36 1.18.36 0 +# native version +1.18.36 1.18.35 1 +0:1.18.36 1.18.35 1 + # Funky, but allowed, characters in upstream version 9:1.18.36:5.4-20 10:0.5.1-22 -1 9:1.18.36:5.4-20 9:1.18.36:5.5-1 -1 @@ -49,3 +54,54 @@ III-alpha9.8 III-alpha9.8-1.5 -1 # #205960 3.0~rc1-1 3.0-1 -1 + +# #573592 - debian policy 5.6.12 +1.0 1.0-0 0 +0.2 1.0-0 -1 +1.0 1.0-0+b1 -1 +1.0 1.0-0~ 1 + +# if a version includes a dash +# it should be the debrev dash - policy says so… +0:0-0-0 0-0 1 + +# do we like strange versions? Yes we like strange versions… +0 0 0 +0 00 0 + +# "steal" the testcases from cupt +1.2.3 1.2.3 0 # identical +4.4.3-2 4.4.3-2 0 # identical +1:2ab:5 1:2ab:5 0 # this is correct... +7:1-a:b-5 7:1-a:b-5 0 # and this +57:1.2.3abYZ+~-4-5 57:1.2.3abYZ+~-4-5 0 # and those too +1.2.3 0:1.2.3 0 # zero epoch +1.2.3 1.2.3-0 0 # zero revision +009 9 0 # zeroes... +009ab5 9ab5 0 # there as well +1.2.3 1.2.3-1 -1 # added non-zero revision +1.2.3 1.2.4 -1 # just bigger +1.2.4 1.2.3 1 # order doesn't matter +1.2.24 1.2.3 1 # bigger, eh? +0.10.0 0.8.7 1 # bigger, eh? +3.2 2.3 1 # major number rocks +1.3.2a 1.3.2 1 # letters rock +0.5.0~git 0.5.0~git2 -1 # numbers rock +2a 21 -1 # but not in all places +1.3.2a 1.3.2b -1 # but there is another letter +1:1.2.3 1.2.4 1 # epoch rocks +1:1.2.3 1:1.2.4 -1 # bigger anyway +1.2a+~bCd3 1.2a++ -1 # tilde doesn't rock +1.2a+~bCd3 1.2a+~ 1 # but first is longer! +5:2 304-2 1 # epoch rocks +5:2 304:2 -1 # so big epoch? +25:2 3:2 1 # 25 > 3, obviously +1:2:123 1:12:3 -1 # 12 > 2 +1.2-5 1.2-3-5 -1 # 1.2 < 1.2-3 +5.10.0 5.005 1 # preceding zeroes don't matters +3a9.8 3.10.2 -1 # letters are before all letter symbols +3a9.8 3~10 1 # but after the tilde +1.4+OOo3.0.0~ 1.4+OOo3.0.0-4 -1 # another tilde check +2.4.7-1 2.4.7-z -1 # revision comparing +1.002-1+b2 1.00 1 # whatever... +2.2.4-47978_Debian_lenny 2.2.4-47978_Debian_lenny 0 # and underscore... diff --git a/test/versiontest.cc b/test/versiontest.cc deleted file mode 100644 index 4ede4b280..000000000 --- a/test/versiontest.cc +++ /dev/null @@ -1,233 +0,0 @@ -// -*- mode: cpp; mode: fold -*- -// Description /*{{{*/ -// $Id: versiontest.cc,v 1.5 2003/08/18 15:55:19 mdz Exp $ -/* ###################################################################### - - Version Test - Simple program to run through a file and comare versions. - - Each version is compared and the result is checked against an expected - result in the file. The format of the file is - a b Res - Where Res is -1, 1, 0. dpkg -D=1 --compare-versions a "<" b can be - used to determine what Res should be. # at the start of the line - is a comment and blank lines are skipped - - ##################################################################### */ - /*}}}*/ -#include <apt-pkg/macros.h> -#include <apt-pkg/error.h> -#include <apt-pkg/version.h> -#include <apt-pkg/debversion.h> -#include <iostream> -#include <fstream> - -using namespace std; - - static int verrevcmp(const char *val, const char *ref) -{ - int vc, rc; - long vl, rl; - const char *vp, *rp; - - if (!val) - val = ""; - if (!ref) - ref = ""; - for (;;) - { - vp = val; - while (*vp && !isdigit(*vp)) - vp++; - rp = ref; - while (*rp && !isdigit(*rp)) - rp++; - for (;;) - { - vc= val == vp ? 0 : *val++; - rc= ref == rp ? 0 : *ref++; - if (!rc && !vc) - break; - if (vc && !isalpha(vc)) - vc += 256; /* assumes ASCII character set */ - if (rc && !isalpha(rc)) - rc += 256; - if (vc != rc) - return vc - rc; - } - val = vp; - ref = rp; - vl = 0; - if (isdigit(*vp)) - vl = strtol(val,(char**)&val,10); - rl = 0; - if (isdigit(*rp)) - rl = strtol(ref,(char**)&ref,10); - if (vl != rl) - return vl - rl; - if (!*val && !*ref) - return 0; - if (!*val) - return -1; - if (!*ref) - return +1; - } -} - -#if 0 -static int verrevcmp(const char *val, const char *ref) -{ - int vc, rc; - long vl, rl; - const char *vp, *rp; - - if (!val) val= ""; - if (!ref) ref= ""; - for (;;) - { - vp= val; while (*vp && !isdigit(*vp) && *vp != '~') vp++; - rp= ref; while (*rp && !isdigit(*rp) && *rp != '~') rp++; - for (;;) - { - vc= val == vp ? 0 : *val++; - rc= ref == rp ? 0 : *ref++; - if (!rc && !vc) break; - if (vc && !isalpha(vc)) vc += 256; /* assumes ASCII character set */ - if (rc && !isalpha(rc)) rc += 256; - if (vc != rc) return vc - rc; - } - - val= vp; - ref= rp; - if (*vp == '~') val++; - if (*rp == '~') ref++; - vl=0; if (isdigit(*val)) vl= strtol(val,(char**)&val,10); - rl=0; if (isdigit(*ref)) rl= strtol(ref,(char**)&ref,10); - if (vl == 0 && rl == 0) - { - if (*vp == '~' && *rp != '~') return -1; - if (*vp != '~' && *rp == '~') return +1; - } - if (*vp == '~') - vl *= -1; - if (*rp == '~') - rl *= -1; - if (vl != rl) return vl - rl; - if (!*val && !*ref) return 0; - if (!*val) - { - if (*ref == '~') - return +1; - else - return -1; - } - - if (!*ref) - { - if (*val == '~') - return -1; - else - return +1; - } - } -} -#endif - -bool RunTest(const char *File) -{ - ifstream F(File,ios::in); - if (!F != 0) - return false; - - char Buffer[300]; - int CurLine = 0; - - while (1) - { - F.getline(Buffer,sizeof(Buffer)); - CurLine++; - if (F.eof() != 0) - return true; - if (!F != 0) - return _error->Error("Line %u in %s is too long",CurLine,File); - - // Comment - if (Buffer[0] == '#' || Buffer[0] == 0) - continue; - - // First version - char *I; - char *Start = Buffer; - for (I = Buffer; *I != 0 && *I != ' '; I++); - string A(Start, I - Start); - - if (*I == 0) - return _error->Error("Invalid line %u",CurLine); - - // Second version - I++; - Start = I; - for (I = Start; *I != 0 && *I != ' '; I++); - string B(Start,I - Start); - - if (*I == 0 || I[1] == 0) - return _error->Error("Invalid line %u",CurLine); - - // Result - I++; - int Expected = atoi(I); - int Res = debVS.CmpVersion(A.c_str(), B.c_str()); - int Res2 = verrevcmp(A.c_str(),B.c_str()); - cout << "'" << A << "' ? '" << B << "' = " << Res << " (= " << Expected << ") " << Res2 << endl; - - if (Res < 0) - Res = -1; - else if (Res > 0) - Res = 1; - - if (Res != Expected) - _error->Error("Comparison failed on line %u. '%s' ? '%s' %i != %i",CurLine,A.c_str(),B.c_str(),Res,Expected); - - // Check the reverse as well - Expected = -1*Expected; - Res = debVS.CmpVersion(B.c_str(), A.c_str()); - Res2 = verrevcmp(B.c_str(),A.c_str()); - - cout << "'" << B << "' ? '" << A << "' = " << Res << " (= " << Expected << ") " << Res2 << endl; - - if (Res < 0) - Res = -1; - else if (Res > 0) - Res = 1; - - if (Res != Expected) - _error->Error("Comparison failed on line %u. '%s' ? '%s' %i != %i",CurLine,B.c_str(),A.c_str(),Res,Expected); - } -} - -int main(int argc, char *argv[]) -{ - if (argc <= 1) - { - cerr << "You must specify a test file" << endl; - return 0; - } - - RunTest(argv[1]); - - // Print any errors or warnings found - if (_error->empty() == false) - { - string Err; - while (_error->empty() == false) - { - - bool Type = _error->PopMessage(Err); - if (Type == true) - cout << "E: " << Err << endl; - else - cout << "W: " << Err << endl; - } - - return 0; - } -} |