diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Dpkg/Changelog/Entry/Debian.pm | 1 | ||||
| -rw-r--r-- | scripts/Dpkg/Control/Hash.pm | 5 | ||||
| -rw-r--r-- | scripts/Dpkg/IPC.pm | 8 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V2.pm | 4 | ||||
| -rw-r--r-- | scripts/Dpkg/Source/Package/V3/quilt.pm | 24 | ||||
| -rwxr-xr-x | scripts/dpkg-scanpackages.pl | 20 | ||||
| -rwxr-xr-x | scripts/dpkg-source.pl | 2 | ||||
| -rw-r--r-- | scripts/po/ca.po | 190 | ||||
| -rw-r--r-- | scripts/po/de.po | 161 | ||||
| -rw-r--r-- | scripts/po/dpkg-dev.pot | 186 | ||||
| -rw-r--r-- | scripts/po/fr.po | 193 | ||||
| -rw-r--r-- | scripts/po/pl.po | 193 | ||||
| -rw-r--r-- | scripts/po/ru.po | 193 | ||||
| -rw-r--r-- | scripts/po/sv.po | 189 | ||||
| -rw-r--r-- | scripts/t/700_Dpkg_Control.t | 2 | ||||
| -rwxr-xr-x | scripts/update-alternatives.pl | 7 |
16 files changed, 749 insertions, 629 deletions
diff --git a/scripts/Dpkg/Changelog/Entry/Debian.pm b/scripts/Dpkg/Changelog/Entry/Debian.pm index 9399888e8..ccaf5046c 100644 --- a/scripts/Dpkg/Changelog/Entry/Debian.pm +++ b/scripts/Dpkg/Changelog/Entry/Debian.pm @@ -25,6 +25,7 @@ our @EXPORT_OK = qw($regex_header $regex_trailer find_closes); use Date::Parse; +use Dpkg::Gettext; use Dpkg::Control::Changelog; use Dpkg::Version; diff --git a/scripts/Dpkg/Control/Hash.pm b/scripts/Dpkg/Control/Hash.pm index afb177b7e..75fbc8957 100644 --- a/scripts/Dpkg/Control/Hash.pm +++ b/scripts/Dpkg/Control/Hash.pm @@ -52,6 +52,9 @@ unchanged directly after the field name, supplementary lines are modified. Empty lines and lines containing only dots are prefixed with " ." (space + dot) while other lines are prefixed with a single space. +During parsing, trailing spaces are stripped on all lines while leading +spaces are stripped only on the first line of each field. + =head1 FUNCTIONS =over 4 @@ -168,7 +171,7 @@ sub parse_fh { next if (m/^$/ and $paraborder); next if (m/^#/); $paraborder = 0; - if (m/^(\S+?)\s*:\s?(.*)$/) { + if (m/^(\S+?)\s*:\s*(.*)$/) { if (exists $self->{$1}) { unless ($$self->{'allow_duplicate'}) { syntaxerr($desc, sprintf(_g("duplicate field %s found"), $1)); diff --git a/scripts/Dpkg/IPC.pm b/scripts/Dpkg/IPC.pm index 4302ffa92..116051d32 100644 --- a/scripts/Dpkg/IPC.pm +++ b/scripts/Dpkg/IPC.pm @@ -278,8 +278,14 @@ sub fork_and_exec { ${$opts{"error_to_string"}} = readline($error_to_string_pipe); } if ($opts{"wait_child"}) { + my $cmdline = "@prog"; + if ($opts{"env"}) { + foreach (keys %{$opts{"env"}}) { + $cmdline = "$_=\"" . $opts{"env"}{$_} . "\" $cmdline"; + } + } wait_child($pid, nocheck => $opts{"nocheck"}, - timeout => $opts{"timeout"}, cmdline => "@prog"); + timeout => $opts{"timeout"}, cmdline => $cmdline); return 1; } diff --git a/scripts/Dpkg/Source/Package/V2.pm b/scripts/Dpkg/Source/Package/V2.pm index e1874cb2d..6757795c3 100644 --- a/scripts/Dpkg/Source/Package/V2.pm +++ b/scripts/Dpkg/Source/Package/V2.pm @@ -248,6 +248,10 @@ sub do_build { my @origtarballs; foreach (sort $self->find_original_tarballs()) { if (/\.orig\.tar\.$comp_regex$/) { + if (defined($tarfile)) { + error(_g("several orig.tar files found (%s and %s) but only " . + "one is allowed"), $tarfile, $_); + } $tarfile = $_; push @origtarballs, $_; $self->add_file($_); diff --git a/scripts/Dpkg/Source/Package/V3/quilt.pm b/scripts/Dpkg/Source/Package/V3/quilt.pm index 2400c96fa..ca527c193 100644 --- a/scripts/Dpkg/Source/Package/V3/quilt.pm +++ b/scripts/Dpkg/Source/Package/V3/quilt.pm @@ -55,6 +55,24 @@ sub parse_cmdline_option { return 0; } +sub can_build { + my ($self, $dir) = @_; + my ($code, $msg) = $self->SUPER::can_build($dir); + return ($code, $msg) if $code eq 0; + my $pd = File::Spec->catdir($dir, "debian", "patches"); + if (-e $pd and not -d _) { + return (0, sprintf(_g("%s should be a directory or non-existing"), $pd)); + } + my $series_vendor = $self->get_series_file($dir); + my $series_main = File::Spec->catfile($pd, "series"); + foreach my $series ($series_vendor, $series_main) { + if (defined($series) and -e $series and not -f _) { + return (0, sprintf(_g("%s should be a file or non-existing"), $series)); + } + } + return (1, ""); +} + sub get_autopatch_name { my ($self) = @_; return "debian-changes-" . $self->{'fields'}{'Version'}; @@ -114,7 +132,10 @@ sub run_quilt { } my %opts = ( env => { QUILT_PATCHES => "$absdir/debian/patches", - QUILT_SERIES => $series }, + QUILT_SERIES => $series, + # Kept as close as possible to default patch options in + # Dpkg::Source::Patch (used in without_quilt mode) + QUILT_PATCH_OPTS => "-t -F 0 -N -u -V never -g0" }, 'chdir' => $dir, 'exec' => [ 'quilt', '--quiltrc', '/dev/null', @$params ], %more_opts @@ -169,7 +190,6 @@ sub apply_patches { $opts{"to_file"} = "/dev/null" if $skip_auto; info(_g("applying all patches with %s"), "quilt push -q " . $patches[-1]) unless $skip_auto; $self->run_quilt($dir, ['push', '-q', $patches[-1]], - delete_env => ['QUILT_PATCH_OPTS'], wait_child => 1, %opts); foreach my $patch (@patches) { foreach my $fn (keys %{$panalysis->{$patch}->{'filepatched'}}) { diff --git a/scripts/dpkg-scanpackages.pl b/scripts/dpkg-scanpackages.pl index a116ec960..28df3efd0 100755 --- a/scripts/dpkg-scanpackages.pl +++ b/scripts/dpkg-scanpackages.pl @@ -20,7 +20,6 @@ use strict; use IO::Handle; use IO::File; -use IO::String; use Getopt::Long qw(:config posix_default bundling no_ignorecase); use Dpkg; @@ -30,6 +29,7 @@ use Dpkg::Control; use Dpkg::Version; use Dpkg::Checksums; use Dpkg::Source::CompressedFile; +use Dpkg::IPC; textdomain("dpkg-dev"); @@ -189,23 +189,19 @@ FILE: while (<$find_h>) { chomp; my $fn = $_; - my $control = `dpkg-deb -I $fn control`; - if ($control eq "") { - warning(_g("Couldn't call dpkg-deb on %s: %s, skipping package"), - $fn, $!); - next; - } + my $output; + my $pid = fork_and_exec('exec' => [ "dpkg-deb", "-I", $fn, "control" ], + 'to_pipe' => \$output); + my $fields = Dpkg::Control->new(type => CTRL_INDEX_PKG); + $fields->parse_fh($output, $fn) + or error(_g("couldn't parse control information from %s."), $fn); + wait_child($pid, no_check => 1); if ($?) { warning(_g("\`dpkg-deb -I %s control' exited with %d, skipping package"), $fn, $?); next; } - my $fields = Dpkg::Control->new(type => CTRL_INDEX_PKG); - my $io = IO::String->new($control); - $fields->parse_fh($io, $fn) - or error(_g("couldn't parse control information from %s."), $fn); - defined($fields->{'Package'}) or error(_g("No Package field in control file of %s"), $fn); my $p = $fields->{'Package'}; diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl index b68549f7d..762772b53 100755 --- a/scripts/dpkg-source.pl +++ b/scripts/dpkg-source.pl @@ -45,7 +45,7 @@ my $controlfile; my $changelogfile; my $changelogformat; -my @build_formats = ("1.0", "3.0 (native)"); +my @build_formats = ("1.0", "3.0 (quilt)", "3.0 (native)"); my %options = ( # Compression related compression => $Dpkg::Source::Compressor::default_compression, diff --git a/scripts/po/ca.po b/scripts/po/ca.po index 0d0efeab9..f336588b5 100644 --- a/scripts/po/ca.po +++ b/scripts/po/ca.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.13.22\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2009-11-17 10:12+0100\n" +"POT-Creation-Date: 2009-11-27 18:45+0100\n" "PO-Revision-Date: 2006-12-04 13:59+0100\n" "Last-Translator: Jordi Mallach <jordi@debian.org>\n" "Language-Team: Catalan <debian-l10n-catalan@lists.debian.org>\n" @@ -915,76 +915,71 @@ msgstr "" msgid "Couldn't open %s for reading" msgstr "" -#: scripts/dpkg-scanpackages.pl:194 -#, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" -msgstr "" +#: scripts/dpkg-scanpackages.pl:197 +#, fuzzy, perl-format +msgid "couldn't parse control information from %s." +msgstr "no es pot combinar -b o -B amb -S" -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "" -#: scripts/dpkg-scanpackages.pl:207 -#, fuzzy, perl-format -msgid "couldn't parse control information from %s." -msgstr "no es pot combinar -b o -B amb -S" - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "" @@ -1049,7 +1044,7 @@ msgstr "" msgid "1 to 3 args expected\n" msgstr "" -#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:817 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, fuzzy, perl-format msgid "cannot fork for %s" @@ -1192,27 +1187,27 @@ msgid "" " %s\n" msgstr "" -#: scripts/dpkg-shlibdeps.pl:659 +#: scripts/dpkg-shlibdeps.pl:660 #, perl-format msgid "Can't extract name and version from library name `%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl:666 +#: scripts/dpkg-shlibdeps.pl:667 #, perl-format msgid "unable to open shared libs info file `%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl:672 +#: scripts/dpkg-shlibdeps.pl:673 #, perl-format msgid "shared libs info file `%s' line %d: bad line `%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl:730 +#: scripts/dpkg-shlibdeps.pl:731 #, fuzzy, perl-format msgid "cannot open file %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/dpkg-shlibdeps.pl:764 +#: scripts/dpkg-shlibdeps.pl:765 #, perl-format msgid "" "$ORIGIN is used in RPATH of %s and the corresponding directory could not be " @@ -1220,19 +1215,19 @@ msgid "" "build tree" msgstr "" -#: scripts/dpkg-shlibdeps.pl:824 +#: scripts/dpkg-shlibdeps.pl:825 msgid "cannot exec dpkg" msgstr "" -#: scripts/dpkg-shlibdeps.pl:829 +#: scripts/dpkg-shlibdeps.pl:830 msgid "diversions involved - output may be incorrect" msgstr "" -#: scripts/dpkg-shlibdeps.pl:831 +#: scripts/dpkg-shlibdeps.pl:832 msgid "write diversion info to stderr" msgstr "" -#: scripts/dpkg-shlibdeps.pl:835 +#: scripts/dpkg-shlibdeps.pl:836 #, perl-format msgid "unknown output from dpkg --search: '%s'" msgstr "" @@ -1284,11 +1279,11 @@ msgstr "" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "" @@ -1304,7 +1299,7 @@ msgid "using source format `%s'" msgstr "" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -1590,7 +1585,7 @@ msgid "found trailer where expected %s" msgstr "" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "" @@ -1613,36 +1608,36 @@ msgstr "" msgid "found eof where expected %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, perl-format msgid "badly formatted urgency value: %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, perl-format msgid "unknown key-value %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, fuzzy, perl-format msgid "couldn't parse date %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "" @@ -1759,12 +1754,12 @@ msgstr "" msgid "entry in dpkg's status file" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:441 +#: scripts/Dpkg/Control/Fields.pm:442 #, perl-format msgid "unknown information field '%s' in input data in %s" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:442 +#: scripts/Dpkg/Control/Fields.pm:443 msgid "control information" msgstr "" @@ -1776,37 +1771,37 @@ msgstr "" msgid "block lacks a package field" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "" @@ -1877,11 +1872,11 @@ msgstr "" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, fuzzy, perl-format msgid "cannot write %s" msgstr "no es pot combinar -b o -B amb -S" @@ -1890,16 +1885,16 @@ msgstr "no es pot combinar -b o -B amb -S" msgid "reopen stdout" msgstr "" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, fuzzy, perl-format msgid "wait for %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -1960,7 +1955,7 @@ msgstr "" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, fuzzy, perl-format msgid "cannot create directory %s" msgstr "no es pot combinar -b o -B amb -S" @@ -2000,7 +1995,7 @@ msgstr "" msgid "rm -rf failed to remove `%s'" msgstr "" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "" @@ -2072,7 +2067,7 @@ msgstr "" msgid "ignoring deletion of symlink %s" msgstr "" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, fuzzy, perl-format msgid "cannot represent change to %s: %s" msgstr "%s: hi ha canvis no representables al font" @@ -2163,7 +2158,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "" @@ -2330,7 +2325,7 @@ msgid "failed to rename saved %s to %s" msgstr "" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, fuzzy, perl-format msgid "applying %s" msgstr "%s: s'està aplicant %s" @@ -2436,14 +2431,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, fuzzy, perl-format msgid "building %s using existing %s" msgstr "%s: s'està construint %s a %s" @@ -2490,12 +2485,12 @@ msgstr "" msgid "required removal of `%s' installed by original tarball" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -2509,50 +2504,55 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " "binary in the debian tarball" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, fuzzy, perl-format msgid "unwanted binary file: %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" "binaries to allow their inclusion)." msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 #, fuzzy msgid "unrepresentable changes to source" msgstr "%s: hi ha canvis no representables al font" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, fuzzy, perl-format msgid "cannot remove %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, fuzzy, perl-format msgid "cannot rename %s to %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, fuzzy, perl-format msgid "adding %s to %s" msgstr "%s: s'està construint %s a %s" @@ -2691,19 +2691,29 @@ msgstr "" msgid "The following setting(s) were disabled by dpkg-source" msgstr "" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" "source might fail when applying patches." msgstr "" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, fuzzy, perl-format msgid "can't create symlink %s" msgstr "no es pot combinar -b o -B amb -S" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "" @@ -2760,21 +2770,21 @@ msgid "" "Maintainer field" msgstr "" -#: scripts/Dpkg/Version.pm:173 scripts/Dpkg/Version.pm:174 +#: scripts/Dpkg/Version.pm:193 scripts/Dpkg/Version.pm:194 #, perl-format msgid "%s is not a valid version" msgstr "" -#: scripts/Dpkg/Version.pm:335 +#: scripts/Dpkg/Version.pm:355 msgid "version number cannot be empty" msgstr "" -#: scripts/Dpkg/Version.pm:340 +#: scripts/Dpkg/Version.pm:360 #, perl-format msgid "version number contains illegal character `%s'" msgstr "" -#: scripts/Dpkg/Version.pm:346 +#: scripts/Dpkg/Version.pm:366 #, perl-format msgid "epoch part of the version number is not a number: '%s'" msgstr "" diff --git a/scripts/po/de.po b/scripts/po/de.po index 5f22a6623..a93715b53 100644 --- a/scripts/po/de.po +++ b/scripts/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg scripts\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2009-11-23 19:24+0100\n" +"POT-Creation-Date: 2009-11-27 18:45+0100\n" "PO-Revision-Date: 2009-11-23 19:29+0100\n" "Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n" "Language-Team: de <debian-l10n-german@lists.debian.org>\n" @@ -1177,76 +1177,71 @@ msgstr "Override-Datei %s nicht gefunden" msgid "Couldn't open %s for reading" msgstr "Konnte %s nicht zum Lesen ffnen" -#: scripts/dpkg-scanpackages.pl:194 +#: scripts/dpkg-scanpackages.pl:197 #, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" -msgstr "Konnte dpkg-deb auf %s nicht aufrufen: %s, berspringe Paket" +msgid "couldn't parse control information from %s." +msgstr "Konnte Steuerinformationen aus %s nicht auswerten." -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "dpkg-deb -I %s control beendete sich mit %d, berspringe Paket" -#: scripts/dpkg-scanpackages.pl:207 -#, perl-format -msgid "couldn't parse control information from %s." -msgstr "Konnte Steuerinformationen aus %s nicht auswerten." - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "Kein Package-Feld in Steuerdatei von %s" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "Paket %s (Dateiname %s) ist wiederholt aber neuere Version;" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "verwendete dieses und ignorierte Daten aus %s!" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "Paket %s (Dateiname %s) ist wiederholt;" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "ignorierte dieses und verwende Daten aus %s!" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "Paket %s (Dateiname %s) hat Feld Filename!" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "Fehler beim Schreiben nach Stdout" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "konnte Stdout nicht schlieen" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "Pakete in Override-Datei mit ungltigem alten Betreuer-Wert:" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "Pakete spezifizieren gleichen Betreuer wie Override-Datei:" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "Pakete im Archiv, die aber in Override-Datei fehlen:" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "Pakete in Override-Datei aber nicht im Archiv:" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "%s Eintrge in Ausgabe-Paketdatei geschrieben." @@ -1328,7 +1323,7 @@ msgstr "keine Binrpakete in %s angegeben" msgid "1 to 3 args expected\n" msgstr "1 bis 3 Argumente erwartet\n" -#: scripts/dpkg-scansources.pl:326 scripts/dpkg-shlibdeps.pl:818 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, perl-format msgid "cannot fork for %s" @@ -1618,11 +1613,11 @@ msgstr "Architektur %s ist nur alleine erlaubt (Liste fr Paket %s lautet %s)" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "kann %s nicht lesen" @@ -1638,7 +1633,7 @@ msgid "using source format `%s'" msgstr "verwende Quellformat %s" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -1996,7 +1991,7 @@ msgid "found trailer where expected %s" msgstr "Nachspann gefunden aber %s erwartet" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "ungltig formatierte Zeile im Nachspann" @@ -2019,36 +2014,36 @@ msgstr "Zeile nicht erkannt" msgid "found eof where expected %s" msgstr "fand EOF wo %s erwartet wurde" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "ungltiger Schlsselwert nach ;: %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "wiederholter Schlsselwert %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, perl-format msgid "badly formatted urgency value: %s" msgstr "falsch formatierter Dringlichkeitswert: %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, perl-format msgid "unknown key-value %s" msgstr "unbekannter Schlsselwert %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "die Kopfzeile passte nicht auf den erwarteten regulren Ausdruck" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, perl-format msgid "couldn't parse date %s" msgstr "konnte Datum %s nicht auswerten" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "der Abspann passte nicht auf den erwarteten regulren Ausdruck" @@ -2182,37 +2177,37 @@ msgstr "im ersten Block fehlt ein Feld source" msgid "block lacks a package field" msgstr "im Block fehlt ein Feld package" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "doppeltes Feld %s gefunden" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "fortgefhrte Wertzeile nicht im Feld" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "PGP-Signatur hier nicht erlaubt" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "erwartete PGP-Signatur, fand EOF nach einer Leerzeile" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "erwartete PGP-Signatur, fand etwas anderes %s" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "unvollstndige PGP-Signatur" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "Zeile mit unbekanntem Format (nicht Feld-Doppelpunkt-Wert)" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "Schreibfehler bei Steuerdaten (control data)" @@ -2283,11 +2278,11 @@ msgstr "ffne Stdin erneut" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, perl-format msgid "cannot write %s" msgstr "kann %s nicht schreiben" @@ -2296,16 +2291,16 @@ msgstr "kann %s nicht schreiben" msgid "reopen stdout" msgstr "ffne Stdout erneut" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "Kindprozess" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, perl-format msgid "wait for %s" msgstr "warte auf %s" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -2370,7 +2365,7 @@ msgstr "schliee auf Tar-Eingabe" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, perl-format msgid "cannot create directory %s" msgstr "kann Verzeichnis %s nicht anlegen" @@ -2410,7 +2405,7 @@ msgstr "kann nicht auf Entfernung des Verzeichnisses %s prfen" msgid "rm -rf failed to remove `%s'" msgstr "rm -rf entfernte %s nicht" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "Inhalt der Binrdatei gendert" @@ -2484,7 +2479,7 @@ msgstr "ignoriere Lschen des Verzeichnisses %s" msgid "ignoring deletion of symlink %s" msgstr "ignoriere Lschen des Symlinks %s" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, perl-format msgid "cannot represent change to %s: %s" msgstr "kann nderungen an %s nicht darstellen: %s" @@ -2576,7 +2571,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "Diff %s enthlt keinen Patch" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "kann Zeitstempel fr %s nicht ndern" @@ -2743,7 +2738,7 @@ msgid "failed to rename saved %s to %s" msgstr "Fehler beim Umbenennen des gesicherten %s in %s" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, perl-format msgid "applying %s" msgstr "wende %s an" @@ -2864,14 +2859,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "konnte %s (neu angelegt) nicht in %s umbenennen" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "konnte Berechtigungen auf %s nicht ndern" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, perl-format msgid "building %s using existing %s" msgstr "baue %s unter Benutzung des existierenden %s" @@ -2923,12 +2918,12 @@ msgstr "fehlende orig.tar- oder debian.tar-Datei in v2.0-Quellpaket" msgid "required removal of `%s' installed by original tarball" msgstr "erforderliche Entfernung von %s, installiert durch Original-Tarball" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "keine orig.tar-Datei gefunden" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -2944,11 +2939,16 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "-b akzeptiert nur einen Parameter mit dem Format %s" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "Kopie des debian-Verzeichnisses" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " @@ -2957,12 +2957,12 @@ msgstr "" "fgen Sie %s zu debian/source/include-binaries hinzu, falls Sie das " "vernderte Programme im Debian-Tarball speichern mchten." -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, perl-format msgid "unwanted binary file: %s" msgstr "unerwnschte Binrdate: %s" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" @@ -2971,26 +2971,26 @@ msgstr "" "erkannte %d unerwnschte Binrdatei(en) (fgen sie zu debian/source/include-" "binaries hinzu, um ihre Aufnahme zu erlauben)." -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 msgid "unrepresentable changes to source" msgstr "nicht darstellbare nderungen an den Quellen" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, perl-format msgid "cannot remove %s" msgstr "kann %s nicht entfernen" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "lokale nderungen in %s gespeichert, die vernderten Dateien sind:" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, perl-format msgid "cannot rename %s to %s" msgstr "kann %s nicht in %s umbenennen" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, perl-format msgid "adding %s to %s" msgstr "fge %s zu %s hinzu" @@ -3138,7 +3138,17 @@ msgstr "kann nicht an %s anhngen" msgid "The following setting(s) were disabled by dpkg-source" msgstr "Die folgende(n) Einstellungen wurden von dpkg-source deaktiviert" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" @@ -3147,12 +3157,12 @@ msgstr "" "die Seriendatei (%s) enthlt nicht untersttzte Optionen (%s, Zeile %s), " "dpkg-source knnte beim Anwenden der Patches scheitern." -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, perl-format msgid "can't create symlink %s" msgstr "kann Symlink %s nicht anlegen" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "wende alle Patches mit %s an" @@ -3232,6 +3242,9 @@ msgstr "Versionsnummer enthlt ungltiges Zeichen %s" msgid "epoch part of the version number is not a number: '%s'" msgstr "Epoch-Teil der Versionsnummer ist keine Zahl: %s" +#~ msgid "Couldn't call dpkg-deb on %s: %s, skipping package" +#~ msgstr "Konnte dpkg-deb auf %s nicht aufrufen: %s, berspringe Paket" + #~ msgid "" #~ "Unprocessed text from %s control file; info:\n" #~ "%s / %s" diff --git a/scripts/po/dpkg-dev.pot b/scripts/po/dpkg-dev.pot index b6bb517b0..9c0681091 100644 --- a/scripts/po/dpkg-dev.pot +++ b/scripts/po/dpkg-dev.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2009-11-17 10:12+0100\n" +"POT-Creation-Date: 2009-11-27 18:45+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" @@ -901,76 +901,71 @@ msgstr "" msgid "Couldn't open %s for reading" msgstr "" -#: scripts/dpkg-scanpackages.pl:194 +#: scripts/dpkg-scanpackages.pl:197 #, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" +msgid "couldn't parse control information from %s." msgstr "" -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "" -#: scripts/dpkg-scanpackages.pl:207 -#, perl-format -msgid "couldn't parse control information from %s." -msgstr "" - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "" @@ -1035,7 +1030,7 @@ msgstr "" msgid "1 to 3 args expected\n" msgstr "" -#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:817 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, perl-format msgid "cannot fork for %s" @@ -1174,27 +1169,27 @@ msgid "" " %s\n" msgstr "" -#: scripts/dpkg-shlibdeps.pl:659 +#: scripts/dpkg-shlibdeps.pl:660 #, perl-format msgid "Can't extract name and version from library name `%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl:666 +#: scripts/dpkg-shlibdeps.pl:667 #, perl-format msgid "unable to open shared libs info file `%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl:672 +#: scripts/dpkg-shlibdeps.pl:673 #, perl-format msgid "shared libs info file `%s' line %d: bad line `%s'" msgstr "" -#: scripts/dpkg-shlibdeps.pl:730 +#: scripts/dpkg-shlibdeps.pl:731 #, perl-format msgid "cannot open file %s" msgstr "" -#: scripts/dpkg-shlibdeps.pl:764 +#: scripts/dpkg-shlibdeps.pl:765 #, perl-format msgid "" "$ORIGIN is used in RPATH of %s and the corresponding directory could not be " @@ -1202,19 +1197,19 @@ msgid "" "build tree" msgstr "" -#: scripts/dpkg-shlibdeps.pl:824 +#: scripts/dpkg-shlibdeps.pl:825 msgid "cannot exec dpkg" msgstr "" -#: scripts/dpkg-shlibdeps.pl:829 +#: scripts/dpkg-shlibdeps.pl:830 msgid "diversions involved - output may be incorrect" msgstr "" -#: scripts/dpkg-shlibdeps.pl:831 +#: scripts/dpkg-shlibdeps.pl:832 msgid "write diversion info to stderr" msgstr "" -#: scripts/dpkg-shlibdeps.pl:835 +#: scripts/dpkg-shlibdeps.pl:836 #, perl-format msgid "unknown output from dpkg --search: '%s'" msgstr "" @@ -1266,11 +1261,11 @@ msgstr "" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "" @@ -1286,7 +1281,7 @@ msgid "using source format `%s'" msgstr "" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -1562,7 +1557,7 @@ msgid "found trailer where expected %s" msgstr "" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "" @@ -1585,36 +1580,36 @@ msgstr "" msgid "found eof where expected %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, perl-format msgid "badly formatted urgency value: %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, perl-format msgid "unknown key-value %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, perl-format msgid "couldn't parse date %s" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "" @@ -1731,12 +1726,12 @@ msgstr "" msgid "entry in dpkg's status file" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:441 +#: scripts/Dpkg/Control/Fields.pm:442 #, perl-format msgid "unknown information field '%s' in input data in %s" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:442 +#: scripts/Dpkg/Control/Fields.pm:443 msgid "control information" msgstr "" @@ -1748,37 +1743,37 @@ msgstr "" msgid "block lacks a package field" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "" @@ -1848,11 +1843,11 @@ msgstr "" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, perl-format msgid "cannot write %s" msgstr "" @@ -1861,16 +1856,16 @@ msgstr "" msgid "reopen stdout" msgstr "" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, perl-format msgid "wait for %s" msgstr "" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -1931,7 +1926,7 @@ msgstr "" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, perl-format msgid "cannot create directory %s" msgstr "" @@ -1971,7 +1966,7 @@ msgstr "" msgid "rm -rf failed to remove `%s'" msgstr "" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "" @@ -2043,7 +2038,7 @@ msgstr "" msgid "ignoring deletion of symlink %s" msgstr "" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, perl-format msgid "cannot represent change to %s: %s" msgstr "" @@ -2134,7 +2129,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "" @@ -2300,7 +2295,7 @@ msgid "failed to rename saved %s to %s" msgstr "" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, perl-format msgid "applying %s" msgstr "" @@ -2406,14 +2401,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, perl-format msgid "building %s using existing %s" msgstr "" @@ -2460,12 +2455,12 @@ msgstr "" msgid "required removal of `%s' installed by original tarball" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -2479,49 +2474,54 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " "binary in the debian tarball" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, perl-format msgid "unwanted binary file: %s" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" "binaries to allow their inclusion)." msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 msgid "unrepresentable changes to source" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, perl-format msgid "cannot remove %s" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, perl-format msgid "cannot rename %s to %s" msgstr "" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, perl-format msgid "adding %s to %s" msgstr "" @@ -2660,19 +2660,29 @@ msgstr "" msgid "The following setting(s) were disabled by dpkg-source" msgstr "" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" "source might fail when applying patches." msgstr "" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, perl-format msgid "can't create symlink %s" msgstr "" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "" @@ -2729,21 +2739,21 @@ msgid "" "Maintainer field" msgstr "" -#: scripts/Dpkg/Version.pm:173 scripts/Dpkg/Version.pm:174 +#: scripts/Dpkg/Version.pm:193 scripts/Dpkg/Version.pm:194 #, perl-format msgid "%s is not a valid version" msgstr "" -#: scripts/Dpkg/Version.pm:335 +#: scripts/Dpkg/Version.pm:355 msgid "version number cannot be empty" msgstr "" -#: scripts/Dpkg/Version.pm:340 +#: scripts/Dpkg/Version.pm:360 #, perl-format msgid "version number contains illegal character `%s'" msgstr "" -#: scripts/Dpkg/Version.pm:346 +#: scripts/Dpkg/Version.pm:366 #, perl-format msgid "epoch part of the version number is not a number: '%s'" msgstr "" diff --git a/scripts/po/fr.po b/scripts/po/fr.po index 198ad6fd2..ce38d8424 100644 --- a/scripts/po/fr.po +++ b/scripts/po/fr.po @@ -9,7 +9,7 @@ msgid "" msgstr "" "Project-Id-Version: fr\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2009-11-17 10:12+0100\n" +"POT-Creation-Date: 2009-11-27 18:45+0100\n" "PO-Revision-Date: 2009-07-21 19:22+0200\n" "Last-Translator: Christian Perrier <bubulle@debian.org>\n" "Language-Team: French <debian-l10n-french@lists.debian.org>\n" @@ -1230,78 +1230,73 @@ msgstr "Fichier override %s non trouvé" msgid "Couldn't open %s for reading" msgstr "Impossible de lire %s" -#: scripts/dpkg-scanpackages.pl:194 -#, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" -msgstr "Impossible d'appeler dpkg-deb sur %s : %s, paquet sauté" +#: scripts/dpkg-scanpackages.pl:197 +#, fuzzy, perl-format +msgid "couldn't parse control information from %s." +msgstr "Impossible d'analyser l'enregistrement d'allocation dynamique : %s" -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "« dpkg-deb -I %s control », sortie avec %d, paquet sauté" -#: scripts/dpkg-scanpackages.pl:207 -#, fuzzy, perl-format -msgid "couldn't parse control information from %s." -msgstr "Impossible d'analyser l'enregistrement d'allocation dynamique : %s" - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "Pas de champ Package dans le fichier de contrôle de %s" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "Le paquet %s (nom %s) répété, mais version plus récente" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "celui-ci a été ignoré et les données de %s ont été ignorées !" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "Le paquet %s (nom %s) est répété ;" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "celui-ci a été ignoré et les données de %s ont été utilisées !" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "Le paquet %s (nom %s) a un champ Filename !" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "Impossible d'écrire sur stdout" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "Impossible de fermer stdout" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "" "Paquets dans le fichier d'override avec valeur incorrecte pour l'ancien " "responsable :" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "Paquets indiquant le même responsable que le fichier d'override :" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "Paquets dans l'archive mais pas dans le fichier d'override :" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "Paquets dans le fichier d'override mais pas dans l'archive :" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "%s entrées écrites dans le fichier Packages." @@ -1383,7 +1378,7 @@ msgstr "pas de paquet binaire indiqué dans %s" msgid "1 to 3 args expected\n" msgstr "de 1 à 3 paramètres attendus\n" -#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:817 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, fuzzy, perl-format msgid "cannot fork for %s" @@ -1575,31 +1570,31 @@ msgstr "" "Champs de dépendance reconnus :\n" " %s\n" -#: scripts/dpkg-shlibdeps.pl:659 +#: scripts/dpkg-shlibdeps.pl:660 #, perl-format msgid "Can't extract name and version from library name `%s'" msgstr "" "Impossible d'extraire le nom et la version du nom de la bibliothèque « %s »" -#: scripts/dpkg-shlibdeps.pl:666 +#: scripts/dpkg-shlibdeps.pl:667 #, perl-format msgid "unable to open shared libs info file `%s'" msgstr "" "impossible d'ouvrir le fichier d'info sur les bibliothèques partagées %s" -#: scripts/dpkg-shlibdeps.pl:672 +#: scripts/dpkg-shlibdeps.pl:673 #, perl-format msgid "shared libs info file `%s' line %d: bad line `%s'" msgstr "" "fichier info sur les bibliothèques partagées « %s », ligne %d : ligne mal " "formée « %s »" -#: scripts/dpkg-shlibdeps.pl:730 +#: scripts/dpkg-shlibdeps.pl:731 #, perl-format msgid "cannot open file %s" msgstr "impossible d'ouvrir le fichier %s" -#: scripts/dpkg-shlibdeps.pl:764 +#: scripts/dpkg-shlibdeps.pl:765 #, perl-format msgid "" "$ORIGIN is used in RPATH of %s and the corresponding directory could not be " @@ -1610,19 +1605,19 @@ msgstr "" "pas pu être identifié en raison de l'absence de sous-répertoire DEBIAN dans " "la racine de l'arborescence de construction du paquet" -#: scripts/dpkg-shlibdeps.pl:824 +#: scripts/dpkg-shlibdeps.pl:825 msgid "cannot exec dpkg" msgstr "impossible d'exécuter dpkg" -#: scripts/dpkg-shlibdeps.pl:829 +#: scripts/dpkg-shlibdeps.pl:830 msgid "diversions involved - output may be incorrect" msgstr "détournements en jeu, la sortie peut être incorrecte" -#: scripts/dpkg-shlibdeps.pl:831 +#: scripts/dpkg-shlibdeps.pl:832 msgid "write diversion info to stderr" msgstr "info sur le détournement envoyée sur stderr" -#: scripts/dpkg-shlibdeps.pl:835 +#: scripts/dpkg-shlibdeps.pl:836 #, perl-format msgid "unknown output from dpkg --search: '%s'" msgstr "résultat de dpkg --search inconnu : %s" @@ -1675,11 +1670,11 @@ msgstr "" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "impossible de lire %s" @@ -1695,7 +1690,7 @@ msgid "using source format `%s'" msgstr "utilisation du format source « %s »" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -2078,7 +2073,7 @@ msgid "found trailer where expected %s" msgstr "ligne de fin trouvée, %s attendu" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "ligne de fin mal formée" @@ -2101,36 +2096,36 @@ msgstr "ligne non reconnue" msgid "found eof where expected %s" msgstr "fin de fichier trouvée, %s attendu" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "mauvaise clé-valeur après « ; » : %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "clé-valeur répété %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, fuzzy, perl-format msgid "badly formatted urgency value: %s" msgstr "valeur urgency mal formée" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, fuzzy, perl-format msgid "unknown key-value %s" msgstr "clé clé-valeur inconnue %s, copie dans XS-%s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, perl-format msgid "couldn't parse date %s" msgstr "impossible d'analyser la date %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "" @@ -2250,12 +2245,12 @@ msgstr "" msgid "entry in dpkg's status file" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:441 +#: scripts/Dpkg/Control/Fields.pm:442 #, perl-format msgid "unknown information field '%s' in input data in %s" msgstr "champ d'information inconnu « %s » dans les données d'entrée de %s" -#: scripts/Dpkg/Control/Fields.pm:442 +#: scripts/Dpkg/Control/Fields.pm:443 msgid "control information" msgstr "" @@ -2267,38 +2262,38 @@ msgstr "le premier bloc ne comporte pas de champ source" msgid "block lacks a package field" msgstr "le bloc ne comporte pas de champ de paquet" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "champ %s en double" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "la ligne continuée n'est pas dans le champ" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "signature PGP non autorisée ici" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "signature PGP attendue, EOF après ligne blanche trouvé" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "signature PGP attendue, « %s » trouvé" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "signature PGP non terminée" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "" "ligne de format inconnu, format différent de « champ-deux points-valeur »" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "erreur d'écriture sur des données de contrôle" @@ -2368,11 +2363,11 @@ msgstr "réouverture stdin" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, perl-format msgid "cannot write %s" msgstr "impossible d'écrire %s" @@ -2381,16 +2376,16 @@ msgstr "impossible d'écrire %s" msgid "reopen stdout" msgstr "réouverture stdout" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "processus fils" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, perl-format msgid "wait for %s" msgstr "attente de %s" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -2456,7 +2451,7 @@ msgstr "écriture sur la sortie de tar" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, perl-format msgid "cannot create directory %s" msgstr "impossible de créer le répertoire %s" @@ -2497,7 +2492,7 @@ msgstr "impossible de vérifier la suppression du répertoire %s" msgid "rm -rf failed to remove `%s'" msgstr "rm -rf n'a pas supprimé %s" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "contenu d'un fichier binaire modifié" @@ -2572,7 +2567,7 @@ msgstr "suppression du répertoire %s ignorée" msgid "ignoring deletion of symlink %s" msgstr "suppression du lien symbolique %s ignorée" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, perl-format msgid "cannot represent change to %s: %s" msgstr "impossible d'identifier les changements de %s : %s" @@ -2668,7 +2663,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "le diff %s ne contient pas de changement" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "impossible de modifier la date de %s" @@ -2838,7 +2833,7 @@ msgid "failed to rename saved %s to %s" msgstr "impossible de modifier le fichier sauvegardé %s en %s" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, perl-format msgid "applying %s" msgstr "mise en place de %s" @@ -2956,14 +2951,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "impossible de modifier %s (nouvellement créé) en %s" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "impossible de modifier les permissions de %s" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, perl-format msgid "building %s using existing %s" msgstr "construction de %s à partir de %s" @@ -3013,12 +3008,12 @@ msgid "required removal of `%s' installed by original tarball" msgstr "" "suppression indispensable de « %s » installé par l'archive tar originale" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "pas de fichier orig.tar trouvé" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -3034,11 +3029,16 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "-b n'utilise qu'un paramètre avec le format « %s »" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "copie du répertoire debian" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " @@ -3047,12 +3047,12 @@ msgstr "" "Ajoutez %s dans debian/source/include-binaries si vous souhaitez conserver " "le binaire modifié dans le ficher tar debian" -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, perl-format msgid "unwanted binary file: %s" msgstr "fichier binaire non souhaité : %s" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" @@ -3062,27 +3062,27 @@ msgstr "" "les ajouter dans debian/source/include-binaries pour autoriser leur " "inclusion)." -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 msgid "unrepresentable changes to source" msgstr "modifications non représentables des sources" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, perl-format msgid "cannot remove %s" msgstr "impossible de supprimer %s" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "" "modifications locales enregistrées dans %s, les fichiers modifiés sont :" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, perl-format msgid "cannot rename %s to %s" msgstr "impossible de renommer %s en %s" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, perl-format msgid "adding %s to %s" msgstr "ajout de %s à %s" @@ -3233,7 +3233,17 @@ msgstr "impossible d'ajouter à %s" msgid "The following setting(s) were disabled by dpkg-source" msgstr "Le(s) réglage(s) suivant(s) est(sont) désactivé(s) par dpkg-source" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" @@ -3242,12 +3252,12 @@ msgstr "" "le fichier « series » (%s) contient des options non gérées (« %s », ligne %s), " "dpkg-source pourrait échouer dans l'application des correctifs." -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, perl-format msgid "can't create symlink %s" msgstr "impossible de lire le lien symbolique %s" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "application de toutes les corrections avec %s" @@ -3309,25 +3319,28 @@ msgstr "" "Le numéro de version indique des modifications Ubuntu mais il n'existe pas " "de champ « XSBC-Original-Maintainer: »" -#: scripts/Dpkg/Version.pm:173 scripts/Dpkg/Version.pm:174 +#: scripts/Dpkg/Version.pm:193 scripts/Dpkg/Version.pm:194 #, fuzzy, perl-format msgid "%s is not a valid version" msgstr "%s n'est pas une option valable pour %s" -#: scripts/Dpkg/Version.pm:335 +#: scripts/Dpkg/Version.pm:355 msgid "version number cannot be empty" msgstr "" -#: scripts/Dpkg/Version.pm:340 +#: scripts/Dpkg/Version.pm:360 #, perl-format msgid "version number contains illegal character `%s'" msgstr "le numéro de version contient un caractère « %s » non autorisé" -#: scripts/Dpkg/Version.pm:346 +#: scripts/Dpkg/Version.pm:366 #, perl-format msgid "epoch part of the version number is not a number: '%s'" msgstr "" +#~ msgid "Couldn't call dpkg-deb on %s: %s, skipping package" +#~ msgstr "Impossible d'appeler dpkg-deb sur %s : %s, paquet sauté" + #~ msgid "Couldn't open override file %s" #~ msgstr "Impossible d'ouvrir le fichier d'override %s" diff --git a/scripts/po/pl.po b/scripts/po/pl.po index 6c3b03697..f89a161bf 100644 --- a/scripts/po/pl.po +++ b/scripts/po/pl.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.15.4\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2009-11-17 10:12+0100\n" +"POT-Creation-Date: 2009-11-27 18:45+0100\n" "PO-Revision-Date: 2009-09-22 16:17+0100\n" "Last-Translator: Wiktor Wandachowicz <siryes@gmail.com>\n" "Language-Team: Polish <debian-l10n-polish@lists.debian.org>\n" @@ -1164,78 +1164,73 @@ msgstr "Nie znaleziono pliku nadpisań %s" msgid "Couldn't open %s for reading" msgstr "Nie można otworzyć %s do odczytu" -#: scripts/dpkg-scanpackages.pl:194 -#, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" -msgstr "Nie można uruchomić dpkg-deb na %s: %s, pomijanie pakietu" +#: scripts/dpkg-scanpackages.pl:197 +#, fuzzy, perl-format +msgid "couldn't parse control information from %s." +msgstr "Nie można przetworzyć rekordu dynamicznej relokacji: %s" -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "" "\"dpkg-deb -I %s control\" zakończył działanie z kodem %d, pomijanie pakietu" -#: scripts/dpkg-scanpackages.pl:207 -#, fuzzy, perl-format -msgid "couldn't parse control information from %s." -msgstr "Nie można przetworzyć rekordu dynamicznej relokacji: %s" - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "Brak pola Package w pliku kontrolnym %s" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "Pakiet %s (plik %s) jest powtórzony, ale w nowszej wersji;" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "użycie tej wersji i używanie danych z %s!" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "Pakiet %s (plik %s) jest powtórzony;" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "ignorowanie tej wersji i używanie danych z %s!" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "Pakiet %s (plik %s) zawiera pole Filename!" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "Błąd podczas wypisywania na standardowe wyjście" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "Nie można zamknąć stdout" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "" "Pakiety w pliku nadpisań z niepoprawną wartością poprzedniego opiekuna:" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "Pakiety mające tego samego opiekuna, jak wymieniony w pliku nadpisań:" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "Pakiety w archiwum, których brakuje w pliku nadpisań:" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "Pakiety w pliku nadpisań, ale nie w archiwum:" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "Zapisano %s wpisów do wyjściowego pliku Packages." @@ -1319,7 +1314,7 @@ msgstr "nie podano żadnych pakietów binarnych w %s" msgid "1 to 3 args expected\n" msgstr "Oczekiwano od 1 do 3 argumentów\n" -#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:817 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, perl-format msgid "cannot fork for %s" @@ -1508,28 +1503,28 @@ msgstr "" "Rozpoznawane pola zależności są następujące:\n" " %s\n" -#: scripts/dpkg-shlibdeps.pl:659 +#: scripts/dpkg-shlibdeps.pl:660 #, perl-format msgid "Can't extract name and version from library name `%s'" msgstr "Nie można wydobyć nazwy i wersji z nazwy pliku biblioteki \"%s\"" -#: scripts/dpkg-shlibdeps.pl:666 +#: scripts/dpkg-shlibdeps.pl:667 #, perl-format msgid "unable to open shared libs info file `%s'" msgstr "" "nie można otworzyć pliku informacji o bibliotekach współdzielonych \"%s\"" -#: scripts/dpkg-shlibdeps.pl:672 +#: scripts/dpkg-shlibdeps.pl:673 #, perl-format msgid "shared libs info file `%s' line %d: bad line `%s'" msgstr "plik bibliotek współdzielonych %s, linia %d: niepoprawna linia \"%s\"" -#: scripts/dpkg-shlibdeps.pl:730 +#: scripts/dpkg-shlibdeps.pl:731 #, perl-format msgid "cannot open file %s" msgstr "nie można otworzyć pliku %s" -#: scripts/dpkg-shlibdeps.pl:764 +#: scripts/dpkg-shlibdeps.pl:765 #, perl-format msgid "" "$ORIGIN is used in RPATH of %s and the corresponding directory could not be " @@ -1540,19 +1535,19 @@ msgstr "" "katalogu z powodu braku podkatalogu DEBIAN w głównym katalogu budowania " "pakietu" -#: scripts/dpkg-shlibdeps.pl:824 +#: scripts/dpkg-shlibdeps.pl:825 msgid "cannot exec dpkg" msgstr "uruchamianie dpkg nie powiodło się" -#: scripts/dpkg-shlibdeps.pl:829 +#: scripts/dpkg-shlibdeps.pl:830 msgid "diversions involved - output may be incorrect" msgstr "nadpisania użyte - wyjście może być niepoprawne" -#: scripts/dpkg-shlibdeps.pl:831 +#: scripts/dpkg-shlibdeps.pl:832 msgid "write diversion info to stderr" msgstr "wypisywanie informacji o ominięciach na stderr" -#: scripts/dpkg-shlibdeps.pl:835 +#: scripts/dpkg-shlibdeps.pl:836 #, perl-format msgid "unknown output from dpkg --search: '%s'" msgstr "nierozpoznane wyjście z dpkg --search: \"%s\"" @@ -1605,11 +1600,11 @@ msgstr "" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "nie można odczytać %s" @@ -1625,7 +1620,7 @@ msgid "using source format `%s'" msgstr "używania formatu źródeł \"%s\"" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -1989,7 +1984,7 @@ msgid "found trailer where expected %s" msgstr "oczekiwano %s, a znaleziono trailer" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "niepoprawny format linii stopki" @@ -2012,36 +2007,36 @@ msgstr "nierozpoznana linia" msgid "found eof where expected %s" msgstr "oczekiwano %s, a znaleziono koniec pliku" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "błędny klucz-wartość po \";\": \"%s\"" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "powtórzone klucz-wartość %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, fuzzy, perl-format msgid "badly formatted urgency value: %s" msgstr "niepoprawnie sformatowana wartość pola urgency" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, fuzzy, perl-format msgid "unknown key-value %s" msgstr "nieznane klucz-wartość %s - kopiowanie do XS-%s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, perl-format msgid "couldn't parse date %s" msgstr "nie można przetworzyć daty %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "" @@ -2158,12 +2153,12 @@ msgstr "" msgid "entry in dpkg's status file" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:441 +#: scripts/Dpkg/Control/Fields.pm:442 #, perl-format msgid "unknown information field '%s' in input data in %s" msgstr "nieznane pole informacyjne \"%s\" w danych wejściowych %s" -#: scripts/Dpkg/Control/Fields.pm:442 +#: scripts/Dpkg/Control/Fields.pm:443 msgid "control information" msgstr "" @@ -2175,37 +2170,37 @@ msgstr "pierwszy blok nie zawiera pola Source" msgid "block lacks a package field" msgstr "blok nie zawiera pola Package" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "znaleziono powtórzone pole w %s" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "linia kontynuowanej wartości nie należy do pola" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "sygnatura PGP nie może występować w tym miejscu" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "po pustej linii oczekiwano sygnatury PGP, a napotkano koniec pliku" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "oczekiwano sygnatury PGP, a napotkano coś innego \"%s\"" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "niezakończona sygnatura PGP" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "nieznany format linii (oczekiwano: pole-dwukropek-wartość)" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "błąd zapisu danych kontrolnych" @@ -2275,11 +2270,11 @@ msgstr "ponowne otwieranie stdin" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, perl-format msgid "cannot write %s" msgstr "nie można zapisać %s" @@ -2288,16 +2283,16 @@ msgstr "nie można zapisać %s" msgid "reopen stdout" msgstr "ponowne otwieranie stdout" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "proces potomny" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, perl-format msgid "wait for %s" msgstr "czekanie na %s" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -2360,7 +2355,7 @@ msgstr "zamykanie wejścia tar" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, perl-format msgid "cannot create directory %s" msgstr "nie można utworzyć katalogu %s" @@ -2401,7 +2396,7 @@ msgstr "nie można sprawdzić, czy usunąć katalog \"%s\"" msgid "rm -rf failed to remove `%s'" msgstr "niepowodzenie rm -rf podczas usuwania \"%s\"" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "zawartość pliku binarnego zmieniła się" @@ -2478,7 +2473,7 @@ msgstr "zignorowano usunięcie katalogu %s" msgid "ignoring deletion of symlink %s" msgstr "zignorowano usunięcie dowiązania symbolicznego %s" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, perl-format msgid "cannot represent change to %s: %s" msgstr "niereprezentowalne zmiany w %s: %s" @@ -2573,7 +2568,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "diff \"%s\" nie zawiera żadnej łatki" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "nie można zmienić czasu modyfikacji dla %s" @@ -2741,7 +2736,7 @@ msgid "failed to rename saved %s to %s" msgstr "nie można zmienić nazwy zachowanego %s na %s" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, perl-format msgid "applying %s" msgstr "aplikowanie %s" @@ -2861,14 +2856,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "nie można zmienić nazwy (nowo utworzonego) \"%s\" na \"%s\"" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "nie można zmienić praw dostępu \"%s\"" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, perl-format msgid "building %s using existing %s" msgstr "budowanie %s, używając istniejącego %s" @@ -2919,12 +2914,12 @@ msgid "required removal of `%s' installed by original tarball" msgstr "" "wymagane usunięcie \"%s\" zainstalowanego przez oryginalne archiwum tar" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "nie znaleziono pliku orig.tar" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -2940,11 +2935,16 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "-b przyjmuje tylko jeden parametr w formacie \"%s\"" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "kopia katalogu debian" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " @@ -2953,12 +2953,12 @@ msgstr "" "proszę dodać %s w debian/source/include-binaries jeśli zmodyfikowane binaria " "mają się znaleźć w wynikowym archiwum Debiana" -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, perl-format msgid "unwanted binary file: %s" msgstr "niechciany plik binarny: %s" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" @@ -2967,26 +2967,26 @@ msgstr "" "wykryto %d niechciany(ch) plik(ów) binarny(ch) (należy je wymienić w debian/" "source/include-binaries aby umożliwić ich włączenie)." -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 msgid "unrepresentable changes to source" msgstr "niereprezentowalne zmiany w źródle" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, perl-format msgid "cannot remove %s" msgstr "nie można usunąć %s" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "lokalne zmiany zachowane w %s, zmodyfikowane pliki to:" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, perl-format msgid "cannot rename %s to %s" msgstr "nie można przemianować %s na %s" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, perl-format msgid "adding %s to %s" msgstr "dodawanie %s do %s" @@ -3135,7 +3135,17 @@ msgstr "nie można dopisać do %s" msgid "The following setting(s) were disabled by dpkg-source" msgstr "dpkg-source wyłączy następujące ustawienia" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" @@ -3144,12 +3154,12 @@ msgstr "" "plik wydania (%s) zawiera nieobsługiwane opcje (\"%s\", linia %s), dpkg-" "source może zawieść przy nakładaniu łatek." -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, perl-format msgid "can't create symlink %s" msgstr "nie można utworzyć linku symbolicznego \"%s\"" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "nakładanie wszystkich łatek z użyciem %s" @@ -3210,25 +3220,28 @@ msgid "" msgstr "" "Numer wersji sugeruje zmiany z Ubuntu, ale brak pola XSBC-Original-Maintainer" -#: scripts/Dpkg/Version.pm:173 scripts/Dpkg/Version.pm:174 +#: scripts/Dpkg/Version.pm:193 scripts/Dpkg/Version.pm:194 #, fuzzy, perl-format msgid "%s is not a valid version" msgstr "%s nie jest prawidłową opcją dla %s" -#: scripts/Dpkg/Version.pm:335 +#: scripts/Dpkg/Version.pm:355 msgid "version number cannot be empty" msgstr "" -#: scripts/Dpkg/Version.pm:340 +#: scripts/Dpkg/Version.pm:360 #, perl-format msgid "version number contains illegal character `%s'" msgstr "numer wersji zawiera niepoprawny znak \"%s\"" -#: scripts/Dpkg/Version.pm:346 +#: scripts/Dpkg/Version.pm:366 #, perl-format msgid "epoch part of the version number is not a number: '%s'" msgstr "" +#~ msgid "Couldn't call dpkg-deb on %s: %s, skipping package" +#~ msgstr "Nie można uruchomić dpkg-deb na %s: %s, pomijanie pakietu" + #~ msgid "Couldn't open override file %s" #~ msgstr "Nie można otworzyć pliku nadpisań %s" diff --git a/scripts/po/ru.po b/scripts/po/ru.po index 474e63a72..fc1a7e103 100644 --- a/scripts/po/ru.po +++ b/scripts/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: dpkg 1.15.3.1\n" "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n" -"POT-Creation-Date: 2009-11-17 10:12+0100\n" +"POT-Creation-Date: 2009-11-27 18:45+0100\n" "PO-Revision-Date: 2009-08-18 21:04+0400\n" "Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n" "Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n" @@ -1180,78 +1180,73 @@ msgstr "Файл переназначений %s не найден" msgid "Couldn't open %s for reading" msgstr "Не удалось открыть %s на чтение" -#: scripts/dpkg-scanpackages.pl:194 -#, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" -msgstr "Не удалось вызвать dpkg-deb для %s: %s, пакет пропускается" +#: scripts/dpkg-scanpackages.pl:197 +#, fuzzy, perl-format +msgid "couldn't parse control information from %s." +msgstr "Не удалось проанализировать запись динамического перераспределения: %s" -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "`dpkg-deb -I %s control' завершилась с кодом %d, пакет пропускается" -#: scripts/dpkg-scanpackages.pl:207 -#, fuzzy, perl-format -msgid "couldn't parse control information from %s." -msgstr "Не удалось проанализировать запись динамического перераспределения: %s" - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "Нет поля Package в управляющем файле %s" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "Повторение пакета %s (файл %s), но с более новой версией;" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "используется данный файл и игнорируются данные из %s!" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "Повторение пакета %s (файл %s);" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "данный файл игнорируется и используются данные из %s!" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "Пакет %s (файл %s) содержит поле Filename!" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "Сбой при записи в стандартный вывод" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "Не удалось закрыть стандартный вывод" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "" "Пакеты в файле переназначений с неправильным старым значением " "сопровождающего:" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "Пакеты с тем же сопровождающим что и в файле переназначений:" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "Пакеты есть в архиве, но отсутствуют в файле переназначений:" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "Пакеты есть в файле переназначений, но нет в архиве:" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "Записано %s записей в выходной файл Packages." @@ -1332,7 +1327,7 @@ msgstr "не задано двоичное поле в %s" msgid "1 to 3 args expected\n" msgstr "ожидается от 1 до 3 аргументов\n" -#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:817 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, fuzzy, perl-format msgid "cannot fork for %s" @@ -1521,29 +1516,29 @@ msgstr "" "Распознаваемые поля зависимостей:\n" " %s\n" -#: scripts/dpkg-shlibdeps.pl:659 +#: scripts/dpkg-shlibdeps.pl:660 #, perl-format msgid "Can't extract name and version from library name `%s'" msgstr "Не удалось выделить имя и версию из библиотеки `%s'" -#: scripts/dpkg-shlibdeps.pl:666 +#: scripts/dpkg-shlibdeps.pl:667 #, perl-format msgid "unable to open shared libs info file `%s'" msgstr "невозможно открыть информационный файл разделяемой библиотеки '%s'" -#: scripts/dpkg-shlibdeps.pl:672 +#: scripts/dpkg-shlibdeps.pl:673 #, perl-format msgid "shared libs info file `%s' line %d: bad line `%s'" msgstr "" "информационный файл разделяемой библиотеки `%s' строка %d: неправильная " "строка `%s'" -#: scripts/dpkg-shlibdeps.pl:730 +#: scripts/dpkg-shlibdeps.pl:731 #, perl-format msgid "cannot open file %s" msgstr "не удалось открыть файл %s" -#: scripts/dpkg-shlibdeps.pl:764 +#: scripts/dpkg-shlibdeps.pl:765 #, perl-format msgid "" "$ORIGIN is used in RPATH of %s and the corresponding directory could not be " @@ -1553,19 +1548,19 @@ msgstr "" "$ORIGIN используется в RPATH (%s) и соответствующий каталог невозможно " "определить из-за отсутствия подкаталога DEBIAN в корне дерева сборки пакета" -#: scripts/dpkg-shlibdeps.pl:824 +#: scripts/dpkg-shlibdeps.pl:825 msgid "cannot exec dpkg" msgstr "не удалось запустить dpkg" -#: scripts/dpkg-shlibdeps.pl:829 +#: scripts/dpkg-shlibdeps.pl:830 msgid "diversions involved - output may be incorrect" msgstr "задействованы отклонения - результат может быть неправильным" -#: scripts/dpkg-shlibdeps.pl:831 +#: scripts/dpkg-shlibdeps.pl:832 msgid "write diversion info to stderr" msgstr "запись информации об отклонениях в поток ошибок" -#: scripts/dpkg-shlibdeps.pl:835 +#: scripts/dpkg-shlibdeps.pl:836 #, perl-format msgid "unknown output from dpkg --search: '%s'" msgstr "неизвестный вывод от dpkg --search: '%s'" @@ -1619,11 +1614,11 @@ msgstr "" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "не удалось прочитать %s" @@ -1639,7 +1634,7 @@ msgid "using source format `%s'" msgstr "используется формат исходника `%s'" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -2004,7 +1999,7 @@ msgid "found trailer where expected %s" msgstr "найдено завершение где ожидалось %s" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "неправильный формат строки завершения" @@ -2027,36 +2022,36 @@ msgstr "нераспознанная строка" msgid "found eof where expected %s" msgstr "найден символ eof где ожидалось %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "неверная пара ключ-значение после `;': `%s'" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "повторение пары ключ-значение %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, fuzzy, perl-format msgid "badly formatted urgency value: %s" msgstr "неправильный формат значения критичности" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, fuzzy, perl-format msgid "unknown key-value %s" msgstr "неизвестный ключ %s в паре ключ-значение -- копируется в XS-%s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, perl-format msgid "couldn't parse date %s" msgstr "не удалось выполнить анализ даты %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "" @@ -2173,12 +2168,12 @@ msgstr "" msgid "entry in dpkg's status file" msgstr "" -#: scripts/Dpkg/Control/Fields.pm:441 +#: scripts/Dpkg/Control/Fields.pm:442 #, perl-format msgid "unknown information field '%s' in input data in %s" msgstr "неизвестное информационное поле '%s' во входных данных в %s" -#: scripts/Dpkg/Control/Fields.pm:442 +#: scripts/Dpkg/Control/Fields.pm:443 msgid "control information" msgstr "" @@ -2190,37 +2185,37 @@ msgstr "в первом блоке отсутствует поле исходн msgid "block lacks a package field" msgstr "в блоке отсутствует поле пакета" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "обнаружено повторение поля %s" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "продолжение строки значения не в поле" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "PGP подпись здесь не разрешена" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "ожидалась подпись PGP, найден EOF после пустой строки" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "ожидалась подпись PGP, найдено что-то другое `%s'" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "незаконченная PGP подпись" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "строка неизвестного формата (не поле-двоеточие-значение)" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "ошибка записи управляющих данных" @@ -2290,11 +2285,11 @@ msgstr "повторное открытие stdin" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, perl-format msgid "cannot write %s" msgstr "не удалось записать %s" @@ -2303,16 +2298,16 @@ msgstr "не удалось записать %s" msgid "reopen stdout" msgstr "повторное открытие stdout" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "дочерний процесс" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, perl-format msgid "wait for %s" msgstr "вызов wait для %s" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -2375,7 +2370,7 @@ msgstr "закрытие ввода tar" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, perl-format msgid "cannot create directory %s" msgstr "не удалось создать каталог %s" @@ -2416,7 +2411,7 @@ msgstr "невозможно проверить удаление каталог msgid "rm -rf failed to remove `%s'" msgstr "при удалении `%s' команда rm -rf завершилась неудачно" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "содержимое двоичного файла изменено" @@ -2490,7 +2485,7 @@ msgstr "игнорируется удаление каталога %s" msgid "ignoring deletion of symlink %s" msgstr "игнорируется удаление символической ссылки %s" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, perl-format msgid "cannot represent change to %s: %s" msgstr "не удалось представить изменение %s: %s" @@ -2582,7 +2577,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "diff `%s' не содержит заплатки" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "не удалось изменить метку времени для %s" @@ -2750,7 +2745,7 @@ msgid "failed to rename saved %s to %s" msgstr "отказ при переименовании сохранённого %s в %s" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, perl-format msgid "applying %s" msgstr "накладывается %s" @@ -2873,14 +2868,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "невозможно переименовать '%s' (недавно созданный) в '%s'" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "невозможно изменить права '%s'" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, perl-format msgid "building %s using existing %s" msgstr "сборка %s с использованием существующего %s" @@ -2931,12 +2926,12 @@ msgstr "" msgid "required removal of `%s' installed by original tarball" msgstr "требуется удаление `%s', установленного из оригинального tarball" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "файл orig.tar не найден" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -2952,11 +2947,16 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "значением параметра -b является только один аргумент в формате `%s'" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "копирование каталога debian" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " @@ -2965,12 +2965,12 @@ msgstr "" "добавьте %s в debian/source/include-binaries, если хотите хранить изменённый " "двоичный файл в debian tarball" -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, perl-format msgid "unwanted binary file: %s" msgstr "нежелательный двоичный файл: %s" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" @@ -2979,26 +2979,26 @@ msgstr "" "обнаружено %d нежелательных двоичных файлов (что разрешить включение, " "добавьте их в debian/source/include-binaries)." -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 msgid "unrepresentable changes to source" msgstr "нехарактерные изменения в исходнике" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, perl-format msgid "cannot remove %s" msgstr "не удалось удалить %s" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "локальные изменения сохранены в %s, изменённые файлы:" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, perl-format msgid "cannot rename %s to %s" msgstr "не удалось переименовать %s в %s" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, perl-format msgid "adding %s to %s" msgstr "добавляется %s в %s" @@ -3148,7 +3148,17 @@ msgstr "невозможно добавить к %s" msgid "The following setting(s) were disabled by dpkg-source" msgstr "Следующие настройки были выключены dpkg-source" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" @@ -3157,12 +3167,12 @@ msgstr "" "файл series (%s) содержит неподдерживаемые параметры ('%s', строка %s), у " "dpkg-source может не получиться наложить заплатки." -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, perl-format msgid "can't create symlink %s" msgstr "не удалось создать символическую ссылку %s" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "наложение всех заплат с помощью %s" @@ -3223,25 +3233,28 @@ msgstr "" "Номер Version предполагает изменения Ubuntu, но нет поля XSBC-Original-" "Maintainer" -#: scripts/Dpkg/Version.pm:173 scripts/Dpkg/Version.pm:174 +#: scripts/Dpkg/Version.pm:193 scripts/Dpkg/Version.pm:194 #, fuzzy, perl-format msgid "%s is not a valid version" msgstr "%s не является допустимым параметром для %s" -#: scripts/Dpkg/Version.pm:335 +#: scripts/Dpkg/Version.pm:355 msgid "version number cannot be empty" msgstr "" -#: scripts/Dpkg/Version.pm:340 +#: scripts/Dpkg/Version.pm:360 #, perl-format msgid "version number contains illegal character `%s'" msgstr "номер версии содержит недопустимый символ `%s'" -#: scripts/Dpkg/Version.pm:346 +#: scripts/Dpkg/Version.pm:366 #, perl-format msgid "epoch part of the version number is not a number: '%s'" msgstr "" +#~ msgid "Couldn't call dpkg-deb on %s: %s, skipping package" +#~ msgstr "Не удалось вызвать dpkg-deb для %s: %s, пакет пропускается" + #~ msgid "Couldn't open override file %s" #~ msgstr "Не удалось открыть файл переназначений %s" diff --git a/scripts/po/sv.po b/scripts/po/sv.po index 15ce6cb40..e96015351 100644 --- a/scripts/po/sv.po +++ b/scripts/po/sv.po @@ -1146,76 +1146,71 @@ msgstr "Överstyrningsfilen %s hittades inte" msgid "Couldn't open %s for reading" msgstr "Kunde inte öppna %s för läsning" -#: scripts/dpkg-scanpackages.pl:194 +#: scripts/dpkg-scanpackages.pl:197 #, perl-format -msgid "Couldn't call dpkg-deb on %s: %s, skipping package" -msgstr "Kunde inte anropa dpkg-deb på %s: %s, hoppar över paket" +msgid "couldn't parse control information from %s." +msgstr "Kunde inte tolka styrinformation från %s." -#: scripts/dpkg-scanpackages.pl:199 +#: scripts/dpkg-scanpackages.pl:200 #, perl-format msgid "`dpkg-deb -I %s control' exited with %d, skipping package" msgstr "\"dpkg-deb -l %s control\" avslutades med %d, hoppar över paket" -#: scripts/dpkg-scanpackages.pl:207 -#, perl-format -msgid "couldn't parse control information from %s." -msgstr "Kunde inte tolka styrinformation från %s." - -#: scripts/dpkg-scanpackages.pl:210 +#: scripts/dpkg-scanpackages.pl:206 #, perl-format msgid "No Package field in control file of %s" msgstr "Inget Package-fält i styrfilen för %s" -#: scripts/dpkg-scanpackages.pl:218 +#: scripts/dpkg-scanpackages.pl:214 #, perl-format msgid "Package %s (filename %s) is repeat but newer version;" msgstr "Paketet (%s) (filnamn %s) repeterades men nyare version;" -#: scripts/dpkg-scanpackages.pl:220 +#: scripts/dpkg-scanpackages.pl:216 #, perl-format msgid "used that one and ignored data from %s!" msgstr "använde den och ignorerade data från %s!" -#: scripts/dpkg-scanpackages.pl:224 +#: scripts/dpkg-scanpackages.pl:220 #, perl-format msgid "Package %s (filename %s) is repeat;" msgstr "Paketet (%s) (filnamn %s) repeterades;" -#: scripts/dpkg-scanpackages.pl:225 +#: scripts/dpkg-scanpackages.pl:221 #, perl-format msgid "ignored that one and using data from %s!" msgstr "ignorerade den och använde data från %s!" -#: scripts/dpkg-scanpackages.pl:231 +#: scripts/dpkg-scanpackages.pl:227 #, perl-format msgid "Package %s (filename %s) has Filename field!" msgstr "Paketet %s (filnamn %s) har Filename-fält!" -#: scripts/dpkg-scanpackages.pl:264 +#: scripts/dpkg-scanpackages.pl:260 msgid "Failed when writing stdout" msgstr "Misslyckades vid skrivning på standard ut" -#: scripts/dpkg-scanpackages.pl:268 +#: scripts/dpkg-scanpackages.pl:264 msgid "Couldn't close stdout" msgstr "Kunde inte stänga standard ut" -#: scripts/dpkg-scanpackages.pl:271 +#: scripts/dpkg-scanpackages.pl:267 msgid "Packages in override file with incorrect old maintainer value:" msgstr "Paket i överstyrningsfilen med felaktigt värde på gammal ansvarig:" -#: scripts/dpkg-scanpackages.pl:275 +#: scripts/dpkg-scanpackages.pl:271 msgid "Packages specifying same maintainer as override file:" msgstr "Paket som anger samma ansvarig i överstyrningsfilen:" -#: scripts/dpkg-scanpackages.pl:279 +#: scripts/dpkg-scanpackages.pl:275 msgid "Packages in archive but missing from override file:" msgstr "Paket i arkivet men som saknas i överstyrningsfilen:" -#: scripts/dpkg-scanpackages.pl:283 +#: scripts/dpkg-scanpackages.pl:279 msgid "Packages in override file but not in archive:" msgstr "Paket i överstyrningsfilen men inte i arkivet:" -#: scripts/dpkg-scanpackages.pl:287 +#: scripts/dpkg-scanpackages.pl:283 #, perl-format msgid "Wrote %s entries to output Packages file." msgstr "Skrev %s poster till den skapade Packages-filen." @@ -1298,7 +1293,7 @@ msgstr "inget binärpaket angivet i %s" msgid "1 to 3 args expected\n" msgstr "1 till 3 argument förväntades\n" -#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:817 +#: scripts/dpkg-scansources.pl:357 scripts/dpkg-shlibdeps.pl:818 #: scripts/Dpkg/Shlibs/Objdump.pm:82 scripts/Dpkg/Shlibs/Objdump.pm:156 #, perl-format msgid "cannot fork for %s" @@ -1482,28 +1477,28 @@ msgstr "" "Beroendefält som stöds är:\n" " %s\n" -#: scripts/dpkg-shlibdeps.pl:659 +#: scripts/dpkg-shlibdeps.pl:660 #, perl-format msgid "Can't extract name and version from library name `%s'" msgstr "Kan inte extrahera namn och version från biblioteksnamnet \"%s\"" -#: scripts/dpkg-shlibdeps.pl:666 +#: scripts/dpkg-shlibdeps.pl:667 #, perl-format msgid "unable to open shared libs info file `%s'" msgstr "kunde inte öppna informationsfil för delade bibliotek \"%s\"" -#: scripts/dpkg-shlibdeps.pl:672 +#: scripts/dpkg-shlibdeps.pl:673 #, perl-format msgid "shared libs info file `%s' line %d: bad line `%s'" msgstr "" "informationsfilen för delade bibliotek \"%s\" rad %d: felaktig rad \"%s\"" -#: scripts/dpkg-shlibdeps.pl:730 +#: scripts/dpkg-shlibdeps.pl:731 #, perl-format msgid "cannot open file %s" msgstr "kan inte öppna filen %s" -#: scripts/dpkg-shlibdeps.pl:764 +#: scripts/dpkg-shlibdeps.pl:765 #, perl-format msgid "" "$ORIGIN is used in RPATH of %s and the corresponding directory could not be " @@ -1514,19 +1509,19 @@ msgstr "" "identifieras på grund av DEBIAN-underkatalogen saknas i roten av paketets " "byggträd" -#: scripts/dpkg-shlibdeps.pl:824 +#: scripts/dpkg-shlibdeps.pl:825 msgid "cannot exec dpkg" msgstr "kunde inte exekvera dpkg" -#: scripts/dpkg-shlibdeps.pl:829 +#: scripts/dpkg-shlibdeps.pl:830 msgid "diversions involved - output may be incorrect" msgstr "omdirigeringar finns - utdata kan vara felaktiga" -#: scripts/dpkg-shlibdeps.pl:831 +#: scripts/dpkg-shlibdeps.pl:832 msgid "write diversion info to stderr" msgstr "skriv omdirigeringsinformation på standard fel" -#: scripts/dpkg-shlibdeps.pl:835 +#: scripts/dpkg-shlibdeps.pl:836 #, perl-format msgid "unknown output from dpkg --search: '%s'" msgstr "okända utdata från dpkg --search: \"%s\"" @@ -1578,11 +1573,11 @@ msgstr "arkitektur %s tillåts inte ensamt (listan för paketet %s är \"%s\")" #: scripts/dpkg-source.pl:286 scripts/Dpkg/Changelog.pm:79 #: scripts/Dpkg/Conf.pm:77 scripts/Dpkg/Control/Info.pm:85 -#: scripts/Dpkg/Control/Hash.pm:145 scripts/Dpkg/Shlibs/Objdump.pm:97 +#: scripts/Dpkg/Control/Hash.pm:148 scripts/Dpkg/Shlibs/Objdump.pm:97 #: scripts/Dpkg/Source/CompressedFile.pm:133 -#: scripts/Dpkg/Source/Package/V2.pm:292 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:80 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:284 scripts/Dpkg/Vendor.pm:63 +#: scripts/Dpkg/Source/Package/V2.pm:296 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:98 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:304 scripts/Dpkg/Vendor.pm:63 #, perl-format msgid "cannot read %s" msgstr "kan inte läsa %s" @@ -1598,7 +1593,7 @@ msgid "using source format `%s'" msgstr "använder källkodsformatet \"%s\"" #: scripts/dpkg-source.pl:318 scripts/Dpkg/Source/Package/V1.pm:289 -#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:413 +#: scripts/Dpkg/Source/Package/V1.pm:334 scripts/Dpkg/Source/Package/V2.pm:417 #: scripts/Dpkg/Source/Package/V3/bzr.pm:150 #: scripts/Dpkg/Source/Package/V3/native.pm:81 #: scripts/Dpkg/Source/Package/V3/git.pm:214 @@ -1949,7 +1944,7 @@ msgid "found trailer where expected %s" msgstr "hittade fot där %s förväntades" #: scripts/Dpkg/Changelog/Debian.pm:136 -#: scripts/Dpkg/Changelog/Entry/Debian.pm:144 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:145 msgid "badly formatted trailer line" msgstr "felaktigt formaterad fotrad" @@ -1972,36 +1967,36 @@ msgstr "okänd rad" msgid "found eof where expected %s" msgstr "hittade filslut där %s förväntades" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:117 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:118 #, perl-format msgid "bad key-value after `;': `%s'" msgstr "felaktigt nyckelvärde efter \";\": \"%s\"" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:122 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:123 #, perl-format msgid "repeated key-value %s" msgstr "repeterat nyckelvärde %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:126 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:127 #, perl-format msgid "badly formatted urgency value: %s" msgstr "felaktigt formaterat värde för \"urgency\": %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:130 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:131 #, perl-format msgid "unknown key-value %s" msgstr "okänt nyckelvärde %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:134 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:135 msgid "the header doesn't match the expected regex" msgstr "huvudet motsvarar inte det förväntat reguljärt uttryck" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:147 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:148 #, perl-format msgid "couldn't parse date %s" msgstr "kunde inte tolka datumet %s" -#: scripts/Dpkg/Changelog/Entry/Debian.pm:150 +#: scripts/Dpkg/Changelog/Entry/Debian.pm:151 msgid "the trailer doesn't match the expected regex" msgstr "filslutet motsvarar inte det förväntat reguljärt uttryck" @@ -2119,12 +2114,12 @@ msgstr "distributörsfil" msgid "entry in dpkg's status file" msgstr "post i dpkg:s statusfil" -#: scripts/Dpkg/Control/Fields.pm:441 +#: scripts/Dpkg/Control/Fields.pm:442 #, perl-format msgid "unknown information field '%s' in input data in %s" msgstr "okänt informationsfält \"%s\" i indata i %s" -#: scripts/Dpkg/Control/Fields.pm:442 +#: scripts/Dpkg/Control/Fields.pm:443 msgid "control information" msgstr "styrinformation" @@ -2136,37 +2131,37 @@ msgstr "första blocket saknar source-fält" msgid "block lacks a package field" msgstr "blocket saknar package-fält" -#: scripts/Dpkg/Control/Hash.pm:174 +#: scripts/Dpkg/Control/Hash.pm:177 #, perl-format msgid "duplicate field %s found" msgstr "duplicerat fält %s hittades" -#: scripts/Dpkg/Control/Hash.pm:182 +#: scripts/Dpkg/Control/Hash.pm:185 msgid "continued value line not in field" msgstr "fortsatt värderad inte i fält" -#: scripts/Dpkg/Control/Hash.pm:196 +#: scripts/Dpkg/Control/Hash.pm:199 msgid "PGP signature not allowed here" msgstr "PGP-signatur tillåts inte här" -#: scripts/Dpkg/Control/Hash.pm:203 +#: scripts/Dpkg/Control/Hash.pm:206 msgid "expected PGP signature, found EOF after blank line" msgstr "förväntade PGP-signatur, hittade filslut efter tomrad" -#: scripts/Dpkg/Control/Hash.pm:207 +#: scripts/Dpkg/Control/Hash.pm:210 #, perl-format msgid "expected PGP signature, found something else `%s'" msgstr "förväntade PGP-signatur, hittade något annat \"%s\"" -#: scripts/Dpkg/Control/Hash.pm:215 +#: scripts/Dpkg/Control/Hash.pm:218 msgid "unfinished PGP signature" msgstr "oavslutad PGP-signatur" -#: scripts/Dpkg/Control/Hash.pm:221 +#: scripts/Dpkg/Control/Hash.pm:224 msgid "line with unknown format (not field-colon-value)" msgstr "rad med okänt format (inte fält-kolon-värde)" -#: scripts/Dpkg/Control/Hash.pm:312 +#: scripts/Dpkg/Control/Hash.pm:315 msgid "write error on control data" msgstr "skrivfel i styrdata" @@ -2236,11 +2231,11 @@ msgstr "öppna standard in på nytt" #: scripts/Dpkg/Shlibs/SymbolFile.pm:218 #: scripts/Dpkg/Source/CompressedFile.pm:119 #: scripts/Dpkg/Source/Package.pm:361 scripts/Dpkg/Source/Package.pm:453 -#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:402 -#: scripts/Dpkg/Source/Package/V2.pm:439 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:146 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:263 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:287 +#: scripts/Dpkg/Source/Package/V2.pm:185 scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:443 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:167 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:283 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:307 #, perl-format msgid "cannot write %s" msgstr "kan inte skriva %s" @@ -2249,16 +2244,16 @@ msgstr "kan inte skriva %s" msgid "reopen stdout" msgstr "öppna standard ut på nytt" -#: scripts/Dpkg/IPC.pm:323 +#: scripts/Dpkg/IPC.pm:329 msgid "child process" msgstr "barnprocess" -#: scripts/Dpkg/IPC.pm:328 +#: scripts/Dpkg/IPC.pm:334 #, perl-format msgid "wait for %s" msgstr "väntar på %s" -#: scripts/Dpkg/IPC.pm:333 +#: scripts/Dpkg/IPC.pm:339 #, perl-format msgid "%s didn't complete in %d second" msgid_plural "%s didn't complete in %d seconds" @@ -2320,7 +2315,7 @@ msgstr "stängning av tar-indata" #: scripts/Dpkg/Source/Archive.pm:110 scripts/Dpkg/Source/Patch.pm:429 #: scripts/Dpkg/Source/Package/V3/git.pm:180 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:163 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:184 #, perl-format msgid "cannot create directory %s" msgstr "kan inte skapa katalogen %s" @@ -2360,7 +2355,7 @@ msgstr "kan inte kontrollera för borttagning av katalogen \"%s\"" msgid "rm -rf failed to remove `%s'" msgstr "rm -rf misslyckades att ta bort \"%s\"" -#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:310 +#: scripts/Dpkg/Source/Patch.pm:70 scripts/Dpkg/Source/Package/V2.pm:314 msgid "binary file contents changed" msgstr "innehåll i binär fil ändrat" @@ -2436,7 +2431,7 @@ msgstr "ignorerar borttagning av katalogen %s" msgid "ignoring deletion of symlink %s" msgstr "ignorerar borttagning av symboliska länken %s" -#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:309 +#: scripts/Dpkg/Source/Patch.pm:275 scripts/Dpkg/Source/Package/V2.pm:313 #, perl-format msgid "cannot represent change to %s: %s" msgstr "kan inte representera ändringen för %s: %s" @@ -2527,7 +2522,7 @@ msgid "diff `%s' doesn't contain any patch" msgstr "diffen \"%s\" innehåller inte någon patch" #: scripts/Dpkg/Source/Patch.pm:464 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:177 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:197 #, perl-format msgid "cannot change timestamp for %s" msgstr "kan inte ändra tidsstämpel på %s" @@ -2693,7 +2688,7 @@ msgid "failed to rename saved %s to %s" msgstr "misslyckades att byta namn på sparad %s till %s" #: scripts/Dpkg/Source/Package/V1.pm:140 scripts/Dpkg/Source/Package/V2.pm:188 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:154 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:175 #, perl-format msgid "applying %s" msgstr "tillämpar %s" @@ -2811,14 +2806,14 @@ msgid "unable to rename `%s' (newly created) to `%s'" msgstr "kunde inte byta namn på \"%s\" (precis skapad) till \"%s\"" #: scripts/Dpkg/Source/Package/V1.pm:304 scripts/Dpkg/Source/Package/V1.pm:364 -#: scripts/Dpkg/Source/Package/V2.pm:389 +#: scripts/Dpkg/Source/Package/V2.pm:393 #: scripts/Dpkg/Source/Package/V3/native.pm:97 #: scripts/Dpkg/Source/Package/V3/git.pm:268 #, perl-format msgid "unable to change permission of `%s'" msgstr "kunde inte ändra beroenden på \"%s\"" -#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:263 +#: scripts/Dpkg/Source/Package/V1.pm:306 scripts/Dpkg/Source/Package/V2.pm:267 #, perl-format msgid "building %s using existing %s" msgstr "bygger %s med befintlig %s" @@ -2869,12 +2864,12 @@ msgstr "saknad orig.tar- eller debian.tar-fil för v2.0-källkodspaket" msgid "required removal of `%s' installed by original tarball" msgstr "nödvändig borttagning av \"%s\" installerad av originaltarboll" -#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:261 +#: scripts/Dpkg/Source/Package/V2.pm:203 scripts/Dpkg/Source/Package/V2.pm:265 msgid "no orig.tar file found" msgstr "ingen orig.tar-fil hittades" #: scripts/Dpkg/Source/Package/V2.pm:222 -#: scripts/Dpkg/Source/Package/V3/quilt.pm:224 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:244 msgid "" "patches have not been applied, applying them now (use --no-preparation to " "override)" @@ -2890,11 +2885,16 @@ msgstr "" msgid "-b takes only one parameter with format `%s'" msgstr "-b tar bara en parameter för formatet \"%s\"" -#: scripts/Dpkg/Source/Package/V2.pm:283 +#: scripts/Dpkg/Source/Package/V2.pm:252 +#, perl-format +msgid "several orig.tar files found (%s and %s) but only one is allowed" +msgstr "" + +#: scripts/Dpkg/Source/Package/V2.pm:287 msgid "copy of the debian directory" msgstr "kopia av debian-katalogen" -#: scripts/Dpkg/Source/Package/V2.pm:311 +#: scripts/Dpkg/Source/Package/V2.pm:315 #, perl-format msgid "" "add %s in debian/source/include-binaries if you want to store the modified " @@ -2903,12 +2903,12 @@ msgstr "" "lägg till %s i debian/source/include-binaries om du vill spara den " "modifierade binären i debian-tarbollen" -#: scripts/Dpkg/Source/Package/V2.pm:325 +#: scripts/Dpkg/Source/Package/V2.pm:329 #, perl-format msgid "unwanted binary file: %s" msgstr "oönskad binärfil: %s" -#: scripts/Dpkg/Source/Package/V2.pm:354 +#: scripts/Dpkg/Source/Package/V2.pm:358 #, perl-format msgid "" "detected %d unwanted binary file(s) (add them in debian/source/include-" @@ -2917,26 +2917,26 @@ msgstr "" "upptäckte %d oönskad(e) binärfil(er) (lägg till dem i debian/source/include-" "binaries för att tillåta att de tas med)" -#: scripts/Dpkg/Source/Package/V2.pm:370 +#: scripts/Dpkg/Source/Package/V2.pm:374 msgid "unrepresentable changes to source" msgstr "ändring i källkod kan inte representeras" -#: scripts/Dpkg/Source/Package/V2.pm:374 scripts/Dpkg/Source/Package/V2.pm:378 +#: scripts/Dpkg/Source/Package/V2.pm:378 scripts/Dpkg/Source/Package/V2.pm:382 #, perl-format msgid "cannot remove %s" msgstr "kan inte ta bort %s" -#: scripts/Dpkg/Source/Package/V2.pm:381 +#: scripts/Dpkg/Source/Package/V2.pm:385 #, perl-format msgid "local changes stored in %s, the modified files are:" msgstr "lokala ändringar sparade i %s, de ändrade filerna är:" -#: scripts/Dpkg/Source/Package/V2.pm:387 +#: scripts/Dpkg/Source/Package/V2.pm:391 #, perl-format msgid "cannot rename %s to %s" msgstr "kan inte byta namn på %s till %s" -#: scripts/Dpkg/Source/Package/V2.pm:406 +#: scripts/Dpkg/Source/Package/V2.pm:410 #, perl-format msgid "adding %s to %s" msgstr "lägger %s till %s" @@ -3081,7 +3081,17 @@ msgstr "kunde inte lägga till till %s" msgid "The following setting(s) were disabled by dpkg-source" msgstr "följande inställning(ar) slogs av av dpkg-source" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:88 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:64 +#, perl-format +msgid "%s should be a directory or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:70 +#, perl-format +msgid "%s should be a file or non-existing" +msgstr "" + +#: scripts/Dpkg/Source/Package/V3/quilt.pm:106 #, perl-format msgid "" "the series file (%s) contains unsupported options ('%s', line %s), dpkg-" @@ -3090,12 +3100,12 @@ msgstr "" "series-filen (%s) innehåller flaggor som inte stöds (\"%s\", rad %s), dpkg-" "source kanske kommer att misslyckas med att tillämpa patchar." -#: scripts/Dpkg/Source/Package/V3/quilt.pm:138 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:159 #, perl-format msgid "can't create symlink %s" msgstr "kan inte skapa den symboliska länken %s" -#: scripts/Dpkg/Source/Package/V3/quilt.pm:170 +#: scripts/Dpkg/Source/Package/V3/quilt.pm:191 #, perl-format msgid "applying all patches with %s" msgstr "tillämpar alla patchar med %s" @@ -3156,25 +3166,28 @@ msgstr "" "Versionsnumret indikerar Ubuntuändringar, men fältet XSBC-Original-" "Maintainer saknas" -#: scripts/Dpkg/Version.pm:173 scripts/Dpkg/Version.pm:174 +#: scripts/Dpkg/Version.pm:193 scripts/Dpkg/Version.pm:194 #, perl-format msgid "%s is not a valid version" msgstr "%s är inte en giltig version" -#: scripts/Dpkg/Version.pm:335 +#: scripts/Dpkg/Version.pm:355 msgid "version number cannot be empty" msgstr "versionsnumret kan inte vara tomt" -#: scripts/Dpkg/Version.pm:340 +#: scripts/Dpkg/Version.pm:360 #, perl-format msgid "version number contains illegal character `%s'" msgstr "versionsnummer innehåller ogiltigt tecken \"%s\"" -#: scripts/Dpkg/Version.pm:346 +#: scripts/Dpkg/Version.pm:366 #, perl-format msgid "epoch part of the version number is not a number: '%s'" msgstr "epokdelen av versionsnumret är inte ett tal: \"%s\"" +#~ msgid "Couldn't call dpkg-deb on %s: %s, skipping package" +#~ msgstr "Kunde inte anropa dpkg-deb på %s: %s, hoppar över paket" + #~ msgid "" #~ "Unprocessed text from %s control file; info:\n" #~ "%s / %s" diff --git a/scripts/t/700_Dpkg_Control.t b/scripts/t/700_Dpkg_Control.t index 141201c46..73c31c05d 100644 --- a/scripts/t/700_Dpkg_Control.t +++ b/scripts/t/700_Dpkg_Control.t @@ -48,7 +48,7 @@ Depends: hello Package: mypackage3 Depends: hello -Description: short one +Description: short one long one very long one '; diff --git a/scripts/update-alternatives.pl b/scripts/update-alternatives.pl index 09e7c8422..df753d7c9 100755 --- a/scripts/update-alternatives.pl +++ b/scripts/update-alternatives.pl @@ -291,8 +291,13 @@ if ($alternative->has_current_link()) { my $new_choice; if ($action eq 'set') { + if ($alternative->has_choice($path)) { + $new_choice = $path; + } else { + error(_g("alternative %s for %s not registered, not setting."), + $path, $alternative->name()); + } $alternative->set_status('manual'); - $new_choice = $path; } elsif ($action eq 'auto') { $alternative->set_status('auto'); $new_choice = $alternative->best(); |