summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2007-05-29 07:30:32 +0000
committerPascal Rigaux <pixel@mandriva.com>2007-05-29 07:30:32 +0000
commitce597d6a01fda649be99c7fae25a0604bdefa23c (patch)
treeb65380f6ae301ab9660d3d4728c48fec4eaef7be
parentef337715b4b8124322d5bb458dc9686da7d8fb8b (diff)
downloadurpmi-ce597d6a01fda649be99c7fae25a0604bdefa23c.tar
urpmi-ce597d6a01fda649be99c7fae25a0604bdefa23c.tar.gz
urpmi-ce597d6a01fda649be99c7fae25a0604bdefa23c.tar.bz2
urpmi-ce597d6a01fda649be99c7fae25a0604bdefa23c.tar.xz
urpmi-ce597d6a01fda649be99c7fae25a0604bdefa23c.zip
re-sync after the big svn loss
-rw-r--r--META.yml4
-rw-r--r--Makefile.PL10
-rw-r--r--NEWS276
-rwxr-xr-xgurpmi2
-rw-r--r--gurpmi.pm11
-rwxr-xr-xgurpmi24
-rw-r--r--po/af.po765
-rw-r--r--po/ar.po818
-rw-r--r--po/az.po688
-rw-r--r--po/bg.po720
-rw-r--r--po/bn.po744
-rw-r--r--po/br.po12
-rw-r--r--po/bs.po746
-rw-r--r--po/ca.po931
-rw-r--r--po/cy.po340
-rw-r--r--po/da.po792
-rw-r--r--po/el.po800
-rw-r--r--po/eo.po803
-rw-r--r--po/es.po912
-rw-r--r--po/eu.po802
-rw-r--r--po/fa.po741
-rw-r--r--po/fi.po729
-rw-r--r--po/fr.po669
-rw-r--r--po/fur.po721
-rw-r--r--po/ga.po610
-rw-r--r--po/gl.po750
-rw-r--r--po/he.po790
-rw-r--r--po/hi.po681
-rw-r--r--po/hr.po683
-rw-r--r--po/id.po399
-rw-r--r--po/is.po505
-rw-r--r--po/ka.po615
-rw-r--r--po/ko.po380
-rw-r--r--po/ky.po735
-rw-r--r--po/lt.po701
-rw-r--r--po/lv.po669
-rw-r--r--po/mk.po734
-rw-r--r--po/mn.po627
-rw-r--r--po/ms.po725
-rw-r--r--po/mt.po758
-rw-r--r--po/nb.po702
-rw-r--r--po/nn.po503
-rw-r--r--po/pa_IN.po683
-rw-r--r--po/pt.po536
-rw-r--r--po/pt_BR.po428
-rw-r--r--po/ro.po402
-rw-r--r--po/ru.po398
-rw-r--r--po/sc.po388
-rw-r--r--po/sk.po389
-rw-r--r--po/sl.po404
-rw-r--r--po/sq.po387
-rw-r--r--po/sr.po390
-rw-r--r--po/sr@Latn.po395
-rw-r--r--po/sv.po396
-rw-r--r--po/tg.po389
-rw-r--r--po/th.po380
-rw-r--r--po/tl.po387
-rw-r--r--po/tr.po381
-rw-r--r--po/uk.po389
-rw-r--r--po/urpmi.pot335
-rw-r--r--po/uz.po1650
-rw-r--r--po/uz@Latn.po1677
-rw-r--r--po/vi.po381
-rw-r--r--po/wa.po403
-rw-r--r--po/zh_TW.po398
-rw-r--r--pod/urpmi.files.5.pod11
-rw-r--r--skip.list9
-rw-r--r--t/01compile.t2
-rw-r--r--t/02create_pkgs.t71
-rw-r--r--t/README4
-rw-r--r--t/cfg.t43
-rw-r--r--t/data/SPECS/arch_to_noarch_1.spec (renamed from t/SPECS/arch_to_noarch_1.spec)0
-rw-r--r--t/data/SPECS/arch_to_noarch_2.spec (renamed from t/SPECS/arch_to_noarch_2.spec)0
-rw-r--r--t/data/SPECS/arch_to_noarch_3.spec (renamed from t/SPECS/arch_to_noarch_3.spec)0
-rw-r--r--t/data/SPECS/arch_to_noarch_4.spec (renamed from t/SPECS/arch_to_noarch_4.spec)0
-rw-r--r--t/data/SPECS/priority-upgrade-1/a-strict_1.spec14
-rw-r--r--t/data/SPECS/priority-upgrade-1/a_1.spec14
-rw-r--r--t/data/SPECS/priority-upgrade-1/b_1.spec13
-rw-r--r--t/data/SPECS/priority-upgrade-2/a-strict_2.spec14
-rw-r--r--t/data/SPECS/priority-upgrade-2/a_2.spec14
-rw-r--r--t/data/SPECS/priority-upgrade-2/b_2.spec14
-rw-r--r--t/data/SPECS/priority-upgrade-2/bb1_2.spec14
-rw-r--r--t/data/SPECS/priority-upgrade-2/bb2_2.spec14
-rw-r--r--t/data/SPECS/srpm-bootstrapping.spec14
-rw-r--r--t/data/SPECS/various.spec (renamed from t/SPECS/various.spec)0
-rw-r--r--t/data/SPECS/various2.spec38
-rw-r--r--t/data/SPECS/various3.spec38
-rw-r--r--t/data/media.cfg26
-rw-r--r--t/data/rpm-buggy/invalid-signature.rpmbin0 -> 3965 bytes
-rw-r--r--t/data/rpm-buggy/not-a-rpm.rpm1
-rw-r--r--t/data/rpm-buggy/weird-header.rpmbin0 -> 3965 bytes
-rw-r--r--t/data/rpm-v3/libtermcap-2.0.8-2.i386.rpm (renamed from t/rpm-v3/libtermcap-2.0.8-2.i386.rpm)bin7159 -> 7159 bytes
-rw-r--r--t/data/rpm-v3/nls-1.0-2.i386.rpm (renamed from t/rpm-v3/nls-1.0-2.i386.rpm)bin2688 -> 2688 bytes
-rw-r--r--t/data/rpm-v3/p2c-1.20-7.i386.rpm (renamed from t/rpm-v3/p2c-1.20-7.i386.rpm)bin8004 -> 8004 bytes
-rw-r--r--t/superuser--addmedia.t44
-rw-r--r--t/superuser--buggy-rpms.t24
-rw-r--r--t/superuser--media_info_dir.t6
-rw-r--r--t/superuser--priority-upgrade.t116
-rw-r--r--t/superuser--srpm-bootstrapping.t14
-rw-r--r--urpm.pm3314
-rw-r--r--urpm/args.pm13
-rw-r--r--urpm/bug_report.pm3
-rw-r--r--urpm/cfg.pm157
-rw-r--r--urpm/download.pm20
-rw-r--r--urpm/install.pm7
-rw-r--r--urpm/lock.pm3
-rw-r--r--urpm/md5sum.pm2
-rw-r--r--urpm/media.pm23
-rw-r--r--urpm/msg.pm80
-rw-r--r--urpm/select.pm65
-rw-r--r--urpm/util.pm31
-rw-r--r--urpme5
-rwxr-xr-xurpmi.addmedia10
-rw-r--r--urpmi.bash-completion4
-rwxr-xr-xurpmi.removemedia11
-rwxr-xr-xurpmi.update8
-rwxr-xr-xurpmq4
117 files changed, 20046 insertions, 20859 deletions
diff --git a/META.yml b/META.yml
index 9039db22..94575d7c 100644
--- a/META.yml
+++ b/META.yml
@@ -1,13 +1,13 @@
# http://module-build.sourceforge.net/META-spec.html
#XXXXXXX This is a prototype!!! It will change in the future!!! XXXXX#
name: urpmi
-version: 4.8.28
+version: 4.9.21
version_from: urpm.pm
installdirs: site
requires:
Locale::gettext: 1.01
MDV::Packdrakeng: 1.01
- URPM: 1.37
+ URPM: 1.48
distribution_type: module
generated_by: ExtUtils::MakeMaker version 6.30_01
diff --git a/Makefile.PL b/Makefile.PL
index b348a8f3..f138dffe 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -98,7 +98,7 @@ my $commonusername = "../common/";
# Additional targets
sub postamble {
<<"**MM**";
-.PHONY: installconfigfiles installstatedir ChangeLog
+.PHONY: installconfigfiles installstatedir ChangeLog TAGS
installpo:
\$(MAKE) -C po install
@@ -121,6 +121,14 @@ installgurpmi2: pure_install
ChangeLog:
svn2cl --accum --strip-prefix=soft/rpm/urpmi/trunk --authors ${commonusername}username.xml
rm -f *.bak
+
+TAGS:
+ etags *.pm */*.pm
+
+testall:
+ make test
+ sudo make test TEST_FILES='t/superuser--*.t'
+
**MM**
}
diff --git a/NEWS b/NEWS
new file mode 100644
index 00000000..84cc5790
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,276 @@
+Version 4.9.21 - 27 March 2007, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o add kernel-source-latest to skip.list
+ (to be coherent with other kernel*latest) (#29933)
+- urpmi.addmedia
+ o do display download progression by default (be coherent with other tools),
+ use -q to hide it
+- urpmi.update
+ o do not display download progression with -q
+
+Version 4.9.20 - 15 March 2007, by Pascal "Pixel" Rigaux
+
+- all tools
+ o be failsafe when module encoding is not there
+ (ie when only perl-base is installed) (#29387)
+- gurpmi:
+ o fix displaying size of packages
+ o fix displaying only the first package in "you're about to..." dialog
+ o prevent downloading/installing dialog from resizing
+- urpmi-parallel-ka-run:
+ o fix parsing the output of rshp2 (only rshp output was successfully parsed)
+
+Version 4.9.19 - 8 March 2007, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o fix priority-upgrade broken on some x86_64 (#29125)
+ (bug introduced in urpmi 4.9.11)
+- gurpmi
+ o use same translation routines as urpmi, fixing various encoding issues (#29248)
+- urpmq
+ o remove duplicated warning for "urpmq -l" when a rpm header is missing (#29174)
+
+Version 4.9.17 - 6 March 2007, by Pascal "Pixel" Rigaux
+
+- urpmq
+ o add --whatprovides (doing same as -p) (#29175)
+- urpmi
+ o don't auto upgrade mandriva kernels (ie add kernel*-latest to skip.list)
+ o add perl-MDV-Distribconf to priority upgrade packages
+ o display translated summaries
+
+Version 4.9.16 - 2 March 2007, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o fix crash asking for medium
+- urpmf
+ o do not display invalid error at the end when using removable media (#28905)
+- urpmq
+ o --whatrequires-recursive: fix debug message explaining why a package
+ is added, and enhance the verbose message explaining why some package are
+ skipped
+
+Version 4.9.15 - 6 February 2007, by Pascal "Pixel" Rigaux
+
+- urpmi.update
+ o add --probe-rpms to replace -f -f
+ o -f -f should be allowed (#28500)
+- urpmq
+ o --whatrequires will now handle virtual package requires
+ (eg: bash is now returned by "urpmq --whatrequires glibc")
+ (#28367)
+- german translation
+ o don't use non iso-8859-15 chars otherwise perl segfaults (#28537)
+ (perl bug #41442)
+
+Version 4.9.14 - 25 January 2007, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o fix encoding issue with "--bug ..." introduced in previous version (#28387)
+- urpmi, ...
+ o workaround no locale (eg: LC_ALL=C): when encoding is "ascii",
+ do not try to convert strings to this encoding, any encoding will do
+ (#28367)
+- urpmq
+ o rename option -R into --whatrequires
+ o rename option -RR into --whatrequires-recursive,
+ and don't go through virtual packages which are provided by another
+ package, eg: "skipping package(s) required by db1-devel via devel(libdb),
+ since that virtual package is provided by libdb2-devel"
+ (#27814)
+ o do not document option -P (which is the default)
+
+Version 4.9.13 - 19 January 2007, by Pascal "Pixel" Rigaux
+
+- urpmi, ...
+ o fix encoding/codeset mess (using the magical
+ Locale::gettext::bind_textdomain_codeset(..., "UTF-8") from new
+ perl-Locale-gettext)
+ o fix translating rpmlib messages (using URPM::bind_rpm_textdomain_codeset())
+- gurpmi2
+ o do display installation failed on file conflicts (#22131)
+- urpmi.addmedia
+ o do not display in clear text the password (when using -v or --debug)
+- urpmq
+ o when using synthesis do not download packages to get information.
+ before this modification, it was downloaded iff one medium was using hdlist (#16772)
+ o when using synthesis fix using local rpms to get information
+ before this modification, local rpm was used iff one medium was using hdlist
+ o display a warning about no hdlist only for needed media,
+ adapt the warning to the option (for "-i", synthesis can still help),
+ and tell which rpms and impacted
+
+Version 4.9.12 - 10 January 2007, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o fix handling removable media (bug introduced in 4.9.x) (#27854)
+ o with "-v", display the package file copied to disk
+ o use P (ie ngettext) to handle plurals
+ o re-allow "urpmi --clean" with no arguments
+ (broken on january 2006, commit r36390) (#27747)
+ o be more verbose with "-v"
+- urpmi, urpmq, urpmf
+ o "--media foo" and "--searchmedia foo" use medium "foo"
+ even if "foo" is flagged "ignore" (#27745)
+- urpmi.addmedia
+ o new option "--probe-rpms" which replaces "-f -f"
+ o fix using dir "/foo/bar boo" and no hdlist (using *.rpm)
+ o when using "--distrib <url>", have "xxx" instead of "xxx1"
+ for the medium name (eg: "Main" instead of "Main1")
+ o when using --distrib, add noauto media with flag ignore
+ so that someone can easily use them by removing ignore
+ (nb: debug_for and srpm media are not added though)
+ (cf bug #28050)
+
+Version 4.9.11 - 12 December 2006, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o when "urpmi --auto-select" needs to restart urpmi because of a
+ priority-upgrade, ensure it doesn't prompt an unneeded choice before
+ restarting (#27527)
+ (nb: the problem can still occur on "urpmi rpmdrake")
+- urpmi.removedia
+ o "urpmi.removedia -a" when urpmi.cfg has no entry still warn the user,
+ but exits with status 0
+
+Version 4.9.10 - 7 December 2006, by Pascal "Pixel" Rigaux
+
+- urpmi.addmedia
+ o fix using "--virtual --distrib ..."
+
+Version 4.9.9 - 6 December 2006, by Pascal "Pixel" Rigaux
+
+- urpmi
+ o fix "rpmdb: environment reference count went negative"
+ when syslog service is down
+ o fix having more than "hdlist" flag in urpmi.cfg
+- gurpmi2 (and rpmdrake)
+ o fix crash when syslog service is down (#26256)
+
+Version 4.9.8 - 6 December 2006, by Pascal "Pixel" Rigaux
+
+- urpmi.addmedia, urpmi
+ o use "hdlist" just like "synthesis" when forcing only hdlist usage
+ o "hdlist" is valid with "virtual"
+- urpmi
+ o don't say "Package foo-1.1 already installed"
+ when in fact it is "Package foo-1.2 already installed".
+ Still display "Package foo-1.1 can not be installed" until we can do
+ better (#27176)
+- gurpmi (tvignaud)
+ o don't ignore exceptions in callbacks
+ o fix crash and really lock the urpm db
+
+Version 4.9.7 - 4 December 2006, by Pascal "Pixel" Rigaux
+
+- bug fix release
+- urpmi.addmedia
+ o fix --probe-hdlist
+ o fix "... with hdlist.cz" (only "... with synthesis.hdlist.cz" was working)
+- urpmi
+ o add the long version of -q/-v (ie --quiet/--verbose)
+ o --quiet is really quiet (#14538)
+
+Version 4.9.6 - 31 November 2006, by Pascal "Pixel" Rigaux
+
+- bug fix release
+- urpmf:
+ o handle --urpmi-root
+- urpmi.addmedia:
+ o fix downloading synthesis which is done twice when remote
+ o fix downloading pubkey in media_info/
+
+Version 4.9.5 - 30 November 2006, by Pascal "Pixel" Rigaux
+
+- all tools:
+ o new option --urpmi-root that is similar to --root but also use rooted
+ urpmi db
+- urpmi:
+ o handle buggy "list: xxx" in urpmi.cfg (when the list can't be found)
+ o handle no "synthesis" together with "with_hdlist: synthesis.hdlist.cz"
+- urpmi.cfg:
+ o new per-medium field "media_info_dir:" which replaces "with_hdlist:" in
+ most cases. It allows using either hdlist & synthesis when nor
+ "hdlist:" nor "synthesis" is set (#16232)
+- urpmi.update:
+ o not so verbose by default, only display
+ 'medium "foo" is up-to-date' or 'medium "foo" updated'
+- urpmi.removemedia:
+ o not so verbose by default, only display 'removing medium "foo"'
+ o do not allow both "-a" and <name>, fix usage
+- urpmi.addmedia:
+ o not so verbose by default, only display 'adding medium "foo"'
+ o do not add "hdlist: hdlist.<name>.cz" lines in urpmi.cfg,
+ compute it from <name> (one can still enforce a file name)
+ o do not default to --probe-synthesis but use both hdlist/synthesis
+
+Version 4.9.4 - 24 November 2006, by Pascal "Pixel" Rigaux
+
+- urpmi.addmedia:
+ o fix random ordering of media (using --distrib on a non-remote medium)
+ o now inserting non-remote medium after first non-remote medium
+ (instead of adding it as first medium)
+- urpmi, urpme, urpmq:
+ o add option --probe-synthesis (allowed with --use-distrib)
+
+Version 4.9.3 - 24 November 2006, by Pascal "Pixel" Rigaux
+
+- bug fix release:
+- fix handling multiple virtual hdlist files
+ (the second pass was not done...)
+
+Version 4.9.2 - 24 November 2006, by Pascal "Pixel" Rigaux
+
+- bug fix release:
+- /foo/@86875:bar.src.rpm is not a url with protocol /foo/@86875
+- /foo/chroot_tmp/... is not a url with protocol /foo/chroot
+
+Version 4.9.1 - 23 November 2006, by Pascal "Pixel" Rigaux
+
+- cleanup locks handling, log locking, and don't say "urpmi database locked"
+ when it's the rpm database that is locked
+- urpmi:
+ o add --nokeep (which overrides urpmi.cfg global option "keep")
+
+Version 4.9.0 - 22 November 2006, by Pascal "Pixel" Rigaux
+
+- urpmi:
+ o don't fork on multiple transactions
+ o fix buggy print "::logger_id::" (#27026)
+- gurpmi2 (tvignaud):
+ o fix unvisible content
+ o prevent a dialog to have a height of several scores of thousands pixels
+ o add support of --root
+- urpmi.update:
+ o don't write urpmi.cfg unless really needed
+ o don't write md5sum in urpmi.cfg (bugfix)
+- urpmi.addmedia:
+ o drop support for "list" file
+ (now you must have a hdlist/synthesis on remote server)
+ o drop support for searching recursively rpms when there is no
+ hdlist/synthesis. Only search in given directory (ie $url/*.rpm)
+ o do not use list.<media_name> to store passwords, use /etc/urpmi/netrc
+ instead. Also do have the url in urpmi.cfg, only the password is removed
+ o change the format of list.<media_name>, it contains only rpm files
+ relative to the medium url
+ o deprecate "... with <relative hdlist/synthesis>". It is not useful anymore
+ (nb: if you want to force using hdlist or synthesis, use --probe-hdlist or
+ --probe-synthesis)
+ o don't write urpmi.cfg twice
+ o do not look for hdlist/synthesis in ../media_info/hdlist$suffix.cz (nb:
+ with media.cfg, it will still use hdlist from media/media_info/, but it
+ will simply use the hdlist$suffix.cz given by media.cfg )
+ o --norebuild is by default (and deprecated): when the local
+ hdlist/synthesis is buggy, do not discard it and go searching for *.rpm.
+ Make it an error instead
+ o fix building synthesis when using *.rpm (ie no hdlist/synthesis)
+- urpmi.removemedia: much faster (since it doesn't parse hdlist/synthesis anymore)
+- handle "empty" hdlist/synthesis
+- generate names.<media_name> only when the medium is created/updated
+- major splitting of urpm.pm in many modules
+- major splitting of functions in smaller functions
+ (eg: update_media was 988 lines long, has been splitted in functions shorter
+ than 105 lines)
+- big code cleanup/rework
+- perl_checker compliance (very useful for such big code rework)
diff --git a/gurpmi b/gurpmi
index 67543e6b..6a7899bd 100755
--- a/gurpmi
+++ b/gurpmi
@@ -74,7 +74,7 @@ What would you like to do?", $srpms->[0])
%s
-Proceed?", @gurpmi::names)
+Proceed?", join("\n", map { "- $_" } @gurpmi::names))
: @all_rpms == 1
? N("You are about to install the following software package on your computer:
diff --git a/gurpmi.pm b/gurpmi.pm
index f0c5aa4c..5660989e 100644
--- a/gurpmi.pm
+++ b/gurpmi.pm
@@ -21,6 +21,7 @@ use urpm;
use strict;
use Gtk2;
use urpm::util;
+use urpm::msg;
use Exporter;
our @ISA = qw(Exporter);
@@ -116,16 +117,6 @@ sub new_label {
}
}
-sub N {
- my ($format, @params) = @_;
- my $r = sprintf(
- eval { Locale::gettext::gettext($format || '') } || $format,
- @params,
- );
- Locale::gettext::iconv($r, undef, "UTF-8");
-}
-
-
# copied from ugtk2:
sub create_scrolled_window {
my ($W, $o_policy, $o_viewport_shadow) = @_;
diff --git a/gurpmi2 b/gurpmi2
index 17815d59..70fbe8be 100755
--- a/gurpmi2
+++ b/gurpmi2
@@ -216,7 +216,7 @@ sub do_install_2 () {
N("To satisfy dependencies, the following package is going to be installed:")
: N("To satisfy dependencies, the following packages are going to be installed:") )
. join("\n", '', @to_install, '')
- . P("(%d package, %d MB)", "(%d packages, %d MB)", scalar(@to_install), toMb($sum)),
+ . P("(%d package, %d MB)", "(%d packages, %d MB)", scalar(@to_install), scalar(@to_install), toMb($sum)),
, \&do_install_3)
: goto \&do_install_3;
}
@@ -231,7 +231,7 @@ sub do_install_3 () {
my $progress_label = Gtk2::Label->new('-');
$vbox->pack_start($progress_label, 1, 1, 0);
my $progressbar = Gtk2::ProgressBar->new;
- $progressbar->set_size_request(300, -1);
+ $progressbar->set_size_request(450, -1);
$vbox->pack_start($progressbar, 0, 0, 0);
change_mainw($vbox);
urpm::removable::copy_packages_of_removable_media($urpm, $list, \%sources, sub {
diff --git a/po/af.po b/po/af.po
index c56f9f8f..20a4ce0b 100644
--- a/po/af.po
+++ b/po/af.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: Fri May 19 2000 13:02:12+0200\n"
"Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
"Language-Team: Afrikaans <mandrake@af.org.za>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KTranslator v 0.6.0\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Stelsel-installasie"
@@ -29,7 +29,7 @@ msgstr "Stelsel-installasie"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -77,7 +77,7 @@ msgstr "_Installeer"
msgid "_Save"
msgstr "_Stoor"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "Kanselleer"
@@ -87,27 +87,27 @@ msgstr "Kanselleer"
msgid "Choose location to save file"
msgstr "Kies 'n lêer"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr "Onbekende konneksie tipe"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Geen opdrag gespesifiseer nie"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Asseblief wag..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, fuzzy, c-format
msgid "Must be root"
msgstr "Muispoort"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -115,95 +115,98 @@ msgid ""
"Continue installation anyway?"
msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Waarskuwing"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "OK"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Opgradeer"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Verlaat installasie"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../gurpmi2:176
-#, fuzzy, c-format
+#: ../gurpmi2:177
+#, c-format
msgid "_Abort"
msgstr "Staak"
-#: ../gurpmi2:196
-#, fuzzy, c-format
+#: ../gurpmi2:197
+#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
"Continue installation anyway?"
msgstr ""
"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
-"\n"
"%s\n"
-"\n"
"Kan ons voort gaan?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
+msgstr ""
"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
"geïnstalleer word:\n"
"\n"
-msgstr[1] ""
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
"geïnstalleer word:\n"
"\n"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pakket, %d MB)"
+msgstr[1] "(%d pakkette, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Installasievoorbereiding..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "Kan nie die bronpakette bekom nie."
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Plaas asseblief die media bekend as \"%s\" in aandrywer [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Laai tans pakket '%s' (%s/%s) af ..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -217,8 +220,8 @@ msgstr ""
"\n"
"Wil u hulle steeds installeer?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
-#, fuzzy, c-format
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
+#, c-format
msgid ""
"Installation failed, some files are missing:\n"
"%s\n"
@@ -226,40 +229,39 @@ msgid ""
msgstr ""
"Installasie probleme, van die lêers is soek:\n"
"%s\n"
-"\n"
"Probeer u media se databasis opdateer."
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
-#, fuzzy, c-format
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
+#, c-format
msgid "removing %s"
-msgstr "Verwyder %s"
+msgstr "verwyder %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, fuzzy, c-format
msgid "Preparing..."
msgstr "Herlaaistelsel word voorberei..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installeer tans pakket %s (%s/%s)...."
-#: ../gurpmi2:326
-#, fuzzy, c-format
+#: ../gurpmi2:334
+#, c-format
msgid "_Done"
-msgstr "Klaar"
+msgstr "_Klaar"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Installasie het misluk"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Alles is alreeds installeer"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Geïnstalleer"
@@ -308,63 +310,63 @@ msgstr "Daar was 'n fout met die installasie van die pakkette:"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, fuzzy, c-format
msgid "invalid rpm file name [%s]"
msgstr "in lêername"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Laat \"%s\" toe om die lêer te skryf"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "Daar was 'n fout met pakkette:"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -384,27 +386,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "kan nie kieslyslêer:%s lees nie"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
@@ -429,7 +431,7 @@ msgstr "Kan nie lêer %s oopmaak nie\n"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, fuzzy, c-format
msgid "unable to write config file [%s]"
msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -442,12 +444,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Gebruiker naam:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Wagwoord:"
#: ../urpm/download.pm:185
#, c-format
@@ -559,7 +561,7 @@ msgstr ""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, fuzzy, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "Kan nie lêer %s oopmaak nie\n"
@@ -669,7 +671,7 @@ msgstr "Geen opdrag gespesifiseer nie"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -692,328 +694,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr ""
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr ""
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "in lêername"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, fuzzy, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "Laat \"%s\" toe om die lêer te skryf"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr ""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, fuzzy, c-format
msgid "taking removable device as \"%s\""
msgstr "Verwyderbare media"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, fuzzy, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "Verwyderbare media"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, fuzzy, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "Probleme met skep van media."
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, fuzzy, c-format
msgid "wrote config file [%s]"
msgstr "Partisionering het misluk: %s"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Opsoek na geïnstalleerde lettertipes"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "Installeer pakket %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "Probleme met Installasue van pakket %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, fuzzy, c-format
msgid "medium \"%s\" already exists"
msgstr "Rekening bestaan reeds\n"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr ""
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "Probleme met skep van media."
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "Maak /etc/hosts ...\n"
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Probleme met skep van media."
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "%s word installeer\n"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "Redigeer media \"%s\":"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigureer drukker \"%s\" ..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfigurasie-lêer"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Bedienerkonfigurasie"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "Kan nie lêer: %s skep nie"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "in beskrywings"
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, fuzzy, c-format
msgid "...copying done"
msgstr "Aanteken gevaal"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Installasie het misluk"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "FAT-grootteverandering het gefaal: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Fout met die lees van lêer %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1021,78 +1023,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Ondersoek die afgeleë medialêer '%s'..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Ondersoek medialêer '%s'....."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "Kopieer die lêer vir media '%s'..."
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Voeg media by"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Kan nie lêer %s oopmaak nie\n"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "%s from media %s"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "JjYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Jammer, swak keuse, probeer weer\n"
@@ -1129,7 +1131,7 @@ msgstr "fout met onthegting van %s: %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
+msgid "medium \"%s\" is not available"
msgstr "Rekening bestaan reeds\n"
#: ../urpm/removable.pm:143
@@ -1147,47 +1149,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "Probleme met skep van media."
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, fuzzy, c-format
msgid "No package named %s"
msgstr "Teruglus lêernaam: %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "deur problematiese %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "probeer promosie van %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "om %s te kan behou"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "deur %s wat soek is"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "Begin sodra gevra word"
@@ -1208,7 +1210,7 @@ msgid "Missing signature (%s)"
msgstr "Ontbrekende velde"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1217,8 +1219,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpme uitgawe %s\n"
+"Kopiereg (C) 1999-2006 Mandriva.\n"
"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
"GPL.\n"
"\n"
@@ -1331,26 +1333,38 @@ msgstr "Geen etiket om te verwyder nie!"
msgid "Checking to remove the following packages"
msgstr "Slegs een van die volgende pakkette word benodig:"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
+"geïnstalleer word:\n"
+"\n"
+msgstr[1] ""
"Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
"geïnstalleer word:\n"
"\n"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "Verwyder pakkette..."
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Verwyder pakkette..."
+msgstr[1] "Verwyder pakkette..."
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Aanteken gevaal"
@@ -1365,8 +1379,8 @@ msgid ""
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmf uitgawe %s\n"
+"Kopiereg (C) 2002-2006 Mandriva.\n"
"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
"GPL.\n"
"\n"
@@ -1420,9 +1434,9 @@ msgid " --update - use only update media.\n"
msgstr " --help - druk hierdie help boodskap.\n"
#: ../urpmf:46
-#, fuzzy, c-format
+#, c-format
msgid " --verbose - verbose mode.\n"
-msgstr " -v - woordryke modus.\n"
+msgstr " --verbose - woordryke modus.\n"
#: ../urpmf:47
#, fuzzy, c-format
@@ -1603,7 +1617,7 @@ msgstr " -v - woordryke modus.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - woordryke modus.\n"
@@ -1613,25 +1627,25 @@ msgstr " -v - woordryke modus.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1640,8 +1654,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmi uitgawe %s\n"
+"Kopiereg (C) 1999-2006 Mandriva.\n"
"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
"GPL.\n"
"\n"
@@ -1893,7 +1907,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - woordryke modus.\n"
@@ -1959,59 +1973,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Opgradeer"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Opgradeer"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Verlaat installasie"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Verlaat installasie"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Wat is u keuse (1-%d)"
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Wil u in elk geval voortgaan?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
@@ -2021,162 +2038,182 @@ msgstr " (J/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr "Sommige pakkette kan nie geïnstalleer word nie"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] "Sommige pakkette kan nie geïnstalleer word nie"
-msgstr[1] "Sommige pakkette kan nie geïnstalleer word nie"
+msgstr "Sommige pakkette kan nie geïnstalleer word nie"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
"\n"
"%s\n"
"\n"
"Kan ons voort gaan?"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
"\n"
"%s\n"
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
"\n"
"%s\n"
"\n"
"Kan ons voort gaan?"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Die volgende pakkette moet verwyder word om die ander te kan opgradeer:\n"
"\n"
"%s\n"
"\n"
"Kan ons voort gaan?"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, fuzzy, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr "Jy moet stam wees om hierdie opdrag te gebruik !\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "Druk ENTER wanneer u reg is..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Kanselleer"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Die volgende pakkette geïnstalleer word:\n"
-msgstr[1] "Die volgende pakkette geïnstalleer word:\n"
+msgstr "Die volgende pakkette geïnstalleer word:\n"
-#: ../urpmi:668
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Die volgende pakkette geïnstalleer word:\n"
+
+#: ../urpmi:673
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Wil u op hierdie knoppie klik?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Installasie het misluk"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Begin %s:"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s word installeer\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s word installeer\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Installasie het misluk"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Moet ons 'n installasie sonder afhanklikheidstoetsing probeer? (j/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Moet ons die installasie afdwing (--force) ? (j/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "installasie instruksies"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "installasie instruksies"
+msgstr[1] "installasie instruksies"
-#: ../urpmi:828
+#: ../urpmi:825
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Installasie probleem"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Alles is alreeds installeer"
-msgstr[1] "Alles is alreeds installeer"
+msgstr "Alles is alreeds installeer"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Alles is alreeds installeer"
-msgstr[1] "Alles is alreeds installeer"
+msgstr "Alles is alreeds installeer"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Alles is alreeds installeer"
+
+#: ../urpmi:862
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Begin slurpd: "
@@ -2266,17 +2303,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, fuzzy, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - woordryke modus.\n"
@@ -2334,7 +2371,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "Probleme met skep van media."
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2343,8 +2380,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmi.recover uitgawe %s\n"
+"Kopiereg (C) 2006 Mandriva.\n"
"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
"GPL.\n"
"\n"
@@ -2410,8 +2447,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2530,49 +2569,55 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
#, fuzzy, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, fuzzy, c-format
-msgid " -f - force generation of hdlist files.\n"
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Net die supergebruiker kan plaaslike pakkette installeer"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr ""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Redigeer media \"%s\":"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "%s word installeer\n"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2581,8 +2626,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate uitgawe %s\n"
-"Kopiereg (C) %s Mandriva.\n"
+"urpmq uitgawe %s\n"
+"Kopiereg (C) 2000-2006 Mandriva.\n"
"Hierdie is vry sagteware en mag versprei word onder die terme van die GNU "
"GPL.\n"
"\n"
@@ -2664,176 +2709,121 @@ msgstr " --help - druk hierdie help boodskap.\n"
msgid " --summary, -S - print summary.\n"
msgstr ""
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " -v - woordryke modus.\n"
+
#: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -v - woordryke modus.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -v - woordryke modus.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:89
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
+msgid " -m - equivalent to -du\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - woordryke modus.\n"
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -v - woordryke modus.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -v - woordryke modus.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Geen prente beskikbaar"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Geen beeld gevind nie"
#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-#~ msgstr[1] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-#~ msgstr[1] ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Installasie het misluk"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "Installeer tans pakket %s (%s/%s)...."
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "Begin %s:"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Installasievoorbereiding..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Installasievoorbereiding..."
-
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Die volgende pakkette geïnstalleer word:\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Geen prente beskikbaar"
#~ msgid "Search"
#~ msgstr "Soek"
@@ -2841,35 +2831,10 @@ msgstr "Geen beeld gevind nie"
#~ msgid "Is this OK?"
#~ msgstr "Is dit aanvaarbaar?"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed (%d MB)"
-#~ msgstr ""
-#~ "Om die afhanklikhede na te kom, moet die volgende pakket(te) ook\n"
-#~ "geïnstalleer word:\n"
-#~ "\n"
-
#~ msgid "installing %s\n"
#~ msgstr "%s word installeer\n"
#, fuzzy
-#~ msgid "%s: command not found\n"
-#~ msgstr "%s is nie gevind nie...\n"
-
-#, fuzzy
-#~ msgid "md5sum mismatch"
-#~ msgstr "Ongepaard"
-
-#, fuzzy
-#~ msgid " --all - print all tags.\n"
-#~ msgstr " --help - druk hierdie help boodskap.\n"
-
-#, fuzzy
-#~ msgid " --files - print tag files: all files.\n"
-#~ msgstr " --help - druk hierdie help boodskap.\n"
-
-#, fuzzy
#~ msgid ""
#~ "\n"
#~ "Continue?"
diff --git a/po/ar.po b/po/ar.po
index 6c5830dd..ffdd1ade 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ar\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-09-05 17:40+0300\n"
"Last-Translator: Ossama M. Khayat <okhayat@yahoo.com>\n"
"Language-Team: Arabic <support@arabeyes.org>\n"
@@ -22,7 +22,7 @@ msgstr ""
"Plural-Forms: nplurals=4; plural=n==1 ? 0 : n==2 ? 1 : n>=3 && n<=10 ? 2 : "
"3\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "تثبيت RPM"
@@ -32,7 +32,7 @@ msgstr "تثبيت RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_مواÙÙ‚"
@@ -98,7 +98,7 @@ msgstr "_تثبيت"
msgid "_Save"
msgstr "_Ø­Ùظ"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "ال_غاء"
@@ -108,30 +108,30 @@ msgstr "ال_غاء"
msgid "Choose location to save file"
msgstr "اختر مكان Ø­Ùظ الملÙ"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"خيارات غير معروÙØ© '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "لا توجد حزمة بالإسم %s"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "انتظر من Ùضلك..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "يجب أن تكون جذراً"
-#: ../gurpmi2:87
-#, fuzzy, c-format
+#: ../gurpmi2:88
+#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s\n"
@@ -139,91 +139,96 @@ msgid ""
msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s\n"
-"تريد الاستمرار؟"
+"استمرار على أي حال؟"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "تحذير"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "مواÙÙ‚"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (للترقية)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (للتثبيت)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "خيارات الحزم"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "أحد الحزم التالية ÙŠÙحتاج اليه:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "إ_جهاض"
-#: ../gurpmi2:196
-#, fuzzy, c-format
+#: ../gurpmi2:197
+#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
"Continue installation anyway?"
msgstr ""
-"يجب إزالة الحزم التالية كي يمكن ترقية غيرها:\n"
+"يجب ازالة الحزم التالية لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-"تريد الاستمرار؟"
+"هل من الممكن المتابعة؟"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "لإرضاء المÙعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "لإرضاء المÙعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-msgstr[1] "لإرضاء المÙعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-msgstr[2] "لإرضاء المÙعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-msgstr[3] "لإرضاء المÙعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
+msgstr "لإرضاء المÙعتمدات، سيتمّ تثبيت الحزمة التّالية (%d ميغابايت)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d حزم، %d م.ب.)"
+msgstr[1] "(%d حزم، %d م.ب.)"
+msgstr[2] "(%d حزم، %d م.ب.)"
+msgstr[3] "(%d حزم، %d م.ب.)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "تثبيت الحزم..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "لم يمكن الحصول على الحزمة المصدرية، جاري الإنهاء"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "يرجى ادخال الوسيط \"%s\" ÙÙŠ الجهاز [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "جاري تنزيل الحزمة `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -236,7 +241,7 @@ msgstr ""
"\n"
"هل تريد متابعة التثبيت؟"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -247,37 +252,37 @@ msgstr ""
"%s\n"
"ربما تريد تحديث Ùاعدة بيانات urpmi الخاصة بك"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "جاري إزالة %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "جاري التحضير..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "جاري تثبيت الحزمة `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "ا_نتهى"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Ùشل التثبيت"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "كل شئ مثبت مسبقا"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "انتهى التثبيت"
@@ -326,63 +331,63 @@ msgstr "المستخدم الجذر Ùقط مسموح له بتثبيت الحز
msgid "Running urpmi in restricted mode..."
msgstr "تشغيل urpmi ÙÙŠ الوضع المحظور..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "تعذر Ùتح rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "اسم مل٠rpm غير موجود [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "جاري استرجاع مل٠rpm [%s]..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...تم الاسترجاع"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...Ùشل الإسترجاع: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "لم يمكن الوصول الى مل٠rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "تعذر تحليل \"%s\" ÙÙŠ المل٠[%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "تعذر تسجيل مل٠rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "خطأ ÙÙŠ تسجيل الحزم المحلية"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "هذه العملية محظورة أثناء العمل ÙÙŠ الوضع المحظور"
@@ -402,27 +407,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "يجب أن تكون المستخدم الجذري لتشغيل هذا الأمر ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: لم يمكن ايجاد مل٠rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "تم بناء مل٠تخليق hdlist للوسيط \"%s\""
@@ -447,7 +452,7 @@ msgstr "غير قادر على كتابة مل٠الإعدادات [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "غير قادر على كتابة مل٠الإعدادات [%s]"
@@ -465,7 +470,7 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "كلمة المرور:"
#: ../urpm/download.pm:185
#, c-format
@@ -577,7 +582,7 @@ msgstr "هناك حزم متعددة بنÙس اسم مل٠rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "تعذر تحليل [%s] بشكل صحيح على القيمة \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "لم يمكن الوصول الى مل٠قائمة \"%s\"، تم تجاهل الوسيط"
@@ -689,7 +694,7 @@ msgstr "لا توجد حزمة بالإسم %s"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -712,7 +717,7 @@ msgstr "تحذير: md5sum لـ%s غير متوÙر ÙÙŠ مل٠MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "جاري حساب md5sum لـhdlist المصدر الموجود (أو التخليق)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -721,325 +726,325 @@ msgstr ""
"الوسيط الاÙتراضي \"%s\" يحاول اسنخدام مل٠hdlist أو مل٠قوائم مستخدم مسبقا، "
"تم تجاهل الوسيط"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "الوسيط الاÙتراضي\"%s\" يجب أن يكون له عنوان واضح، تم تجاهل الوسيط"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "اسم مل٠rpm غير موجود [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "لم يمكن ايحاد مل٠القوائم لـ\"%s\"، تم تجاهل الوسيط"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "تم بناء مل٠تخليق hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "لم يمكن الوصول الى مل٠hdlist لـ\"%s\"، تم تجاهل الوسيط"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "لم يمكن تحليل مل٠hdlist لـ \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "الوسيط \"%s\" يحاول اسنخدام مل٠hdlist مستخدم مسبقا، تم تجاهل الوسيط"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "الوسيط \"%s\" يحاول استخدام قائمة مستخدمة مسبقا، تم تجاهل الوسيط"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "جاري محاولة تخطّي الوسيط الموجود \"%s\"، جري التجاهل"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "نقاط تجهيز كثيرة جدا للوسيط القابل للإزالة \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "جاري أخذ الأجهزة القابلة للإزالة كـ\"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "الوسيط \"%s\" هو صورة ISO، سيتم تثبيتها خلال العمل"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "جاري استخدام الجهاز الآخر القابل للإزالة [%s] لـ\"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "لم يمكن استرجاع اسم المسار للوسيط القابل للإزالة \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "كتب مل٠التهيئة [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "لا يمكن استخدام وضع التوازي parallel مع وضع استخدم-التوزيع"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "جاري استخدام الوسائط المرتبطة للوضع المتوازي: %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--synthesis لا يمكن استخدامه مع --media، --excludemedia، --sortmedia، --"
-"update أو --parallel"
+"update، --use-distrib أو --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "البحث بدءً من: %s وإلى: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "جاري القيام بالمرحلة الثانية لحساب المÙعتمدات\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "جاري تخطي الحزمة %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "سيتم التثبيت بدلاً من ترقية الحزمة %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "الوسيط \"%s\" موجود مسبقا"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "الوسيط الوهمي يجب أن يكون محلياً"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "جاري ازالة الوسيط \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "لم يمكن الوصول الى أول وسيط تخزين"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "جاري استرجاع مل٠hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "تعذر Ùتح rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "لم أستطع التّوصّل إلى وسيط التّثبيت الأوّل (ملÙÙ‘ hdlists غير موجود)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "جاري محاولة اختيار الوسيط غير موجود \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "جاري اختيار الوسيط المتعدد: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "جاري ازالة الوسيط \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "تجري إعادة تهيئة urpmi للوسيط \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...Ùشلت إعادة التّهيئة"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "تمّت إعادة التّهيئة"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "الوسيط \"%s\" غير مختار"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "جاري اختبار مل٠hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "جاري اختبار مل٠التخليق [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "جاري بناء hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "تعذر إنشاء ملÙÙ‘ التخليق للوسيط \"%s\". قد يكون مل٠hdlist Ùاسداً."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "مشكلة ÙÙŠ قراءة مل٠التخليق أو hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...Ùشل النسخ"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "جاري نسخ وص٠المل٠لـ\"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...تم النسخ"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "جاري كتابة مل٠القوائم للوسيط \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Ùشل نسخ [%s] (الملÙÙ‘ صغير بشكل مثيل للشّكّ)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "جاري حساب md5sum لـhdlist المصدر المنسوخ (أو التخليق)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Ùشل نسخ [%s] (md5sum غير متطابقة)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "جاري حساب md5sum لـhdlist المصدر المستحضر (أو التخليق)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...Ùشل الإسترجاع: md5sum غير متطابق"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "لم ÙŠÙعثر على ملÙات rpm من [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "جاري قراءة ملÙات rpm من [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "تعذر قراءة ملÙات rpm من [%s]: %s "
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "لم تÙقرأ أية حزم RPM"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1049,78 +1054,78 @@ msgstr ""
"لم يمكن الوصول للوسيط \"%s\"،\n"
"قد يحدث هذا إن قيام بتجهيز الدليل يدويّاً عند إنشاء الوسيط."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "لم يمكن ايجاد مل٠hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "جاري استرجاع hdlist (أو مل٠تخليق) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "تم ايجاد hdlist (أو مل٠تخليق) كـ %s..."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "لم يمكن ايجاد مل٠hdlist للوسيط \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "جاري اختبار مل٠pubkey لـ\"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...تم استيراد المÙتاح %s من مل٠pubkey \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "لم يمكن استيراد مل٠pubkey الخاص بـ\"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "جاري كتابة مل٠القوائم للوسيط \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "تمت اضاÙØ© الوسيط %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "لم يمكن تحليل مل٠hdlist لـ \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "مشكلة ÙÙŠ قراءة مل٠التخليق للوسيط \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "جاري قراءة الترويسة من الوسيط \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "لاNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Ù†yY"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "المعذرة، اختيار سئ، حاول مرة أخرى\n"
@@ -1156,8 +1161,8 @@ msgid "unmounting %s"
msgstr "جاري ازالة تجهيز %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "الوسيط \"%s\" غير مختار"
#: ../urpm/removable.pm:143
@@ -1175,47 +1180,47 @@ msgstr "تم تحديد الوسيط المÙكّك \"%s\" على أنه قابÙ
msgid "unable to access medium \"%s\""
msgstr "لم يمكن الوصول الى الوسيط \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "لا توجد حزمة بالإسم %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "الحزم التالية تحتوي على %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "بسبب Ùقدان %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "بسبب عدم ارضاء %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "جاري محاولة ترقية %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "كي يتم الحÙاظ على %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "كي يتم تثبيث %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "بسبب التعارض مع %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "غير مطلوب"
@@ -1236,7 +1241,7 @@ msgid "Missing signature (%s)"
msgstr "توقيع Ù…Ùقود (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1246,7 +1251,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpme إصدارة %s\n"
-"حقّ النّسخ 1999-2005 ماندريبا.\n"
+"حقّ النّسخ 1999-2006 ماندريبا.\n"
"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
"\n"
"الاستعمال:\n"
@@ -1319,9 +1324,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - حاول أن تجد وتستخدم مل٠hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - وضع التÙصيل.\n"
+msgstr " --verbose, -v - وضع التÙصيل.\n"
#: ../urpme:58
#, c-format
@@ -1358,23 +1363,36 @@ msgstr "لا شئ للإزالة"
msgid "Checking to remove the following packages"
msgstr "جاري التحقق لإزالة الحزم التالية"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "لإرضاء المÙعتمدات، ستتم ازالة %d حزمة"
+msgstr[1] "لإرضاء المÙعتمدات، ستتم ازالة %d حزمة"
+msgstr[2] "لإرضاء المÙعتمدات، ستتم ازالة %d حزمة"
+msgstr[3] "لإرضاء المÙعتمدات، ستتم ازالة %d حزمة"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "لإرضاء المÙعتمدات، ستتم ازالة %d حزمة (%d ميغابايت)"
+msgid " (%d MB)"
+msgstr " (%d ميغابايت)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "جاري حذ٠الحزمة %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "جاري حذ٠الحزمة %s"
+msgstr[1] "جاري حذ٠الحزمة %s"
+msgstr[2] "جاري حذ٠الحزمة %s"
+msgstr[3] "جاري حذ٠الحزمة %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (Ù†/Ù„)"
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Ùشلت عملية الإزالة"
@@ -1390,15 +1408,15 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf إصدارة %s\n"
-"حقوق النّسخ 2002-2004 ماندريبا.\n"
+"حقوق النّسخ 2002-2006 ماندريبا.\n"
"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
"\n"
"الاستعمال:\n"
#: ../urpmf:36
-#, fuzzy, c-format
+#, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - تطبع رسالة المساعدة هذه.\n"
+msgstr " --version - إعرض معلومات الإصدار ثم اخرج\n"
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1624,7 +1642,7 @@ msgstr " --verbose - وضع التÙصيل.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - اسرد الملÙّات ÙÙŠ الحزمة.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - اطبع النّسخة، الإصدار وarch مع الاسم.\n"
@@ -1634,12 +1652,12 @@ msgstr " -f - اطبع النّسخة، الإصدار وarch مع
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "جاري استخدام بيئة محددة على %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1648,13 +1666,13 @@ msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "إستعمل --name للبحث عن أسماء الحزم.\n"
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1664,7 +1682,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmi إصدارة %s\n"
-"حقّ النّسخ 1999-2005 ماندريبا.\n"
+"حقّ النّسخ 1999-2006 ماندريبا.\n"
"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
"\n"
"الاستعمال:\n"
@@ -1696,14 +1714,14 @@ msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - اختر الحزم آليا لترقية النظام.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - عطّل التحقّق من MD5SUM للملÙّات.\n"
+msgstr " --no-md5sum - عطّل التحقّق من MD5SUM للملÙّات.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - أجبر تحديث Ù…Ùتاح gpg.\n"
+msgstr " --force-key - أجبر تحديث Ù…Ùتاح gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1733,9 +1751,8 @@ msgid ""
" are going to be installed or upgraded,\n"
" default is %d.\n"
msgstr ""
-" --split-level - جزّء على شكل معاملات صغيرة إن كان هناك أكثر من عدد الحزم "
-"المحدّة سو٠يتمّ تثبيته أو تحديثه،\n"
-" والمÙترض هو %d.\n"
+" --split-level - جزّء على شكل معاملات صغيرة إن كان هناك أكثر من عدد الحزم\n"
+" المحدّة سو٠يتمّ تثبيته أو تحديثه، والمÙترض هو %d.\n"
#: ../urpmi:103
#, c-format
@@ -1743,14 +1760,14 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - small transaction length, default is %d.\n"
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --fuzzy - اÙرض البحث التقريبي (مثل -y).\n"
+msgstr " --fuzzy, -y - اÙرض البحث التقريبي.\n"
#: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
msgid " --src, -s - next package is a source package.\n"
-msgstr " --src - الحزمة التالية هي حزمة مصدريّة (مثل -s).\n"
+msgstr " --src, -s - الحزمة التالية هي حزمة مصدريّة.\n"
#: ../urpmi:106
#, c-format
@@ -1943,7 +1960,7 @@ msgstr " --noclean - عدم إخلاء حزم rpms من المخزن.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - ترقية الحزم ذات البÙنية ذاتها Ùقط.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - اختر كل التطابقات على سطر الأوامر.\n"
@@ -1959,9 +1976,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - لا تبحث ÙÙŠ المعطيات لإيجاد حزمة.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - وضع هادئ.\n"
+msgstr " --quiet, -q - وضع هادئ.\n"
#: ../urpmi:157
#, c-format
@@ -2011,73 +2028,68 @@ msgstr ""
"خطأ: يبدو أن %s مركّب بوضع القراءة Ùقط.\n"
"استخدم --allow-force لإجبار العملية."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr " (للترقية)"
+msgstr "%s: %s (للترقية)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr " (للترقية)"
+msgstr "%s (للترقية)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr " (للتثبيت)"
+msgstr "%s: %s (للتثبيت)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr " (للتثبيت)"
+msgstr "%s (للتثبيت)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ما هو اختيارك؟ (1-%d)"
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
-"الحزم التالية لا يمكن تثبيتها لأنها تعتمد على حزم\n"
-"أقدم من المثبتة:\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"الحزم التالية لا يمكن تثبيتها لأنها تعتمد على حزم\n"
"أقدم من المثبتة:\n"
"%s"
-msgstr[2] ""
-"الحزم التالية لا يمكن تثبيتها لأنها تعتمد على حزم\n"
-"أقدم من المثبتة:\n"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
"%s"
-msgstr[3] ""
+msgstr ""
"الحزم التالية لا يمكن تثبيتها لأنها تعتمد على حزم\n"
"أقدم من المثبتة:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "استمرار على أي حال؟"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Ù†/Ù„)"
@@ -2087,76 +2099,65 @@ msgstr " (Ù†/Ù„)"
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
-"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s"
-msgstr[2] ""
-"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[3] ""
+msgstr ""
"لا يمكن تثبيت بعض الحزم المطلوبة:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
-"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
-"لكي تتم ترقية الحزم الأخرى:\n"
-"%s\n"
-msgstr[1] ""
+msgstr ""
"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
"لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-msgstr[2] ""
-"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
-"لكي تتم ترقية الحزم الأخرى:\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[3] ""
+msgstr ""
"لم يمكن متابعة التثبيت لأنه يجب ازالة الحزم التالية\n"
"لكي تتم ترقية الحزم الأخرى:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
-"يجب حذ٠الحزم التالية لترقية الحزم الأخرى:\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"يجب حذ٠الحزم التالية لترقية الحزم الأخرى:\n"
"%s"
-msgstr[2] ""
-"يجب حذ٠الحزم التالية لترقية الحزم الأخرى:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[3] ""
+msgstr ""
"يجب حذ٠الحزم التالية لترقية الحزم الأخرى:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2165,114 +2166,121 @@ msgstr ""
"يجب أن تكون مستخدم جذر لكي تقوم بتثبيت الإعتمادات التالية:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
msgstr[3] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "اضغط Enter عند الاستعداد..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "إلغاء"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "الحزم التالية تحتوي على توقيعات Ùاسدة"
-msgstr[1] "الحزم التالية تحتوي على توقيعات Ùاسدة"
-msgstr[2] "الحزم التالية تحتوي على توقيعات Ùاسدة"
-msgstr[3] "الحزم التالية تحتوي على توقيعات Ùاسدة"
+msgstr "الحزم التالية تحتوي على توقيعات Ùاسدة"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "الحزم التالية تحتوي على توقيعات Ùاسدة"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "هل تريد متابعة التثبيت؟"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Ùشل التثبيت"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "جاري توزيع %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "جاري تثبيت %s من %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "جاري تثبيت %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Ùشل التثبيت"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "محاولة التثبيت دون التأكد من الاعتمادات؟ (y[نعم]/N[لا])"
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "حاول التثبيت بشكل أقوى (--force)؟ (y[نعم]/N[لا])."
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "Ùشل معاملات تثبيت %d"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Ùشل معاملات تثبيت %d"
+msgstr[1] "Ùشل معاملات تثبيت %d"
+msgstr[2] "Ùشل معاملات تثبيت %d"
+msgstr[3] "Ùشل معاملات تثبيت %d"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "التثبيت ممكن"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "كل شئ مثبت مسبقا"
-msgstr[1] "كل شئ مثبت مسبقا"
-msgstr[2] "كل شئ مثبت مسبقا"
-msgstr[3] "كل شئ مثبت مسبقا"
+msgstr "كل شئ مثبت مسبقا"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "كل شئ مثبت مسبقا"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "كل شئ مثبت مسبقا"
-msgstr[1] "كل شئ مثبت مسبقا"
-msgstr[2] "كل شئ مثبت مسبقا"
-msgstr[3] "كل شئ مثبت مسبقا"
+msgstr "كل شئ مثبت مسبقا"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "كل شئ مثبت مسبقا"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "إعادة تشغيل urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2284,14 +2292,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"الاستعمال: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"الاستعمال: urpmi.addmedia [options] <name> <url>\n"
"<url> يأخذ قيمته من القائمة التّالية\n"
-" [file:/]/<path> with <relative filename of hdlist>\n"
-" ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-" ftp://<host>/<path> with <relative filename of hdlist>\n"
-" http://<host>/<path> with <relative filename of hdlist>\n"
-" removable://<path> with <relative filename of hdlist>\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" removable://<path>\n"
"\n"
"و [options] تأخذ قيمها من القائمة التّالية\n"
@@ -2374,17 +2381,17 @@ msgstr " --nopubkey - عدم استيراد pubkey للوسط المضاÙ\
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - إضاÙØ© الوسط ÙÙŠ التهيئة، ولكن دون تحديثه.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - نظّ٠دليل ذاكرة الترويسات المخبّئة.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - وضع هادئ.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - وضع تÙصيلي.\n"
@@ -2442,7 +2449,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "لم يمكن عمل الوسيط \"%s\"\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2451,8 +2458,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpme إصدارة %s\n"
-"حقّ النّسخ 1999-2005 ماندريبا.\n"
+"urpmi.recover إصدارة %s\n"
+"حقّ النّسخ 2006 ماندريبا.\n"
"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
"\n"
"الاستعمال:\n"
@@ -2516,9 +2523,13 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr ""
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "- تمّت إزالة %s\n"
+msgstr[1] "- تمّت إزالة %s\n"
+msgstr[2] "- تمّت إزالة %s\n"
+msgstr[3] "- تمّت إزالة %s\n"
#: ../urpmi.recover:82
#, c-format
@@ -2576,12 +2587,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"الاستخدام: urpmi.removemedia [-a] <name> ...\n"
+"الاستخدام: urpmi.removemedia (-a | <name> ...)\n"
"حيث أن <name> هو اسم الوسيط المطلوب ازالته.\n"
#: ../urpmi.removemedia:41
@@ -2643,26 +2654,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - - عدم التحديث، ووضع علامة على الوسط كمÙمكّن.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - لا تحاول أن تعثر على أي ملÙÙ‘ تخليق\n"
+" أو مل٠hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - اختر كلّ الوسائط الغير قابلة للإزالة.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - أجبر توليد ملÙات hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "يسمح للمستخدم الجذر Ùقط بتحديث الوسائط"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "لا شئ للتحديث (استخدم urpmi.addmedia لإضاÙØ© وسيط)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2671,23 +2690,23 @@ msgstr ""
"المدخل المطلوب تحديثه غير موجود\n"
"(واحد من %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "تجاهل الوسط %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "تمكين الوسط %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2697,7 +2716,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq النسخة %s\n"
-"حقوق النّسخ 2000-2005 ماندريبا.\n"
+"حقوق النّسخ 2000-2006 ماندريبا.\n"
"هذا برنامج حرّ و يمكن إعادة توزيعه تحت بنود ترخيص GNU GPL.\n"
"\n"
"الاستعمال:\n"
@@ -2783,136 +2802,143 @@ msgstr " --changelog - اطبع سجلّ التغيير.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - عرض التلخيص.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - اعكس البحث لما يتطلّب هذه الحزمة.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - البحث العكسي الموسّع (يشمل الحزم الوهمية).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - إبحث ÙÙŠ المعطيات لإيجاد حزمة.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - مخرجات تامّة مع الحزمة الواجب حذÙها.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - وسّع الاستعلام ليشتمل المعتمدات.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - تطبع المجموعات أيضا مع الأسماء أيضاً.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - اطبع معلومات Ù…Ùيدة بشكل مقروء للإنسان.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - اسرد الملÙّات ÙÙŠ الحزمة.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - لا تبحث ÙÙŠ المعطيات لإيجاد حزمة (الاÙتراض).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - إبحث ÙÙŠ المعطيات لإيجاد حزمة.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - وضع هادئ.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - تطبع الإصدار و رقمه أيضا مع الإسم أيضاً.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - اعكس البحث لما يتطلّب هذه الحزمة.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -RR - البحث العكسي الموسّع (يشمل الحزم الوهمية).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - الحزمة التالية هي حزمة مصدرية (مثل --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - أزل الحزمة إن كان هناك إصدارة أحدث منها مثبّتة.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - اÙرض البحث التّقريبيّ (مثل --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - مثل -yØŒ Ùˆ لكن بحصر المطابقة دون التّقيّد بشكل الحروÙ.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " الأسماء أو ملÙات rpm المعطاة على سطر الأوامر يتم الاستعلام عنها.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes يمكن استخدامه Ùقط مع --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
-"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-msgstr[1] ""
-"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
-"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-msgstr[2] ""
+msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-msgstr[3] ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
-"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-msgstr[1] ""
-"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
-"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-msgstr[2] ""
+msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-msgstr[3] ""
+
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
"ملاحظة: بما أنّه لا يوجد وسيط من الوسائط المبحوث Ùيها يستعمل hdlistØŒ Ùإنّ "
"urpmf لم يستطع إرجاع أيّة نتيجة\n"
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "لم يتمّ إيجاد قائمة ملÙّات\n"
-
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "لم ÙŠÙعثر على سجلّ تغييرات\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "لم يتمّ إيجاد قائمة ملÙّات\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr "لإرضاء المÙعتمدات، ستتم ازالة %d حزمة (%d ميغابايت)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P - لا تبحث ÙÙŠ المعطيات لإيجاد حزمة (الاÙتراض).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - اعكس البحث لما يتطلّب هذه الحزمة.\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/az.po b/po/az.po
index 4c74d8f1..98730d48 100644
--- a/po/az.po
+++ b/po/az.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-az\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-09-12 20:33+0300\n"
"Last-Translator: MÉ™tin Æmirov <metin@karegen.com>\n"
"Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -22,7 +22,7 @@ msgstr ""
"X-Generator: KBabel 1.3.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sistem qurulumu"
@@ -32,7 +32,7 @@ msgstr "Sistem qurulumu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Oldu"
@@ -100,7 +100,7 @@ msgstr "_Qur"
msgid "_Save"
msgstr "_Qeyd Et"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Ləğv Et"
@@ -110,29 +110,29 @@ msgstr "_Ləğv Et"
msgid "Choose location to save file"
msgstr "Qeyd ediləcək ünvanı seçin"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"naməlum seçənəklər '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Æmr tÉ™'yin edilmÉ™yib"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Xahiş edirik gözləyin..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, fuzzy, c-format
msgid "Must be root"
msgstr "Siçan Qapısı"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Xəbərdarlıq"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Oldu"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Yeniləmə"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Qurulumun sonu"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Aşağıdakı paketlərin bir dənəsinə ehtiyac var:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Ləğv Et"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -187,41 +187,47 @@ msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr ""
+"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
+msgstr ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakılar da qurulmalıdır (%d Mb)"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d paket, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Paket qurulumu..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "qaynaq paketi alına bilmir, çıxılır"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lütfən \"%s\" medyasını [%s] avadanlığına yerləşdirin"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketi endirilir..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -235,7 +241,7 @@ msgstr ""
"\n"
"Yenə də qurulumu davam etdirmək istəyirsiniz?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,37 +252,37 @@ msgstr ""
"%s\n"
"Sizə, urpmi databeyzinizi yeniləməyi məsləhət görürük."
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s silinir"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Hazırlanır..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' paketi qurulur (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "Qurtardı"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Qurulum iflas etdi"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "hər şey onsuzda quruludur"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Qurulum bitdi"
@@ -323,63 +329,63 @@ msgstr "Paketləri qurma icazəsi ancaq ali istifadəçi verilib"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmb açıla bilmir"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "hökmsüz rpm fayı adı [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm faylı alınır ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...alınma bitdi"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...alış bacarılmadı: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm faylı [%s] çatıla bilmir"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] faylındakı \"%s\" oxuna bilmədi"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "rpm faylı qeydiyyatdan keçirilə bilmədi"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "yerli paket qeydiyyat xətası"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -399,27 +405,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Bu əmri işlətmək üçün ali istifadəçi olmalısan ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm faylı oxuna bilmir\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
@@ -444,7 +450,7 @@ msgstr "[%s] quraşdırma faylı yazıla bilmir"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] quraşdırma faylı yazıla bilmir"
@@ -457,12 +463,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "İstifadəçi adı:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "ÅžifrÉ™:"
#: ../urpm/download.pm:185
#, c-format
@@ -574,7 +580,7 @@ msgstr "\"%s\" rpm fayl adlı birdən çox fayl tapıldı"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "\"%s\" qiymətindəki [%s] düzgün oxuna bilmədi"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "\"%s\" siyahı faylına çatıla bilmədi, medya rədd edildi"
@@ -685,9 +691,9 @@ msgid "No base defined"
msgstr "Æmr tÉ™'yin edilmÉ™yib"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "VericiyÉ™ baÄŸlana bilmir"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -709,7 +715,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "mövcud mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -718,106 +724,106 @@ msgstr ""
"\"%s\" medyasının hdlist ya da siyahı faylı tə'yin edilməməlidir, medya rədd "
"edildi"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "\"%s\" virtual medyumunun düzgün url'si olmalıdır, mediyum rədd edildi"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "hökmsüz rpm fayı adı [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "\"%s\" üçün siyahı faylı tapıla bilmir, medya rədd edilir"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" medyası hdlist sintezi inşa edilid"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" medyası hdlist faylına çatıla bilmir, medya rədd edildi"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "\"%s\" hdlist faylı alına bilmir"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"\"%s\" medyumu istifadədə olan hdlist'i işlətməyə cəhd etdi, medya rədd "
"edildi"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"\"%s\" medyumu onsuz da istifadədə olan siyahını işlətməyə cəhd etdi, medyum "
"rədd edildi"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "mövcud medya \"%s\" yan keçilməyə çalışıldı, imtina edirəm"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "\"%s\" çıxardıla bilən mediyası üçün həddindən çox bağlama nöqtəsi"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "çıxardıla bilən avadanlıq \"%s\" olaraq alınır"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "\"%1$s\" üçün fərqli çıxardıla bilən avadanlıq [%2$s] işlət"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "\"%s\" çıxardıla bilən mediyumu üçün cığır adı alına bilmədi"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "[%s] quraşdırma faylı yazılır"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "use-distrib modu ilə bərabər paralel mod işlədilə bilməz"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "paralel mod üçün əlaqələndirilmiş mediya işlədilir: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -826,221 +832,221 @@ msgstr ""
"--synthesis bunlarla bərabər istifadə edilə bilməz: --media, --excludemedia, "
"--sortmedia, --update ya da --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Qurulu yazı növlərini axtar"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "asıllılıqlar hesablanmaq üçün ikinci dəfə sınanır\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s paketi keçilir"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s yeniləmə paketi yerinə qurula bilər"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" medyası onsuz da vardır"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "\"%s\" vertual medyumu yerli deyil, medyum rədd edildi"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "Birinci qurulum medyumuna yetiÅŸilÉ™ bilmir"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists faylı alınır..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmb açıla bilmir"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"birinci qurulum mediyasına yetişə bilmədim (hdlists faylı tapıla bilmədi)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "mövcud olmayan \"%s\" medyumu seçilməyə çalışılır"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "birdən çox medya seçilir: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" medyumu çıxardılır"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" mediyumundan rpm faylları alınır..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...yenidən quraşdırma bacarılmadı"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "yenidən quraşdırma tamamlandı"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" medyası seçili deyil"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "[%s] hdlist faylı yoxlanır"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] synthesis faylı sınanır "
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist faylı inşa edilir"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" medyasının hdlist ya da synthesis faylı oxuna bilmədi"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...köçütrmə bacarılmadı"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" faylının izahat faylı köçürdülür..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...köçürtmə bitdi"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] faylının köçürülməsi bacarılmadı (fayl şüphəli dərəcədə kiçikdir)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"köçürdülmüş mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] köçürülmə əməliyyatı bacarılmadı (md5sum uyğunsuzluğu)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "alınan mənbə hdlist (ya da synthesis) faylının md5sum'ları hesablanır"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...alış bacarılmadı: md5sum uyğunsuzluğu"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] üstündə rpm fayı tapıla bilmədi"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "rpm faylları [%s] üstündən oxunur"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]'dan rpm faylı oxuna bilmir: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1050,78 +1056,78 @@ msgstr ""
"\"%s\" mediyumuna yetişilə bilmədi,\n"
"bu, mediyum yaradarkən cərgəni əl ilə bağlayanda baş göstərə bilər."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\"in mənbə hdlist (ya da synthesis) faylı alınır..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "%s adında sınanmış hdlist (ya da synthesis) tapıldı"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" medyası hdlist faylı tapılmadı"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" faylının pubkey'si yoxlanır..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\"nın pubkey faylından %s açarı idxal edildi"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" faylının pubkey'si idxal edilə bilmədi"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" medyası üçün siyahı faylı yazılır"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s medyası əlavə edildi"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" hdlist faylı alına bilmir"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" medyasının synthesis faylı oxuna bilmədi"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" medyasından üst mə'lumatlar oxunur"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "XxJjNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyBb"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Xətalı seçənək, təkrar sınayın\n"
@@ -1157,8 +1163,8 @@ msgid "unmounting %s"
msgstr "%s ayrılır"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "\"%s\" medyası seçili deyil"
#: ../urpm/removable.pm:143
@@ -1176,47 +1182,47 @@ msgstr "\"%s\" inkeherent medyası söküləbilən deyə bildirilib, amma deyil"
msgid "unable to access medium \"%s\""
msgstr "\"%s\" medyasına çatıla bilmir"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s adlı paket yoxdur"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Aşağıdakı paketlər %s daxıl edir: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s əksik olduğuna görə"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "razı qalmayan %s olduğuna görə"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "%s irəliləndirməyə çalışılır"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s'ı saxlamaq üçün"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s paket(lər)ini qurmaq üçün"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s ilə yaranan toqquşma səbəbiylə"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "tələb edilməmiş"
@@ -1237,7 +1243,7 @@ msgid "Missing signature (%s)"
msgstr "Æksik imza (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1247,7 +1253,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpme buraxılış %s\n"
-"Müəllif Hüququ (C) 2002 Mandriva.\n"
+"Müəllif Hüququ (C) 1999-2006 Mandriva.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
@@ -1358,24 +1364,31 @@ msgstr "Silinəcək heç bir şey yoxdur"
msgid "Checking to remove the following packages"
msgstr "Aşağıdakı paketlər silinmək üçün yoxlanır"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
"Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "%s peketi silinir"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s peketi silinir"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (b/X) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Çıxartma bacarılmadı"
@@ -1391,16 +1404,16 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf buraxılış %s\n"
-"Müəllif Hüququ (C) 2002 Mandriva.\n"
+"Müəllif Hüququ (C) 2002-2006 Mandriva.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
"istifadə qaydası:\n"
#: ../urpmf:36
-#, fuzzy, c-format
+#, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - bu kömək ismarışını çap edər.\n"
+msgstr " --version - Buraxılıs mə'lumatını gösta,rər və çıxar\n"
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1630,7 +1643,7 @@ msgstr " --verbose - təfsilatlı mod.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - paketdəki faylları göstər.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1641,25 +1654,25 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s üstündə xüsusi mühit istifadə edilir\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1669,7 +1682,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmi buraxılış %s\n"
-"Müəllif Hüququ (C) 2002 Mandriva.\n"
+"Müəllif Hüququ (C) 1999-2006 Mandriva.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
@@ -1947,7 +1960,7 @@ msgstr " --noclean - rpm'ləri ara yaddaşda işlətmə.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
@@ -2017,58 +2030,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Yeniləmə"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Yeniləmə"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Qurulumun sonu"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Qurulumun sonu"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Seçiminiz? (1-%d)"
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Davam edilsin?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (B/x) "
@@ -2078,46 +2095,65 @@ msgstr " (B/x) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Bəzi istənən paketlər qurula bilmir:\n"
+"%s"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] ""
+msgstr ""
"Bəzi istənən paketlər qurula bilmir:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"Qurulum davam edə bilmir çünki paketlərin yenilənməsi üçün\n"
+"aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
+msgstr ""
"Qurulum davam edə bilmir çünki paketlərin yenilənməsi üçün\n"
"aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
+"%s"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] ""
+msgstr ""
"Paketlərin yenilənməsi üçün aşağıdakı paketlərin çıxardılması lazımdır:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2126,102 +2162,115 @@ msgstr ""
"Aşağıdakı asıllılıqları qurmaq üçün ali istifadəçi olmalısınız:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Hazır olanda Enter düyməsinə basın..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Ləğv et"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
+msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Aşağıdakı paketlər hökmsüz imzaya sahibdir"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Quruluma davam etmək istəyirsiniz ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Qurulum iflas etdi"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "%s paylanır"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s qurulur"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s qurulur"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Qurulum iflas etdi"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Paket asılılıqlarına fikir vermədən qurmağı sınayım? (b/X) "
-#: ../urpmi:780
-#, fuzzy, c-format
+#: ../urpmi:776
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Quruluşu zorlayaraq sınayım (--force)? (b/X)"
-#: ../urpmi:819
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d qurulum daşınmaları bacarılmadı"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d qurulum daşınmaları bacarılmadı"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Qurulum mümkündür"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "hər şey onsuzda quruludur"
+msgstr "hər şey onsuzda quruludur"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "hər şey onsuzda quruludur"
+msgstr "hər şey onsuzda quruludur"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "hər şey onsuzda quruludur"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi yenidən başladılır"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2233,15 +2282,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"istifadə qaydası: urpmi.addmedia [seçənəklər] <ad> <url> [with "
-"<nisbi_cığır>]\n"
+"istifadə qaydası: urpmi.addmedia [seçənəklər] <ad> <url>\n"
"burada <url> aşağıdakılardan biridir\n"
-" [file:/]/<cığır> with <hdlist'in nisbi fayl adı>\n"
-" ftp://<istifadəçi adı>:<şifrə>@<verici>/<cığır> with <hdlist'in nisbi "
-"fayl adı>\n"
-" ftp://<verici>/<cığır> with <hdlist'in nisbi fayl adı>\n"
-" http://<verici>/<cığır> with <hdlist'in nisbi fayl adı>\n"
-" removable://<cığır> with <hdlist'in nisbi fayl adı>\n"
+" [file:/]/<cığır>\n"
+" ftp://<istifadəçi adı>:<şifrə>@<verici>/<cığır>\n"
+" ftp://<verici>/<cığır>\n"
+" http://<verici>/<cığır>\n"
+" removable://<cığır>\n"
"\n"
"və [seçənəklər] buradan gəlir\n"
@@ -2324,17 +2371,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - başlıq ara yaddaşı cərgəsini təmizlə.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - səssiz mod.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - təfsilatlı mod.\n"
@@ -2392,7 +2439,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr " \"%s\" medyası yaradıla bilmir\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2401,8 +2448,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpme buraxılış %s\n"
-"Müəllif Hüququ (C) 2002 Mandriva.\n"
+"urpmi.recover buraxılış %s\n"
+"Müəllif Hüququ (C) 2006 Mandriva.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
@@ -2468,8 +2515,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
#: ../urpmi.recover:82
#, c-format
@@ -2527,12 +2575,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"istifadə qaydası: urpmi.removemedia [-a] <ad> ...\n"
+"istifadə qaydası: urpmi.removemedia (-a | <ad> ...)\n"
"buradakı <ad> silinəcək mediyanın adıdır.\n"
#: ../urpmi.removemedia:41
@@ -2595,27 +2643,35 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - hər hansı bir synthesis ya da hdlist\n"
+" faylı tapmaya cəhd göstərmə.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - çıxardıla bilməyən medya seç.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist fayllarının yaradılmasını məcbur et.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Medianı yeniləmə icazəsi ancaq ali istifadəçiyə verilib"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"yenilənəcək bir şey yoxdur (medya əlavə etmək üçün urpmi.addmedia işlədin)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2624,23 +2680,23 @@ msgstr ""
"güncəllənəcək giriş mövcud deyildir\n"
"(%s dan (dən) biri)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "\"%s\" mediyumu dəyişdirilir:"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "\"%s\" medyumu çıxardılır"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2650,7 +2706,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq buraxılış %s\n"
-"Müəllif Hüququ (C) 2002-2004 Mandriva.\n"
+"Müəllif Hüququ (C) 2002-2006 Mandriva.\n"
"This is free software and may be redistributed under the terms of the GNU "
"GPL.\n"
"\n"
@@ -2736,118 +2792,142 @@ msgstr " --changelog - dəyişmə qeydi faylını göstər.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - taq icmalını göstər: icmal.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
+
#: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -R - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
+"ver.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - silinəcək paketlə çıxışı başa çatdır.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - sorğunu paketin asıllılıqlarına qədər uzat.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - adla birlikdə qrupları da göstər.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - insanın oxuya biləcəyi şəkildə faydalı mə'lumatları "
"göstər.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketdəki faylları göstər.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - paketi tapmaq üçün verilənlər arasında axtarma.\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - paketi tapmaq üçün verilənlər arasında axtarmaya icazə "
-"ver.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -q - səssiz mod.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - adla birlikdə buraxılış və yayını da göstər.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - növbəti paket mənbə paketidir (--src ilə eyni).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - daha yeni buraxılış qurulu isə paketi çıxart/sil.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - fuzzy axtarmanı qəbul et ( --fuzzy ilə eyni).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - əmr sətirindəki bütün uyğun gələnləri seç.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " əmr sətirində verilən adlar ya da rpm faylları sorğulanacaq.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ancaq --parallel ilə bərabər istifadə edilə bilər"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
+msgstr ""
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Heç rəsm tapılmadı"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Rəsm tapıla bilmədi"
#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Heç rəsm tapılmadı"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Asılıqları ortadan qaldırmaq üçün, aşağıdakı paketlər silinəcəkdir (%d MB)"
+
+#, fuzzy
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - paketi tapmaq üçün verilənlər arasında axtarma.\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - paketin nəyə ehtiyacı olduğunu tərsdən axtar.\n"
+
+#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/bg.po b/po/bg.po
index 2995e191..553cea0a 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-bg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2003-08-18 15:59+0300\n"
"Last-Translator: Boyan Ivanov <boyan17@bulgaria.com>\n"
"Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -21,7 +21,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM ИнÑталациÑ"
@@ -31,7 +31,7 @@ msgstr "RPM ИнÑталациÑ"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Добре"
@@ -97,7 +97,7 @@ msgstr "_ИнÑталиране"
msgid "_Save"
msgstr "_Запазване"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr " Отказ"
@@ -107,27 +107,27 @@ msgstr " Отказ"
msgid "Choose location to save file"
msgstr "Изберете мÑÑто за Ð·Ð°Ð¿Ð¸Ñ Ð½Ð° файл"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr "ÐеизвеÑтен хоÑÑ‚ %1"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Ðе е въведена команда"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "МолÑ, изчакайте..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "ТрÑбва да бъдете root/админ"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -138,42 +138,42 @@ msgstr ""
"%s\n"
"Продължение?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Предупреждение"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Добре"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr "(за обновÑване)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr "(към инÑталациÑ)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ðеобходим е един от Ñледните пакети:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_ПрекъÑване"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,43 +185,50 @@ msgstr ""
"%s\n"
"Продължение"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"За да Ñе запазÑÑ‚ завиÑимоÑтите,тези пакети ще бъдат деинÑталирани (%d МБ)"
-msgstr[1] ""
+msgstr ""
"За да Ñе запазÑÑ‚ завиÑимоÑтите,тези пакети ще бъдат деинÑталирани (%d МБ)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"За да Ñе задоволÑÑ‚ завиÑимоÑтите, Ñледните %d пакети ще\n"
+"бъдат инÑталирани:\n"
+"%s\n"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d пакета"
+msgstr[1] "%d пакета"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "ИнÑталиране на пакети..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не мога да получа ÑÐ¾Ñ€Ñ Ð¿Ð°ÐºÐµÑ‚Ð¸Ñ‚Ðµ, прекратÑвам"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "МолÑ, поÑтавете източник Ñ Ð¸Ð¼Ðµ \"%s\" в уÑтройÑтво [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "СвалÑне на пакет `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -234,7 +241,7 @@ msgstr ""
"\n"
"ИÑкате ли да продължите въпреки това ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -245,37 +252,37 @@ msgstr ""
"%s\n"
"Вие вероÑтно Ñ‚Ñ€Ñбва да обновите вашата urpmi база данни."
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "изтриване на %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Подготовка..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "ИнÑталиране на пакет `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ИнÑталациÑта провалена"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Пакета(тите) вече Ñа инÑталирани"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "ИнÑталациÑта приключи"
@@ -325,63 +332,63 @@ msgstr "ПоÑви Ñе грешка при инÑталиране на паке
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "не мога да Ð¾Ñ‚Ð²Ð¾Ñ€Ñ rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "грешно rpm име на файла [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "получавам rpm файла [%s] ... "
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...получаването завършено"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...грешка при получаване: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm файлът [%s] е недоÑтъпен"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "невъзможно да Ñе обработи/парÑва \"%s\" в файл [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "невъзможно региÑтрирането на rpm файл"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "грешка при региÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ Ð½Ð° локалните пакети"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -401,27 +408,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "ТрÑбва да Ñте root за да ползвате тази команда ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не може да Ñе прочете rpm файл \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Ñъздаден е hdlist ÑÐ¸Ð½Ñ‚ÐµÐ·Ð¸Ñ Ñ„Ð°Ð¹Ð» за източник \"%s\""
@@ -446,7 +453,7 @@ msgstr "невъзможно да Ñе запише конфигурационе
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "невъзможно да Ñе запише конфигурационен файл [%s]"
@@ -459,12 +466,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Потребител:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Парола:"
#: ../urpm/download.pm:185
#, c-format
@@ -576,7 +583,7 @@ msgstr "ÑъщеÑтвуват многобройни пакети Ñ ÐµÐ´Ð½Ð¾ Ð
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "не може коректно да Ñе обработи [%s] за ÑтойноÑÑ‚ \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "невъзможен доÑтъп до лиÑÑ‚ файла за \"%s\", източника е игнориран"
@@ -687,9 +694,9 @@ msgid "No base defined"
msgstr "Ðе е въведена команда"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Грешка при Ñвързване ÑÑŠÑ Ñървъра"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -711,7 +718,7 @@ msgstr "предупреждение: md5sum за %s липÑва в MD5SUM фа
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "изчиÑлÑване на md5 Ñумата на ÑъщеÑтвуващ source hdlist (или synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -720,52 +727,52 @@ msgstr ""
"виртуален източник \"%s\" не Ñ‚Ñ€Ñбва да има дефиниран hdlist или лиÑÑ‚ файл, "
"източникът е игнориран"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"виртуален източник \"%s\" Ñ‚Ñ€Ñбва да има празен url, източникът е игнориран"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "грешно rpm име на файла [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, fuzzy, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "невъзможен прегледа на лиÑÑ‚ файла за \"%s\", източника е игнориран"
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "опит за избор на неÑъщеÑтвуващ източник \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "Ñъздаден е hdlist ÑÐ¸Ð½Ñ‚ÐµÐ·Ð¸Ñ Ñ„Ð°Ð¹Ð» за източник \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "невъзможен доÑтъп до hdlist файла за \"%s\", източника е игнориран"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "невъзможно да Ñе обработи hdlist файла за \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"източникът \"%s\" опит за използване на вече използван hdlist, източникът е "
"игнориран"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
@@ -774,61 +781,61 @@ msgstr ""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "опит за игнориране на ÑъщеÑтвуващ източник \"%s\", избÑгване"
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "твърде много точки на монтиране за ÑменÑем източник \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, fuzzy, c-format
msgid "taking removable device as \"%s\""
msgstr "ПремеÑтваемо уÑтройÑтво е \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Източника \"%s\" е ISO образ, ще бъде монтиран автоматично"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "използване на различно ÑменÑемо уÑтройÑтво [%s] за \"%s\""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, fuzzy, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "невъзможно възÑтановÑване на Ð¿ÑŠÑ‚Ñ Ð´Ð¾ ÑменÑем източник \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "запиÑва конфигурационен файл [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ðе може да Ñе използва паралелен режим при use-distrib режим"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "използвам аÑоцииран източник за паралелен режим: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -837,32 +844,32 @@ msgstr ""
"--synthesis не може да бъде използван Ñ --media, --excludemedia, --"
"sortmedia, --update или --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "ТърÑенето започнато: %s край: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "извършвам втори опит за определÑне на завиÑимоÑтите\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "пропуÑкане на пакет %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ще инÑталирам, вмеÑто да Ð¾Ð±Ð½Ð¾Ð²Ñ Ð¿Ð°ÐºÐµÑ‚ %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "източникът \"%s\" вече ÑъщеÑтвува"
@@ -870,47 +877,47 @@ msgstr "източникът \"%s\" вече ÑъщеÑтвува"
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
# "list" is translated in the meaning of "list file"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»Ð½Ð¸Ñ Ð¸Ð·Ñ‚Ð¾Ñ‡Ð½Ð¸Ðº Ñ‚Ñ€Ñбва да бъде локален"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "четене на headers от източник \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "премахване на източник \"%s\":"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "невъзможен доÑтъп до източника за първоначална инÑталациÑ"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "получаване на hdlists файла..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "не мога да Ð¾Ñ‚Ð²Ð¾Ñ€Ñ rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
@@ -919,69 +926,69 @@ msgstr ""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "опит за избор на неÑъщеÑтвуващ източник \"%s\""
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "избор на множеÑтво източници: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "премахване на източник \"%s\":"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "пренаÑтройка на urpmi за източник \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "...пренаÑтройката неуÑпешна"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "пренаÑтройката завършена"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "източникът \"%s\" не е избран"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "проверка на hdlists файла [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "проверÑвам ÑÐ¸Ð½Ñ‚ÐµÐ·Ð¸Ñ Ñ„Ð°Ð¹Ð» [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "прави Ñе hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -990,77 +997,77 @@ msgstr ""
"Ðе може да Ñе Ñъздаде ÑÐ¸Ð½Ñ‚ÐµÐ·Ð¸Ñ Ñ„Ð°Ð¹Ð» от изтчоник \"%s\". Ð’Ð°ÑˆÐ¸Ñ hdlist файл "
"може би е повреден."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "грешка при четенето на hdlist или synthesis файла от източника \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...неуÑпешно копиране"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копиране на опиÑателен файл за \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...копирането завършено"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "запиÑване на лиÑÑ‚ файл за източник \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "грешка при копиране на [%s] (файла е подозрително малък)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "изчиÑлÑване на md5 Ñумата на ÐºÐ¾Ð¿Ð¸Ñ€Ð°Ð½Ð¸Ñ hdlist (или synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "грешко копие на [%s] (грешна md5sum)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "изчиÑлÑване на md5 Ñумата на ÐºÐ¾Ð¿Ð¸Ñ€Ð°Ð½Ð¸Ñ hdlist (или synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...грешка при получаване: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "не Ñа намерени rpm файлове от [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "четене на rpm файлове от [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "невъзможно четенето на rpm файлове от [%s] : %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "нÑма прочетени rpm файлове"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1071,78 +1078,78 @@ msgstr ""
"това може да Ñтане ако ръчно Ñте монтирали директориÑта когато еÑъздаден "
"източника."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "четене на source hdlist (или synthesis) от \"%s\""
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "намерен теÑтван hdlist (или synthesis) като %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "не е намерен hdlist файл за източник \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "проверÑвам публичен ключ от \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...импортиран ключ %s от файл Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¸ ключове за \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "невъзможен импорт на файл Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð¸ ключове от \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "запиÑване на лиÑÑ‚ файл за източник \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "добавен източник %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "невъзможно да Ñе обработи hdlist файла за \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем при четенето на Ñинтез файл за източник \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "четене на headers от източник \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "ÐнNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "ДдDdYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "СъжалÑвам, грешен избор, опитайте отново\n"
@@ -1178,8 +1185,8 @@ msgid "unmounting %s"
msgstr "демонтиране на %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "източникът \"%s\" не е избран"
#: ../urpm/removable.pm:143
@@ -1198,47 +1205,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "невъзможен доÑтъп до източник \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "нÑма пакет наречен %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следните пакети Ñъдържат %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "поради липÑващ %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради неопределен %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "опит за избор на %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "за да Ñе запази %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "за да Ñе инÑталира %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "поради конфликт Ñ %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "незаÑвен"
@@ -1259,7 +1266,7 @@ msgid "Missing signature (%s)"
msgstr "ЛипÑващ Ð¿Ð¾Ð´Ð¿Ð¸Ñ (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1269,7 +1276,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpme верÑÐ¸Ñ %s\n"
-"Mandriva 1999-2005, вÑички права запазени.\n"
+"Mandriva 1999-2006, вÑички права запазени.\n"
"Това е Ñвободен Ñофтуер и може да бъде разпроÑтранÑван Ñпоред уÑловиÑтана "
"GNU GPL.\n"
"\n"
@@ -1346,9 +1353,9 @@ msgstr ""
" -h - опитай да намериш и ползваш Ñинтез or hdlist файл.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " -v - показва вÑички ÑъобщениÑ\n"
+msgstr " --verbose, -v - показва вÑички ÑъобщениÑ\n"
#: ../urpme:58
#, c-format
@@ -1387,24 +1394,34 @@ msgstr "ÐÑма маркер за изтриване!"
msgid "Checking to remove the following packages"
msgstr "Проверка за премахване на Ñледните пакети"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"За да Ñе запазÑÑ‚ завиÑимоÑтите,тези пакети ще бъдат деинÑталирани (%d МБ)"
+msgstr[1] ""
"За да Ñе запазÑÑ‚ завиÑимоÑтите,тези пакети ще бъдат деинÑталирани (%d МБ)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d МБ)"
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "изтриване на пакет %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "изтриване на пакет %s"
+msgstr[1] "изтриване на пакет %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (Д/н) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "ÐеуÑпешно влизане"
@@ -1419,17 +1436,17 @@ msgid ""
"\n"
"usage: urpmf [options] pattern-expression\n"
msgstr ""
-"mdkupdate верÑÐ¸Ñ %s\n"
-"Mandriva %s, вÑички права запазени.\n"
+"urpmf верÑÐ¸Ñ %s\n"
+"Mandriva 2002-2006, вÑички права запазени.\n"
"Това е Ñвободен Ñофтуер и може да бъде разпроÑтранÑван Ñпоред уÑловиÑтана "
"GNU GPL.\n"
"\n"
"начин на ползване:\n"
#: ../urpmf:36
-#, fuzzy, c-format
+#, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - показва това помощно Ñъобщение.\n"
+msgstr " --version - показва верÑиÑта и излиза\n"
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1478,9 +1495,9 @@ msgid " --update - use only update media.\n"
msgstr " --update - обновÑва Ñамо източници на обновÑване.\n"
#: ../urpmf:46
-#, fuzzy, c-format
+#, c-format
msgid " --verbose - verbose mode.\n"
-msgstr " -v - показва вÑички ÑъобщениÑ\n"
+msgstr " --verbose - показва вÑички ÑъобщениÑ\n"
#: ../urpmf:47
#, fuzzy, c-format
@@ -1664,7 +1681,7 @@ msgstr " -v - показва вÑички ÑъобщениÑ\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - извежда файловете в пакет.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -r - отпечатай верÑÐ¸Ñ Ð¸ Ñъщо така Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Ð¸Ð¼Ðµ.\n"
@@ -1674,25 +1691,25 @@ msgstr " -r - отпечатай верÑÐ¸Ñ Ð¸ Ñъщо така
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1701,8 +1718,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate верÑÐ¸Ñ %s\n"
-"Mandriva %s, вÑички права запазени.\n"
+"urpmi верÑÐ¸Ñ %s\n"
+"Mandriva 1999-2006, вÑички права запазени.\n"
"Това е Ñвободен Ñофтуер и може да бъде разпроÑтранÑван Ñпоред уÑловиÑтана "
"GNU GPL.\n"
"\n"
@@ -1959,7 +1976,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - избиране на вÑички ÑÑŠÐ²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð½Ð° ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´.\n"
@@ -2025,59 +2042,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(за обновÑване)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(за обновÑване)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(към инÑталациÑ)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(към инÑталациÑ)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Какъв е вашиÑÑ‚ избор? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Продължение въпреки вÑичко ?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Д/н) "
@@ -2087,160 +2107,180 @@ msgstr " (Д/н) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"ÐÑкои необходими пакети не могат да бъдат инÑталирани:\n"
"%s\n"
"Продължение?"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"ÐÑкои необходими пакети не могат да бъдат инÑталирани:\n"
"%s\n"
"Продължение?"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"ИнÑталациÑта не може да продължи,защото Ñледните пакети\n"
"Ñ‚Ñ€Ñбва да бъдат премахнати за да бъдат обновени други\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"ИнÑталациÑта не може да продължи,защото Ñледните пакети\n"
"Ñ‚Ñ€Ñбва да бъдат премахнати за да бъдат обновени други\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Следните пакети Ñ‚Ñ€Ñбва да бъдат премахнати,за да могат други да бъдат "
"обновени:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Следните пакети Ñ‚Ñ€Ñбва да бъдат премахнати,за да могат други да бъдат "
"обновени:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, fuzzy, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr "ТрÑбва да Ñте root за да ползвате тази команда ! \n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "ÐатиÑнете Enter,когато Ñте готови..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Отказ"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Следните пакети ще Ñ‚Ñ€Ñбва да Ñе инÑталират:\n"
-msgstr[1] "Следните пакети ще Ñ‚Ñ€Ñбва да Ñе инÑталират:\n"
+msgstr "Следните пакети ще Ñ‚Ñ€Ñбва да Ñе инÑталират:\n"
+
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следните пакети ще Ñ‚Ñ€Ñбва да Ñе инÑталират:\n"
-#: ../urpmi:668
+#: ../urpmi:673
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "ИÑкате ли да цъкнете на този бутон?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ИнÑталациÑта провалена"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Стартирам %s:"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "инÑталиране %s\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "инÑталиране %s\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ИнÑталациÑта провалена"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Опит за инÑталиране без проверка на завиÑимоÑти? (д/Ð) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Опит за инÑталиране даже по-Ñилно (--force)? (д/Ð) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d инÑталационните транзакции не можаха да Ñе оÑъщеÑтвÑÑ‚"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d инÑталационните транзакции не можаха да Ñе оÑъщеÑтвÑÑ‚"
+msgstr[1] "%d инÑталационните транзакции не можаха да Ñе оÑъщеÑтвÑÑ‚"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "ИнÑталациÑта е възможна"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Пакета(тите) вече Ñа инÑталирани"
-msgstr[1] "Пакета(тите) вече Ñа инÑталирани"
+msgstr "Пакета(тите) вече Ñа инÑталирани"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Пакета(тите) вече Ñа инÑталирани"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Пакета(тите) вече Ñа инÑталирани"
-msgstr[1] "Пакета(тите) вече Ñа инÑталирани"
+msgstr "Пакета(тите) вече Ñа инÑталирани"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Пакета(тите) вече Ñа инÑталирани"
+
+#: ../urpmi:862
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Стартира slurpd: "
@@ -2338,17 +2378,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - почиÑтване на хедър кеш директориÑта.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - показва вÑички ÑъобщениÑ\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - показва вÑички ÑъобщениÑ\n"
@@ -2406,7 +2446,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "ÐевъзможноÑÑ‚ за Ñъздаване на източник."
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2415,8 +2455,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpme верÑÐ¸Ñ %s\n"
-"Mandriva 1999-2005, вÑички права запазени.\n"
+"urpmi.recover верÑÐ¸Ñ %s\n"
+"Mandriva 2006, вÑички права запазени.\n"
"Това е Ñвободен Ñофтуер и може да бъде разпроÑтранÑван Ñпоред уÑловиÑтана "
"GNU GPL.\n"
"\n"
@@ -2482,8 +2522,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2541,12 +2583,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"употреба: urpmi.removemedia [-a] <име> ...\n"
+"употреба: urpmi.removemedia (-a | <име> ...)\n"
"където <име> е име на източник за премахване.\n"
#: ../urpmi.removemedia:41
@@ -2609,25 +2651,32 @@ msgstr " --no-ignore - не обновÑвай, маркирай източÐ
#: ../urpmi.update:47
#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" -h - опитай да намериш и ползваш Ñинтез or hdlist файл.\n"
+
+#: ../urpmi.update:48
+#, fuzzy, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - избиране на вÑички твърди диÑкове.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -v - активира Ñъздаване на hdlist файлове.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Само superuser-а има правото да обновÑва източниците"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нищо за ъпгрейд (ползвай urpmi.addmedia за добавÑне на източник)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2636,25 +2685,25 @@ msgstr ""
"липÑва опциÑта за обновÑване\n"
"(една от %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "игнориране на източник %s"
# Another meaning of the word is in the sense "The iron is good medium for the eletricity"
# in this case must be "проводник"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "активиране на източник %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2663,8 +2712,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate верÑÐ¸Ñ %s\n"
-"Mandriva (C) 2000-2005, вÑички права запазени.\n"
+"urpmq верÑÐ¸Ñ %s\n"
+"Mandriva (C) 2000-2006, вÑички права запазени.\n"
"Това е Ñвободен Ñофтуер и може да бъде разпроÑтранÑван Ñпоред уÑловиÑта на "
"GNU GPL.\n"
"\n"
@@ -2754,64 +2803,66 @@ msgstr " --changelog - отпечатва ÑпиÑък Ñ Ð¿Ñ€Ð¾Ð¼ÐµÐ½Ð¸Ñ‚Ðµ
msgid " --summary, -S - print summary.\n"
msgstr " --summary - отпечатва резюме за тага: summary.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " -R - обратно Ñ‚ÑŠÑ€Ñене за това кой изиÑква пакета.\n"
+
#: ../urpmq:88
#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -R - обратно Ñ‚ÑŠÑ€Ñене за това кой изиÑква пакета.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - Ñ‚ÑŠÑ€Ñене в provides за да Ñе намери пакет.\n"
+
+#: ../urpmq:93
+#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - пълен отчет Ñ Ð¿Ð°ÐºÐµÑ‚Ð° който ще бъде изтрит.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - разшири запитването и към пакетните завиÑимоÑти.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - отпечатай Ñъщо групите Ñ Ð¸Ð¼ÐµÐ½Ð°.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - отпечатай полезна Ð¸Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ Ð·Ð° четене от човек.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - извежда файловете в пакет.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - не Ñ‚ÑŠÑ€Ñи в provides за намиране на пакет.\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - Ñ‚ÑŠÑ€Ñене в provides за да Ñе намери пакет.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -v - показва вÑички ÑъобщениÑ\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - отпечатай верÑÐ¸Ñ Ð¸ номер а Ñъщо и име.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - обратно Ñ‚ÑŠÑ€Ñене за това кой изиÑква пакета.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - обратно Ñ‚ÑŠÑ€Ñене за това кой изиÑква пакета.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -r - отпечатай верÑÐ¸Ñ Ð¸ Ñъщо така Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ñ Ð¸Ð¼Ðµ.\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2819,51 +2870,68 @@ msgid ""
msgstr ""
" -u - премахни пакета ако вече е инÑталирана по-нова верÑиÑ.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - като -y, но не Ñе отчитат главни-малки букви.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "имена или rpm файлове от ÐºÐ¾Ð¼Ð°Ð½Ð´Ð½Ð¸Ñ Ñ€ÐµÐ´ Ñе обработват.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може да Ñе използва Ñамо Ñ --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "Ðе е намерен файлов-ÑпиÑък\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ðе е намерен changelog\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Ðе е намерен файлов-ÑпиÑък\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "За да Ñе запазÑÑ‚ завиÑимоÑтите,тези пакети ще бъдат деинÑталирани (%d МБ)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P - не Ñ‚ÑŠÑ€Ñи в provides за намиране на пакет.\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - обратно Ñ‚ÑŠÑ€Ñене за това кой изиÑква пакета.\n"
+
#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
@@ -2885,20 +2953,6 @@ msgstr "Ðе е намерен changelog\n"
#~ "%s\n"
#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "За да Ñе задоволÑÑ‚ завиÑимоÑтите, Ñледните %d пакети ще\n"
-#~ "бъдат инÑталирани:\n"
-#~ "%s\n"
-#~ msgstr[1] ""
-#~ "За да Ñе задоволÑÑ‚ завиÑимоÑтите, Ñледните %d пакети ще\n"
-#~ "бъдат инÑталирани:\n"
-#~ "%s\n"
-
-#, fuzzy
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "пропуÑкам източник %s: нÑма hdlist\n"
diff --git a/po/bn.po b/po/bn.po
index 6b394b3b..630dd7ae 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -25,7 +25,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-02-13 13:39+0600\n"
"Last-Translator: Jamil Ahmed <jamil@bengalinux.org>\n"
"Language-Team: Bangla <mdk-translation@bengalinux.org>\n"
@@ -34,7 +34,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "আরপিà¦à¦® ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨"
@@ -44,7 +44,7 @@ msgstr "আরপিà¦à¦® ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "ঠিক আছে (_ঠ)"
@@ -110,7 +110,7 @@ msgstr "_ইনসà§à¦Ÿà¦²"
msgid "_Save"
msgstr "_সংরকà§à¦·à¦£"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "বাতিল (_ত)"
@@ -120,29 +120,29 @@ msgstr "বাতিল (_ত)"
msgid "Choose location to save file"
msgstr "ফাইল সংরকà§à¦·à¦£ করার অবসà§à¦¥à¦¾à¦¨ বেছে নিন"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"অপরিচিত অপশনসমূহ '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "কোন নিরà§à¦¦à§‡à¦¶ পাওয়া যায় নি"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "অনà§à¦—à§à¦°à¦¹ করে অপেকà§à¦·à¦¾ করà§à¦¨..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "অবশà§à¦¯à¦‡ root হতে হবে"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -153,42 +153,42 @@ msgstr ""
"%s\n"
"à¦à¦—িয়ে যাবো?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "নোটিশ"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "ঠিক আছে"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (আপগà§à¦°à§‡à¦¡à§‡à¦° জনà§à¦¯)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (ইনসà§à¦Ÿà¦²à§‡à¦° জনà§à¦¯)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦¸à¦®à§à¦¹à§‡à¦° মধà§à¦¯à§‡ à¦à¦•à¦Ÿà¦¿à¦° পà§à¦°à§Ÿà§‹à¦œà¦¨ আছে:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_বাতিল"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -199,43 +199,49 @@ msgstr ""
"%s\n"
"à¦à¦—িয়ে যাবো?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡, ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¦à§‡à¦° সনà§à¦¤à§à¦·à§à¦Ÿ করতে (%d à¦à¦®à¦¬à¦¿)"
-msgstr[1] ""
+msgstr ""
"নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡, ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¦à§‡à¦° সনà§à¦¤à§à¦·à§à¦Ÿ করতে (%d à¦à¦®à¦¬à¦¿)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡:\n"
+"%s\n"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d পà§à¦¯à¦¾à¦•à§‡à¦œ সমূহ"
+msgstr[1] "%d পà§à¦¯à¦¾à¦•à§‡à¦œ সমূহ"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "পà§à¦¯à¦¾à¦•à§‡à¦œ ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "সোরà§à¦¸ পà§à¦¯à¦¾à¦•à§‡à¦œ গà§à¦²à¦¿ পাওয়া যায়নি, থামানো হচà§à¦›à§‡"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "অনà§à¦—à§à¦°à¦¹ করে \"%s\" নামের মাধà§à¦¯à¦® [%s] নামের ডিভাইসে পà§à¦°à¦¬à§‡à¦¶ করান"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' পà§à¦¯à¦¾à¦•à§‡à¦œ ডাউনলোড করা হচà§à¦›à§‡..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -248,7 +254,7 @@ msgstr ""
"\n"
"আপনি কি ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ পà§à¦°à¦•à§à¦°à¦¿à§Ÿà¦¾ চালিয়ে যেতে ইচà§à¦›à§à¦• ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -259,37 +265,37 @@ msgstr ""
"%s\n"
"আপনি হয়তো আপনার urpmi ডাটাবেস আপডেট করতে চাইবেন"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s সরানো হচà§à¦›à§‡"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "পà§à¦°à¦¸à§à¦¤à§à¦¤ করা হচà§à¦›à§‡..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' পà§à¦¯à¦¾à¦•à§‡à¦œ ইনসà§à¦Ÿà¦² করা হচà§à¦›à§‡ (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_সমà§à¦ªà¦¨à§à¦¨"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ বà§à¦¯à¦°à§à¦¥"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ পà§à¦°à¦•à§à¦°à¦¿à§Ÿà¦¾ সমà§à¦ªà§‚রà§à¦£ হয়েছে"
@@ -338,63 +344,63 @@ msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° superuser-à¦à¦° পà§à¦¯à¦¾à¦•à§‡à¦œ ইà¦
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb খà§à¦²à¦¤à§‡ অকà§à¦·à¦®"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "অবৈধ rpm ফাইল নাম [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm ফাইল [%s] আনা হচà§à¦›à§‡..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...আনা হয়ে গেছে"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...আনতে বà§à¦¯à¦°à§à¦¥ হয়েছি: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm ফাইল [%s] বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যাচà§à¦›à§‡ না"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\"-à¦à¦° পরিচয় [%s] ফাইলে দেয়া সমà§à¦­à¦¬ হয়নি"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "আরপিà¦à¦® ফাইল রেজিসà§à¦Ÿà¦¾à¦° করতে অকà§à¦·à¦®"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "সà§à¦¥à¦¾à¦¨à§€à§Ÿ পà§à¦¯à¦¾à¦•à§‡à¦œà¦¸à¦®à§‚হ রেজিসà§à¦Ÿà¦¾à¦° করতে সমসà§à¦¯à¦¾ হয়েছে"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -414,27 +420,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "ডিরেকà§à¦Ÿà¦°à¦¿ শেয়ার করতে হলে আপনাকে অনà§à¦®à§‹à¦¦à¦¿à¦¤ বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€ হতে হবে"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm ফাইল পড়া যাচà§à¦›à§‡à¦¨à¦¾\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦®à§‡à¦° জনà§à¦¯ hdlist synthesis ফাইল তৈরি করা হচà§à¦›à§‡"
@@ -459,7 +465,7 @@ msgstr "কনফিগ ফাইল [%s]-ঠলেখা সমà§à¦­à¦¬ হà§
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "কনফিগ ফাইল [%s]-ঠলেখা সমà§à¦­à¦¬ হয়নি"
@@ -472,12 +478,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦•à¦¾à¦°à§€à¦° নাম:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "পাসওয়ারà§à¦¡:"
#: ../urpm/download.pm:185
#, c-format
@@ -589,7 +595,7 @@ msgstr "à¦à¦–ানে à¦à¦•à¦‡ rpm ফাইলনেমের বিভিà¦
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "\"%s\" ভà§à¦¯à¦¾à¦²à§à¦° ওপর [%s] সঠিকভাবে পারà§à¦¸ হয়নি"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "\"%s\"-à¦à¦° list ফাইল বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যায়নি, মাধà§à¦¯à¦® অগà§à¦°à¦¹à§à¦¯ করা হয়েছে"
@@ -701,9 +707,9 @@ msgid "No base defined"
msgstr "কোন নিরà§à¦¦à§‡à¦¶ পাওয়া যায় নি"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "colormap à¦à¦¨à§à¦Ÿà§à¦°à¦¿ বরাদà§à¦¦ করতে বà§à¦¯à¦°à§à¦¥"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -725,7 +731,7 @@ msgstr "সাবধান বাণী: MD5SUM ফাইলে %s à¦à¦° md5sum
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "উপসà§à¦¥à¦¿à¦¤ সোরà§à¦¸ hdlist (অথবা synthesis)-à¦à¦° md5sum হিসেব করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -734,107 +740,107 @@ msgstr ""
"virtual \"%s\" মাধà§à¦¯à¦®à§‡ hdlist অথবা list ফাইল উলà§à¦²à§‡à¦– থাকার কথা নয়, মাধà§à¦¯à¦® অগà§à¦°à¦¾à¦¹à§à¦¯ "
"করা হয়েছে"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"virtual \"%s\" মাধà§à¦¯à¦®à§‡ à¦à¦•à¦Ÿà¦¿ পরিষà§à¦•à¦¾à¦° url থাকা উচিতà§â€â€Œ, মাধà§à¦¯à¦® উপেকà§à¦·à¦¾ করা হয়েছে"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "অবৈধ rpm ফাইল নাম [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "unable to find list file for \"%s\", medium ignored"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "অনà§à¦ªà¦¸à§à¦¹à¦¿à¦¤ মাধà§à¦¯à¦® \"%s\" নিরà§à¦¬à¦¾à¦šà¦¨ করার চেষà§à¦Ÿà¦¾ করছি"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" মাধà§à¦¯à¦®à§‡à¦° জনà§à¦¯ hdlist synthesis ফাইল তৈরি করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\"-à¦à¦° hdlist ফাইল বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যায়নি, মাধà§à¦¯à¦® অগà§à¦°à¦¹à§à¦¯ করা হয়েছে"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "\"%s\" à¦à¦° hdlist ফাইল পারà§à¦¸ করা যায়নি"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"\"%s\" মাধà§à¦¯à¦®à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ hdlist বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° চেষà§à¦Ÿà¦¾ করছে যা আগে থেকেই বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡ আছে, "
"মাধà§à¦¯à¦® অগà§à¦°à¦¾à¦¹à§à¦¯ করা হয়েছে"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"\"%s\" মাধà§à¦¯à¦®à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ list বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° চেষà§à¦Ÿà¦¾ করছে যা আগে থেকেই বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡ আছে, মাধà§à¦¯à¦® "
"অগà§à¦°à¦¾à¦¹à§à¦¯ করা হয়েছে"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "বিদà§à¦¯à¦®à¦¾à¦¨ মাধà§à¦¯à¦® \"%s\" à¦à§œà¦¾à¦¬à¦¾à¦° চেষà§à¦Ÿà¦¾ করা হচà§à¦›à§‡, à¦à§œà¦¿à§Ÿà§‡ চলছি"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°à¦¯à§‹à¦—à§à¦¯ মাধà§à¦¯à¦® \"%s\"-à¦à¦° জনà§à¦¯ পà§à¦°à¦šà§à¦° মাউনà§à¦Ÿ পয়েনà§à¦Ÿ"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°à¦¯à§‹à¦—à§à¦¯ ডিভাইসকে \"%s\" হিসেবে নেয়া হলো"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "\"%s\" মাধà§à¦¯à¦® à¦à¦•à¦Ÿà¦¿ ISO ইমেজ, à¦à¦Ÿà¦¿ চালানোর সময় মাউনà§à¦Ÿ করা হবে"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "অনà§à¦¯à¦¾à¦¨à§à¦¯ সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°à¦¯à§‹à¦—à§à¦¯ ডিভাইস [%s]-কে \"%s\"-à¦à¦° জনà§à¦¯ বà§à¦¯à¦¬à¦¹à¦¾à¦° করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°à¦¯à§‹à¦—à§à¦¯ মাধà§à¦¯à¦® \"%s\"-à¦à¦° পাথনেম উদà§à¦§à¦¾à¦° করা সমà§à¦­à¦¬ হয়নি"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "কনফিগ ফাইল [%s] লিখো"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "use-distrib মোডের সাথে সমানà§à¦¤à¦°à¦¾à¦² মোডে বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যাচà§à¦›à§‡ না"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "সংশà§à¦²à¦¿à¦·à§à¦Ÿ মিডিয়া জনà§à¦¯ সমানà§à¦¤à¦°à¦¾à¦² মোডের বà§à¦¯à¦¬à¦¹à¦¾à¦°: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -843,145 +849,145 @@ msgstr ""
"--media, --excludemedia, --sortmedia, --update অথবা --parallel à¦à¦° সাথে --"
"synthesis বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যাবেনা"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"নোট: যেহেতৠকোনো মাধà§à¦¯à¦® hdlists বà§à¦¯à¦¬à¦¹à¦¾à¦° করে সনà§à¦§à¦¾à¦¨ করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "খোà¦à¦œà§‹ শà§à¦°à§: %s শেষ: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¸à¦®à§‚হ হিসাব করার জনà§à¦¯ দà§à¦¬à¦¿à¦¤à§€à§Ÿ পাস সমà§à¦ªà¦¾à¦¦à¦¨ করা হচà§à¦›à§‡\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "পà§à¦¯à¦¾à¦•à§‡à¦œ %s উপেকà§à¦·à¦¾ করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s পà§à¦¯à¦¾à¦•à§‡à¦œ আপগà§à¦°à§‡à¦¡ করার বদলে ইনসà§à¦Ÿà¦² করবে"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "মাধà§à¦¯à¦® \"%s\" আগে থেকেই আছে"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "ভারà§à¦šà§à§Ÿà¦¾à¦² মাধà§à¦¯à¦® সà§à¦¥à¦¾à¦¨à§€à§Ÿ হতে হবে"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦® থেকে হেডার পড়া হচà§à¦›à§‡"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦® সরানো হচà§à¦›à§‡"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "পà§à¦°à¦¥à¦® ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ মাধà§à¦¯à¦® বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যাচà§à¦›à§‡à¦¨à¦¾"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists ফাইল আনা হচà§à¦›à§‡..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb খà§à¦²à¦¤à§‡ অকà§à¦·à¦®"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"পà§à¦°à¦¥à¦® ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ মাধà§à¦¯à¦® বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যাচà§à¦›à§‡ নাহৠ(কোন hdlists ফাইল পাওয়া যায়নি)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "অনà§à¦ªà¦¸à§à¦¹à¦¿à¦¤ মাধà§à¦¯à¦® \"%s\" নিরà§à¦¬à¦¾à¦šà¦¨ করার চেষà§à¦Ÿà¦¾ করছি"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "à¦à¦•à¦¾à¦§à¦¿à¦• মিডিয়া নিরà§à¦¬à¦¾à¦šà¦¨ করা হচà§à¦›à§‡: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦® সরানো হচà§à¦›à§‡"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦®à¦•à§‡ urpmi à¦à¦° জনà§à¦¯ পà§à¦¨à¦°à¦¾à§Ÿ কনফিগার করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...পà§à¦¨à¦°à¦¾à§Ÿ কনফিগারেশন করতে বà§à¦¯à¦°à§à¦¥"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "পà§à¦¨à¦°à¦¾à§Ÿ কনফিগারেশন সমপনà§à¦¨"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "মাধà§à¦¯à¦® \"%s\" নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ হয়নি"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist ফাইল [%s] পরীকà§à¦·à¦¾ করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis ফাইল [%s] পরীকà§à¦·à¦¾ করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist পà§à¦°à¦¸à§à¦¤à§à¦¤ করা হচà§à¦›à§‡ [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -990,77 +996,77 @@ msgstr ""
"\"%s\" মাধà§à¦¯à¦®à§‡à¦° জনà§à¦¯ সিনথিসিস ফাইল তৈরী করা যাচà§à¦›à§‡ না। আপনার hdlist ফাইলটি মনে "
"হয় তà§à¦°à§à¦Ÿà¦¿à¦ªà§‚রà§à¦£à¥¤"
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "মাধà§à¦¯à¦® \"%s\"-à¦à¦° hdlist বা synthesis ফাইল পড়তে সমসà§à¦¯à¦¾ হচà§à¦›à§‡"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...কপি করতে বà§à¦¯à¦°à§à¦¥"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"-à¦à¦° বিবরণ ফাইল কপি করা হচà§à¦›à§‡..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...কপি করা সমà§à¦ªà¦¨à§à¦¨"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\"-à¦à¦° তালিকা ফাইল লিখছি..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s]-à¦à¦° কপি বà§à¦¯à¦°à§à¦¥ হয়েছে (ফাইলটি অসà§à¦¬à¦¾à¦­à¦¾à¦¬à¦¿à¦• ছোট)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "কপিকৃত সোরà§à¦¸ hdlist (অথবা synthesis)-à¦à¦° md5sum হিসেব করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s]-à¦à¦° কপি বà§à¦¯à¦°à§à¦¥ হয়েছে (md5sum মেলেনি)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "উদà§à¦§à¦¾à¦°à¦•à§ƒà¦¤ সোরà§à¦¸ hdlist (অথবা synthesis)-à¦à¦° md5sum হিসেব করা হচà§à¦›à§‡"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...আনতে বà§à¦¯à¦°à§à¦¥ হয়েছি: md5sum মিলেনি"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] থেকে কোন rpm ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] থেকে আর-পি-à¦à¦® ফাইল পড়া হচà§à¦›à§‡"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "rpm ফাইল পড়া যাচà§à¦›à§‡à¦¨à¦¾ [%s] থেকে: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "কোন আরপিà¦à¦® পড়ছে না"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1070,78 +1076,78 @@ msgstr ""
"\"%s\" মাধà§à¦¯à¦® বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যায়নি,\n"
"মাধà§à¦¯à¦® তৈরীর সময় আপনি নিজ হাতে ডিরেকà§à¦Ÿà¦°à§€ তৈরী করার কারনে à¦à¦°à¦•à¦® হতে পারে।"
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦®à§‡à¦° জনà§à¦¯ কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\"-à¦à¦° hdlist (বা synthesis) সোরà§à¦¸ আনা হচà§à¦›à§‡..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "আরমà§à¦­ করা hdlist (বা synthesis) %s রূপে পাওয়া গিয়েছে"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦®à§‡à¦° জনà§à¦¯ কোন hdlist ফাইল পাওয়া যায়নি"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"-à¦à¦° pubkey পরীকà§à¦·à¦¾ করছি..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\"-à¦à¦° pubkey থেকে %s কী ইমপোরà§à¦Ÿ করা হয়েছে"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\"-à¦à¦° pubkey ইমপোরà§à¦Ÿ করা যায়নি"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\"-à¦à¦° তালিকা ফাইল লিখছি..."
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "মাধà§à¦¯à¦® %s যোগ করা হয়েছে"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" à¦à¦° hdlist ফাইল পারà§à¦¸ করা যায়নি"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦®à§‡à¦° synthesis ফাইল পড়তে সমসà§à¦¯à¦¾ হয়েছে"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦® থেকে হেডার পড়া হচà§à¦›à§‡"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nnন"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yyহ"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "দà§à¦ƒà¦–িত, খারাপ পছনà§à¦¦, পà§à¦¨à¦°à¦¾à§Ÿ চেষà§à¦Ÿà¦¾ করà§à¦¨\n"
@@ -1177,8 +1183,8 @@ msgid "unmounting %s"
msgstr "%s আনমাউনà§à¦Ÿ করা হচà§à¦›à§‡"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "মাধà§à¦¯à¦® \"%s\" নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ হয়নি"
#: ../urpm/removable.pm:143
@@ -1197,47 +1203,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "\"%s\" মাধà§à¦¯à¦® বà§à¦¯à¦¬à¦¹à¦¾à¦° করা যায়নি"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "%s নামের কোন পà§à¦¯à¦¾à¦•à§‡à¦œ নেই"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "à¦à¦‡ পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿à¦¤à§‡ রয়েছে %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s অনà§à¦ªà¦¸à§à¦¥à¦¿à¦¤à¦¿à¦° কারনে"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s অসনà§à¦¤à§à¦·à§à¦Ÿà¦¿à¦° কারনে"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "%s পà§à¦°à§‹à¦®à¦Ÿ করার চেষà§à¦Ÿà¦¾ করছি"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s রাখার জনà§à¦¯"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s ইনসà§à¦Ÿà¦²à§‡à¦° জনà§à¦¯"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s-à¦à¦° সাথে সংঘাতের কারনে"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "অ-অনà§à¦°à§‹à¦§à¦•à§ƒà¦¤"
@@ -1258,7 +1264,7 @@ msgid "Missing signature (%s)"
msgstr "(%s) সà§à¦¬à¦¾à¦•à§à¦·à¦° পাওয়া যাচà§à¦›à§‡ না"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1268,7 +1274,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpme সংসà§à¦•à¦°à¦£ %s\n"
-"কপিরাইট (C) ১৯৯৯-২০০৪ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
+"কপিরাইট (C) ১৯৯৯-২০০৬ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
"à¦à¦Ÿà¦¿ মà§à¦•à§à¦¤ সফà§à¦Ÿà¦“য়à§à¦¯à¦¾à¦° à¦à¦¬à¦‚ GNU GPL à¦à¦° নিয়মানà§à¦¯à¦¾à§Ÿà§€ হয়তো à¦à¦Ÿà¦¾ পà§à¦¨à¦ƒà¦¬à¦¿à¦¤à¦°à¦£ করা যাবে।\n"
"\n"
"বà§à¦¯à¦¬à¦¹à¦¾à¦°:\n"
@@ -1341,9 +1347,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - à¦à¦•à¦Ÿà¦¿ hdlist ফাইল খà§à¦à¦œà§‡ বà§à¦¯à¦¬à¦¹à¦¾à¦°à§‡à¦° চেষà§à¦Ÿà¦¾ করো।\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - verbose মোড।\n"
+msgstr " --verbose, -v - verbose মোড।\n"
#: ../urpme:58
#, c-format
@@ -1380,29 +1386,38 @@ msgstr "সরানোর মতো কিছà§à¦‡ নেই"
msgid "Checking to remove the following packages"
msgstr "নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦¸à¦®à§‚হ সরানোর জনà§à¦¯ পরীকà§à¦·à¦¾ করা হচà§à¦›à§‡"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে, নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ সরানো হবে (%d à¦à¦®à¦¬à¦¿)"
+msgstr[1] "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে, নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ সরানো হবে (%d à¦à¦®à¦¬à¦¿)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে, নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ সরানো হবে (%d à¦à¦®à¦¬à¦¿)"
+msgid " (%d MB)"
+msgstr " (%d à¦à¦®à¦¬à¦¿)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "%s পà§à¦¯à¦•à§‡à¦œ সরানো হচà§à¦›à§‡"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s পà§à¦¯à¦•à§‡à¦œ সরানো হচà§à¦›à§‡"
+msgstr[1] "%s পà§à¦¯à¦•à§‡à¦œ সরানো হচà§à¦›à§‡"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr "(y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "সরাতে বà§à¦¯à¦°à§à¦¥"
#: ../urpmf:29
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
@@ -1412,10 +1427,10 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf সংসà§à¦•à¦°à¦£ %s\n"
-"কপিরাইট (C) ২০০২-২০০৪ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
+"কপিরাইট (C) ২০০২-২০০৬ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
"à¦à¦Ÿà¦¿ মà§à¦•à§à¦¤ সফà§à¦Ÿà¦“য়à§à¦¯à¦¾à¦° à¦à¦¬à¦‚ GNU GPL à¦à¦° নিয়মানà§à¦¯à¦¾à§Ÿà§€ হয়তো à¦à¦Ÿà¦¾ পà§à¦¨à¦ƒà¦¬à¦¿à¦¤à¦°à¦£ করা যাবে।\n"
"\n"
-"বà§à¦¯à¦¬à¦¹à¦¾à¦°:\n"
+"বà§à¦¯à¦¬à¦¹à¦¾à¦°: urpmf [options] pattern-expression\n"
#: ../urpmf:36
#, fuzzy, c-format
@@ -1647,7 +1662,7 @@ msgstr " --verbose - verbose মোড।\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡ ফাইলের তালিকা\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - ভারà§à¦¸à¦¨, পà§à¦°à¦•à¦¾à¦¶ à¦à¦¬à¦‚ আরà§à¦• à¦à¦° সঙà§à¦—ে নাম ছাপাও।\n"
@@ -1657,12 +1672,12 @@ msgstr " -f - ভারà§à¦¸à¦¨, পà§à¦°à¦•à¦¾à¦¶ à¦à¦¬à¦‚ আà
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s-à¦à¦° ওপর সà§à¦¨à¦¿à¦°à§à¦¦à¦¿à¦·à§à¦Ÿ পরিবেশ বà§à¦¯à¦¬à¦¹à¦¾à¦° করো\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1671,13 +1686,13 @@ msgstr ""
"নোট: যেহেতৠকোনো মাধà§à¦¯à¦® hdlists বà§à¦¯à¦¬à¦¹à¦¾à¦° করে সনà§à¦§à¦¾à¦¨ করে নি, urpmf কোনো ফলাফল দিতে "
"পারে নি\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "পà§à¦¯à¦¾à¦•à§‡à¦œ নাম সমà§à¦¹ খোà¦à¦œà¦¾à¦° জনà§à¦¯ আপনি --name বà§à¦¯à¦¬à¦¹à¦¾à¦° করতে পারেন।\n"
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1687,7 +1702,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmi সংসà§à¦•à¦°à¦£ %s\n"
-"কপিরাইট (C) ১৯৯৯-২০০৪ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
+"কপিরাইট (C) ১৯৯৯-২০০৬ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
"à¦à¦Ÿà¦¿ মà§à¦•à§à¦¤ সফà§à¦Ÿà¦“য়à§à¦¯à¦¾à¦° à¦à¦¬à¦‚ GNU GPL à¦à¦° নিয়মানà§à¦¯à¦¾à§Ÿà§€ হয়তো à¦à¦Ÿà¦¾ পà§à¦¨à¦ƒà¦¬à¦¿à¦¤à¦°à¦£ করা যাবে।\n"
"\n"
"বà§à¦¯à¦¬à¦¹à¦¾à¦°:\n"
@@ -1971,7 +1986,7 @@ msgstr " --noclean - কà§à¦¯à¦¾à¦¶ ঠবà§à¦¯à¦¬à¦¹à§ƒà¦¤ নয় à¦à
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - শà§à¦§à§à¦®à¦¾à¦¤à§à¦° à¦à¦•à¦‡ আরকিটেকà§à¦šà¦¾à¦°à§‡à¦° পà§à¦¯à¦¾à¦•à§‡à¦œà¦¸à¦®à§à¦¹à¦•à§‡ আপগà§à¦°à§‡à¦¡ করো।\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - কমানà§à¦¡ লাইনের সমসà§à¦¤ মিল নিরà§à¦¬à¦¾à¦šà¦¨ করো।\n"
@@ -1987,9 +2002,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - পà§à¦¯à¦¾à¦•à§‡à¦œ খোà¦à¦œà¦¾à¦° জনà§à¦¯ পà§à¦°à¦¦à¦¤à§à¦¤à§‡à¦° মধà§à¦¯à§‡ খোà¦à¦œ করবে না।\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - নিরà§à¦¬à¦¿à¦•à¦¾à¦° ভাবে।\n"
+msgstr " --quiet, -q - নিরà§à¦¬à¦¿à¦•à¦¾à¦° ভাবে।\n"
#: ../urpmi:157
#, c-format
@@ -2041,65 +2056,68 @@ msgstr ""
"সমসà§à¦¯à¦¾: %s শà§à¦§à§à¦®à¦¾à¦¤à§à¦° পড়ার জনà§à¦¯ মাউনà§à¦Ÿ করা মনে হচà§à¦›à§‡à¥¤\n"
"বলপà§à¦°à§à¦¬à¦• কাজের জনà§à¦¯ --allow-force বà§à¦¯à¦¬à¦¹à¦¾à¦° করà§à¦¨à¥¤"
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (আপগà§à¦°à§‡à¦¡à§‡à¦° জনà§à¦¯)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (আপগà§à¦°à§‡à¦¡à§‡à¦° জনà§à¦¯)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (ইনসà§à¦Ÿà¦²à§‡à¦° জনà§à¦¯)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (ইনসà§à¦Ÿà¦²à§‡à¦° জনà§à¦¯)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "আপনার পছনà§à¦¦ কি? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦¸à¦®à§à¦¹à¦•à§‡ ইনসà§à¦Ÿà¦² করা যাবে না কারন তারা à¦à¦®à¦¨ পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° পà§à¦°à¦¾à¦¤à¦¨ "
"সংসà§à¦•à¦°à¦£à§‡à¦° উপর নিরà§à¦­à¦°à¦¶à§€à¦² যার নতà§à¦¨ সংসà§à¦•à¦°à¦£ ইনসà§à¦Ÿà¦² করা আছে:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦¸à¦®à§à¦¹à¦•à§‡ ইনসà§à¦Ÿà¦² করা যাবে না কারন তারা à¦à¦®à¦¨ পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° পà§à¦°à¦¾à¦¤à¦¨ "
"সংসà§à¦•à¦°à¦£à§‡à¦° উপর নিরà§à¦­à¦°à¦¶à§€à¦² যার নতà§à¦¨ সংসà§à¦•à¦°à¦£ ইনসà§à¦Ÿà¦² করা আছে:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "অগà§à¦°à¦¸à¦° হবে?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr "(Y/n)"
@@ -2109,56 +2127,65 @@ msgstr "(Y/n)"
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"আবেদনকৃত কিছৠপà§à¦¯à¦¾à¦•à§‡à¦œ ইনসà§à¦Ÿà¦² করা যায়নি:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"আবেদনকৃত কিছৠপà§à¦¯à¦¾à¦•à§‡à¦œ ইনসà§à¦Ÿà¦² করা যায়নি:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"à¦à¦‡ ইনসà§à¦Ÿà¦²à¦Ÿà¦¿ চালিয়ে যাওয়া যাবেনা কারণ নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ সরাতে হবে অনà§à¦¯à¦—à§à¦²à¦¿ "
"আপগà§à¦°à§‡à¦¡ করার জনà§à¦¯:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"à¦à¦‡ ইনসà§à¦Ÿà¦²à¦Ÿà¦¿ চালিয়ে যাওয়া যাবেনা কারণ নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ সরাতে হবে অনà§à¦¯à¦—à§à¦²à¦¿ "
"আপগà§à¦°à§‡à¦¡ করার জনà§à¦¯:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ অবশà§à¦¯à¦‡ সরাতে হবে অনà§à¦¯à¦—à§à¦²à¦¿ আপগà§à¦°à§‡à¦¡ করার জনà§à¦¯:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ অবশà§à¦¯à¦‡ সরাতে হবে অনà§à¦¯à¦—à§à¦²à¦¿ আপগà§à¦°à§‡à¦¡ করার জনà§à¦¯:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2167,106 +2194,117 @@ msgstr ""
"নিমà§à¦¨à¦²à¦¿à¦–িত ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¸à¦®à§‚হ ইনসà§à¦Ÿà¦² করার জনà§à¦¯ আপনাকে রà§à¦Ÿ হতে হবে:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "পà§à¦°à¦¸à§à¦¤à§à¦¤ হলে Enter চাপà§à¦¨..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "বাতিল"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "নিমà§à¦¨à§‡à¦° পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿à¦¤à§‡ বাজে সà§à¦¬à¦¾à¦•à§à¦·à¦° রয়েছে"
-msgstr[1] "নিমà§à¦¨à§‡à¦° পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿à¦¤à§‡ বাজে সà§à¦¬à¦¾à¦•à§à¦·à¦° রয়েছে"
+msgstr "নিমà§à¦¨à§‡à¦° পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿à¦¤à§‡ বাজে সà§à¦¬à¦¾à¦•à§à¦·à¦° রয়েছে"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "নিমà§à¦¨à§‡à¦° পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿à¦¤à§‡ বাজে সà§à¦¬à¦¾à¦•à§à¦·à¦° রয়েছে"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "আপনি কি ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ চলিয়ে যেতে চাচà§à¦›à§‡à¦¨ ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ বà§à¦¯à¦°à§à¦¥"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "বিতরণ করা হচà§à¦›à§‡ %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "%s ইনসà§à¦Ÿà¦² করা হচà§à¦›à§‡ %s থেকে"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s ইনসà§à¦Ÿà¦² করা হচà§à¦›à§‡"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ বà§à¦¯à¦°à§à¦¥"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¸à¦®à§à¦¹ পরীকà§à¦·à¦¾ না করে ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨à§‡à¦° চেষà§à¦Ÿà¦¾ করবো? (y/N)"
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "আরও জোরালোভাবে ইনসà§à¦Ÿà¦²à§‡à¦° চেষà§à¦Ÿà¦¾à¦° করবো (--force)? (y/N)"
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨à§‡à¦° লেনদেন বà§à¦¯à¦°à§à¦¥ হয়েছে"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨à§‡à¦° লেনদেন বà§à¦¯à¦°à§à¦¥ হয়েছে"
+msgstr[1] "%d ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨à§‡à¦° লেনদেন বà§à¦¯à¦°à§à¦¥ হয়েছে"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "ইনসà§à¦Ÿà¦²à§‡à¦¶à¦¨ সমà§à¦­à¦¬"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
-msgstr[1] "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
+msgstr "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
-msgstr[1] "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
+msgstr "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "সবকিছৠআগে থেকেই ইনসà§à¦Ÿà¦² করা আছে"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi আবার শà§à¦°à§ করা হচà§à¦›à§‡"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2278,14 +2316,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦¬à¦¿à¦§à¦¿: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦¬à¦¿à¦§à¦¿: urpmi.addmedia [options] <name> <url>\n"
"যেখানে <url> হচà§à¦›à§‡ নিমà§à¦¨à§‡à¦° যে কোন à¦à¦•à¦Ÿà¦¿\n"
-" [file:/]/<path> with <relative filename of hdlist>\n"
-" ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-" ftp://<host>/<path> with <relative filename of hdlist>\n"
-" http://<host>/<path> with <relative filename of hdlist>\n"
-" removable://<path> with <relative filename of hdlist>\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" removable://<path>\n"
"\n"
"à¦à¦¬à¦‚ [options] গà§à¦²à§‹ à¦à¦° থেকে\n"
@@ -2368,17 +2405,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - হেডার কà§à¦¯à¦¾à¦¶ ডিরেকà§à¦Ÿà¦°à¦¿ পরিষà§à¦•à¦¾à¦° করো।\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - নিরà§à¦¬à¦¿à¦•à¦¾à¦° ভাবে।\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - verbose মোড।\n"
@@ -2436,7 +2473,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "\"%s\" মাধà§à¦¯à¦® তৈরী করা যায়নি\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2445,8 +2482,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpme সংসà§à¦•à¦°à¦£ %s\n"
-"কপিরাইট (C) ১৯৯৯-২০০৪ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
+"urpmi.recoveer সংসà§à¦•à¦°à¦£ %s\n"
+"কপিরাইট (C) ২০০৬ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
"à¦à¦Ÿà¦¿ মà§à¦•à§à¦¤ সফà§à¦Ÿà¦“য়à§à¦¯à¦¾à¦° à¦à¦¬à¦‚ GNU GPL à¦à¦° নিয়মানà§à¦¯à¦¾à§Ÿà§€ হয়তো à¦à¦Ÿà¦¾ পà§à¦¨à¦ƒà¦¬à¦¿à¦¤à¦°à¦£ করা যাবে।\n"
"\n"
"বà§à¦¯à¦¬à¦¹à¦¾à¦°:\n"
@@ -2510,9 +2547,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr ""
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "- %s অপসারিত হয়েছে\n"
+msgstr[1] "- %s অপসারিত হয়েছে\n"
#: ../urpmi.recover:82
#, c-format
@@ -2570,12 +2609,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
"যেখানে <name> সরানোর জনà§à¦¯ à¦à¦•à¦Ÿà¦¿ মাধà§à¦¯à¦®à§‡à¦° নাম।\n"
#: ../urpmi.removemedia:41
@@ -2637,26 +2676,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - আপগà§à¦°à§‡à¦¡ করো না, মাধà§à¦¯à¦®à¦Ÿà¦¿à¦•à§‡ সকà§à¦°à¦¿à§Ÿ হিসেবে চিহà§à¦¨à¦¿à¦¤ করো।\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - কোন synthesis বা hdlist ফাইল খোà¦à¦œà§‡à¦°\n"
+" চেষà§à¦Ÿà¦¾ করবে না।\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - সà§à¦¥à¦¾à¦¨à¦¾à¦¨à§à¦¤à¦°à¦¯à§‹à¦—à§à¦¯ অযোগà§à¦¯ à¦à¦°à¦•à¦® সমসà§à¦¥ মাধà§à¦¯à¦® নিরà§à¦¬à¦¾à¦šà¦¿à¦¤ করো।\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist ফাইলসমূহ তৈরী করার জনà§à¦¯ জোর দাও।\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "শà§à¦§à§à¦®à¦¾à¦¤à§à¦° superuser-ই মাধà§à¦¯à¦® আপডেট করতে পারবে"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "আপডেট করার কিছà§à¦‡ নাই (মাধà§à¦¯à¦® যোগ করতে urpmi.addmedia বà§à¦¯à¦¬à¦¹à¦¾à¦° করো)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2665,23 +2712,23 @@ msgstr ""
"আপডেটের à¦à¦¨à§à¦Ÿà§à¦°à¦¿ পাওয়া যাচà§à¦›à§‡ না\n"
"(%s-à¦à¦° à¦à¦•à¦Ÿà¦¾)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "\"%s\" মাধà§à¦¯à¦®à¦Ÿà¦¿ অগà§à¦°à¦¾à¦¹à§à¦¯ করা হচà§à¦›à§‡"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "\"%s\" মাধà§à¦¯à¦®à¦Ÿà¦¿ সকà§à¦°à¦¿à§Ÿ করা হচà§à¦›à§‡"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2691,7 +2738,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq সংসà§à¦•à¦°à¦£ %s\n"
-"কপিরাইট (ক) ২০০০-২০০৫ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
+"কপিরাইট (ক) ২০০০-২০০৬ মà§à¦¯à¦¾à¦¨à§à¦¡à§à¦°à¦¿à¦¬à¥¤\n"
"GNU GPL নীতিমালার অধীনে à¦à¦‡ মà§à¦•à§à¦¤ সফà§à¦Ÿà¦“য়à§à¦¯à¦¾à¦°à¦Ÿà¦¿ পà§à¦¨à¦°à¦¾à§Ÿ বিতরন করা যেতে পারে।\n"
"\n"
"বà§à¦¯à¦¬à¦¹à¦¾à¦°à¦¬à¦¿à¦§à¦¿:\n"
@@ -2778,64 +2825,66 @@ msgstr " --changelog - পà§à¦°à¦¿à¦¨à§à¦Ÿà§‡à¦° changelog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --epoch - summary: summary টà§à¦¯à¦¾à¦— ছাপাও।\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° কি পà§à¦°à§Ÿà§‹à¦œà¦¨ তার জনà§à¦¯ উলà§à¦Ÿà¦¾ খোà¦à¦œ করো।\n"
+
#: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -R - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° কি পà§à¦°à§Ÿà§‹à¦œà¦¨ তার জনà§à¦¯ উলà§à¦Ÿà¦¾ খোà¦à¦œ করো।\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - পরিবেশকদের মধà§à¦¯à§‡ পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° খোà¦à¦œ করো।\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - অপসারিত পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° সমà§à¦ªà§‚রà§à¦¨ ফলাফল।\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - পà§à¦¯à¦¾à¦•à§‡à¦œ নিরà§à¦­à¦°à¦¤à¦¾à¦° পà§à¦°à¦¤à¦¿ নিরীকà§à¦·à¦¾ পà§à¦°à¦¸à¦¾à¦°à¦¿à¦¤ করো।\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - নাম সহ গà§à¦°à§à¦ª পà§à¦°à¦¿à¦¨à§à¦Ÿ করো।\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - মানà§à¦·à§‡à¦° পড়ারমত পà§à¦°à§Ÿà§‹à¦œà¦¨à§€à§Ÿ তথà§à¦¯ পà§à¦°à¦¿à¦¨à§à¦Ÿ করো।\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡ ফাইলের তালিকা\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - পরিবেশকদের মধà§à¦¯à§‡ পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° খোà¦à¦œ করোনা (সà§à¦¬à¦¾à¦­à¦¾à¦¬à¦¿à¦•)।\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - পরিবেশকদের মধà§à¦¯à§‡ পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° খোà¦à¦œ করো।\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - নিরà§à¦¬à¦¿à¦•à¦¾à¦° ভাবে।\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - নাম সহ ভারà§à¦¸à¦¨ à¦à¦¬à¦‚ রিলিজ পà§à¦°à¦¿à¦¨à§à¦Ÿ করো।\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° কি পà§à¦°à§Ÿà§‹à¦œà¦¨ তার জনà§à¦¯ উলà§à¦Ÿà¦¾ খোà¦à¦œ করো।\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° কি পà§à¦°à§Ÿà§‹à¦œà¦¨ তার জনà§à¦¯ উলà§à¦Ÿà¦¾ খোà¦à¦œ করো।\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - পরবরà§à¦¤à¦¿ পà§à¦¯à¦¾à¦•à§‡à¦œà¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ সোরà§à¦¸ পà§à¦¯à¦¾à¦•à§‡à¦œ (অনà§à¦°à§‚প --src)।\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2843,61 +2892,70 @@ msgid ""
msgstr ""
" -u - যদি সামà§à¦ªà§à¦°à¦¤à¦¿à¦• সংসà§à¦•à¦•à¦°à¦¨ উপসà§à¦¥à¦¿à¦¤ থাকে তাহলে পà§à¦¯à¦¾à¦•à§‡à¦œ অপসরন করো।\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - fuzzy খোà¦à¦œ চালাও (অনà§à¦°à§‚প --fuzzy)।\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y à¦à¦° মতই, কিনà§à¦¤à§ case-insensitively মিলাতে বাধà§à¦¯ করবে।\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " কমানà§à¦¡à¦²à¦¾à¦‡à¦¨à§‡ পà§à¦°à¦¦à¦¤à§à¦¤ নাম বা rmp ফাইলসমূহ নিরীকà§à¦·à¦£ করা হয়েছে।\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes শà§à¦§à§à¦®à¦¾à¦¤à§à¦° --parallel à¦à¦° সাথে বà§à¦¯à¦¬à¦¹à§ƒà¦¤ হতে পারে"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"নোট: যেহেতৠকোনো মাধà§à¦¯à¦® hdlists বà§à¦¯à¦¬à¦¹à¦¾à¦° করে সনà§à¦§à¦¾à¦¨ করে নি, urpmf কোনো ফলাফল দিতে "
+"পারে নি\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "filelist পাওয়া যায়নি\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"নোট: যেহেতৠকোনো মাধà§à¦¯à¦® hdlists বà§à¦¯à¦¬à¦¹à¦¾à¦° করে সনà§à¦§à¦¾à¦¨ করে নি, urpmf কোনো ফলাফল দিতে "
+"পারে নি\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "changelog পাওয়া যায়নি\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "filelist পাওয়া যায়নি\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে, নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ সরানো হবে (%d à¦à¦®à¦¬à¦¿)"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡, ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¦à§‡à¦° সনà§à¦¤à§à¦·à§à¦Ÿ করতে (%d à¦à¦®à¦¬à¦¿)"
-#~ msgstr[1] ""
-#~ "নিমà§à¦¨à¦²à¦¿à¦–িত পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à¦¿ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡, ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿à¦¦à§‡à¦° সনà§à¦¤à§à¦·à§à¦Ÿ করতে (%d à¦à¦®à¦¬à¦¿)"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P - পরিবেশকদের মধà§à¦¯à§‡ পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° খোà¦à¦œ করোনা (সà§à¦¬à¦¾à¦­à¦¾à¦¬à¦¿à¦•)।\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - পà§à¦¯à¦¾à¦•à§‡à¦œà§‡à¦° কি পà§à¦°à§Ÿà§‹à¦œà¦¨ তার জনà§à¦¯ উলà§à¦Ÿà¦¾ খোà¦à¦œ করো।\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2908,18 +2966,6 @@ msgstr "changelog পাওয়া যায়নি\n"
#~ "%s\n"
#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡:\n"
-#~ "%s\n"
-#~ msgstr[1] ""
-#~ "ডিপেনà§à¦¡à§‡à¦¨à§à¦¸à¦¿ সনà§à¦¤à§à¦·à§à¦Ÿ করতে নিমà§à¦¨à¦²à¦¿à¦–িত %d পà§à¦¯à¦¾à¦•à§‡à¦œà¦—à§à¦²à§‹ ইনসà§à¦Ÿà¦² হতে যাচà§à¦›à§‡:\n"
-#~ "%s\n"
-
-#, fuzzy
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "%s মাধà§à¦¯à¦® উপেকà§à¦·à¦¾ করা হচà§à¦›à§‡: কোন hdlist নেই\n"
diff --git a/po/br.po b/po/br.po
index 2132d377..927b6026 100644
--- a/po/br.po
+++ b/po/br.po
@@ -7,7 +7,7 @@ msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2007-03-18 11:32+0100\n"
-"PO-Revision-Date: 2007-03-22 20:49+0100\n"
+"PO-Revision-Date: 2007-03-25 22:52+0200\n"
"Last-Translator: Thierry Vignaud <tvignaud@mandriva.com>\n"
"Language-Team: Breton <LL@li.org>\n"
"MIME-Version: 1.0\n"
@@ -175,13 +175,13 @@ msgstr ""
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgstr "Ar %d pakad a-heul a zo war-nes bezañ staliet"
+msgstr "Ar pakad a-heul a zo war-nes bezañ staliet :"
#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
-#, fuzzy, c-format
+#, c-format
msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet"
+msgstr "Ar pakadoù a-heul a zo war-nes bezañ staliet :"
#: ../gurpmi2:219 ../urpmi:583
#, c-format
@@ -1335,7 +1335,7 @@ msgstr ""
msgid "To satisfy dependencies, the following package will be removed"
msgid_plural ""
"To satisfy dependencies, the following %d packages will be removed"
-msgstr[0] "Ar pakadoù a-heul a zo war-nes bezañ staliet"
+msgstr[0] "Ar %d pakad a-heul a zo war-nes bezañ staliet"
#: ../urpme:135 ../urpmi:600
#, c-format
@@ -2150,7 +2150,7 @@ msgstr ""
#, c-format
msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
-msgstr[0] "gourc'hemennoù staliañ"
+msgstr[0] "%d gourc'hemenn staliañ zo bet sac'het"
#: ../urpmi:825
#, c-format
diff --git a/po/bs.po b/po/bs.po
index ce1593e1..93e0f315 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: bs\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-09-13 21:02+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@linux.org.ba>\n"
@@ -19,9 +19,10 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.10.2\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM instalacija"
@@ -31,7 +32,7 @@ msgstr "RPM instalacija"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Greška: ne mogu naći datoteku %s, prekidam operaciju"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -97,7 +98,7 @@ msgstr "_Instaliraj"
msgid "_Save"
msgstr "_Snimi"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
@@ -107,27 +108,27 @@ msgstr "_Odustani"
msgid "Choose location to save file"
msgstr "Izaberi lokaciju za snimanje"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Nepoznata opcija '%s'"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Nije naveden paket"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Molim saÄekajte..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Morate biti root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -138,42 +139,42 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (za ažuriranje)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (za instalaciju)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Izbor paketa"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od sljedećih paketa je potreban:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,42 +185,47 @@ msgstr ""
"%s\n"
"Da nastavim?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
-msgstr[1] "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
-msgstr[2] "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
+msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeći paket"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d paketa, %d MB)"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr "Da bih zadovoljio ovisnosti, instaliraću sljedeće pakete"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d paketa, %d MB)"
+msgstr[1] "(%d paketa, %d MB)"
+msgstr[2] "(%d paketa, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Instalacija paketa..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dobiti izvorne pakete, prekidam"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim ubacite medij sa imenom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Downloadujem paket `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -232,7 +238,7 @@ msgstr ""
"\n"
"Želite li nastaviti instalaciju?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -243,37 +249,37 @@ msgstr ""
"%s\n"
"Možda ćete trebati osvježiti vašu urpmi bazu podataka"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "uklanjam %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Pripremam..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Gotovo"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Instalacija nije uspjela"
+msgid "Installation failed:"
+msgstr "Instalacija nije uspjela:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalacija završena"
@@ -322,63 +328,63 @@ msgstr "Samo administrator (root) može instalirati pakete"
msgid "Running urpmi in restricted mode..."
msgstr "Pokrećem urpmi u ograniÄenom režimu..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "ne mogu otvoriti rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "neispravno ime rpm datoteke [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dobavljam rpm datoteku [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...download završen"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...dobavljanje nije uspjelo: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne mogu obraditi spec datoteku %s [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu registrovati rpm datoteku"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Nekompatibilna arhitektura za paket [%s]"
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ova operacija je zabranjena dok ste u ograniÄenom režimu"
@@ -398,27 +404,27 @@ msgstr "Direktorij okruženja %s ne postoji"
msgid "You need to be root to use --use-distrib"
msgstr "Morate biti root kako biste koristili --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu proÄitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr "Previše argumenata\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
@@ -443,7 +449,7 @@ msgstr "ne mogu da zapišem konf. datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu da zapišem konf. datoteku [%s]"
@@ -451,17 +457,17 @@ msgstr "ne mogu da zapišem konf. datoteku [%s]"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Molim unesite vaše podatke radi pristupa proxy serveru\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "KorisniÄko ime:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Å ifra:"
#: ../urpm/download.pm:185
#, c-format
@@ -573,7 +579,7 @@ msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ne mogu ispravno obraditi [%s] na vrijednosti \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ne mogu pristupiti list datoteci za \"%s\", ignorišem medij"
@@ -687,7 +693,7 @@ msgstr "Nije naveden paket"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -706,11 +712,11 @@ msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "pažnja: md5 suma za %s nije dostupna u datoteci MD5SUM"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "izraÄunavam md5sum postojećeg izvornog hdlista (ili synthesis)"
+msgstr "izraÄunavam md5sum postojećeg izvornog hdlista (ili synthesis) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -719,251 +725,251 @@ msgstr ""
"virtuelni medij \"%s\" ne bi trebao imati hdlist ili list datoteku, "
"ignorišem ga"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuelni medij \"%s\" bi trebao imati Äist url, ignoriÅ¡em medij"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "neispravno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ne mogu naći list datoteku za \"%s\", ignorišem medij"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "ne mogu izabrati nepostojeći medij \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "izgrađena hdlist synthesis datoteka za medij \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne mogu pristupiti hdlist datoteci za \"%s\", ignorišem medij"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku za \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "medij \"%s\" pokušava koristiti već korištenu hdlist, ignorišem medij"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"medij \"%s\" pokušava koristiti već iskorištenu listu, medij je ignorisan"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "pokuÅ¡avam prepisati postojeći medij \"%s\", preskaÄem"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "previÅ¡e taÄaka montiranja za izmjenjivi medij \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "uzimam izmjenjivi uređaj kao \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Medij \"%s\" je ISO imidž, biće automatski montiran"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "koristeći razliÄit izmjenjivi ureÄ‘aj [%s] za \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ne mogu dobaviti put direktorija za uklonjivi medij \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "zapiši konf. datoteku [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Nije moguće istovremeno koristi parallel i use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "koristi pridruženi medij za paralelni mod: %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--synthesis se ne može koristiti zajedno sa --media, --excludemedia, --"
-"sortmedia, --update or --parallel"
+"sortmedia, --update, --use-distrib or --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "PoÄetak pretrage: %s kraj: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "izvrÅ¡avam drugi prolaz izraÄunavanja ovisnosti\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "preskaÄem paket %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "instaliraću umjesto unaprjeđenja paketa %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuelni medij mora biti lokalan"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "dobavljam zaglavlja sa medija \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ne mogu pristupiti prvom instalacionom mediju"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "izgleda da ovaj URL ne sadrži distrib"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "skidam media.cfg datoteku..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "ne mogu obraditi media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ne mogu pristupiti prvom instalacionom mediju (nije pronađena hdlist "
"datoteka)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ne mogu izabrati nepostojeći medij \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "biram više medija: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfigurišem uprmi za medij \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfiguracija nije uspjela"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "rekonfiguracija završena"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Greška pri pravljenju names datoteke: zavisnost %d nedostaje"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Greška pri pravljenju names datoteke: Ne mogu pisati u datoteku (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ispitujem hdlist datoteku [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis datoteku [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "pravim hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -972,77 +978,77 @@ msgstr ""
"Ne mogu napraviti synthesis datoteku za medij \"%s\". Vaša hdlist datoteka "
"je možda neispravna."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem u Äitanju hdlist ili synthesis datoteke za medij \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspjelo"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisnu datoteku za \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "ispisujem list datoteku za medij \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] nije uspjelo (datoteka je sumnjivo mala)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "izraÄunavam md5sumu kopirane hdlist (ili synthesis) datoteke"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] nije uspjelo (md5sum se ne poklapa)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "izraÄunavam md5sum za dobavljeni hdlist (ili synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...dobavljanje nije uspjelo: md5sum ne odgovara"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nisam našao RPM datoteke sa [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Äitam RPM datoteke iz [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne mogu Äitati RPM datoteke iz [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "nijedan RPM nije proÄitan"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1053,78 +1059,78 @@ msgstr ""
"ovo se moglo desiti ako ste ruÄno montirali direktorij prilikom pravljenja "
"medija."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "dobavljam hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "pronašao traženi hdlist (ili synthesis) kao %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "istražujem pubkey datoteku za \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...uveo sam kljuÄ %s iz pubkey datoteke \"%s\"-a"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu uvesti pubkey datoteku za \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "ispisujem list datoteku za medij \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodao medij %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku za \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem pri Äitanju synthesis datoteke za medij \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "dobavljam zaglavlja sa medija \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "DdYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Žalim, pogrešan izbor, probajte kasnije\n"
@@ -1160,8 +1166,8 @@ msgid "unmounting %s"
msgstr "demontiram %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "medij \"%s\" nije izabran"
#: ../urpm/removable.pm:143
@@ -1179,47 +1185,47 @@ msgstr "nekoherentan medij \"%s\" je oznaÄen kao izmjenljiv, mada nije ustvari"
msgid "unable to access medium \"%s\""
msgstr "ne mogu pristupiti mediju \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nema paketa pod imenom %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sljedeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "zbog nedostajućeg %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog nezadovoljenih %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam promovirati %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "kako bi zadržao %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "da bih instalirao %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nije tražen"
@@ -1325,9 +1331,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - pokušaj pronaći i koristiti hdlist datoteku.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - rjeÄiti mod.\n"
+msgstr " --verbose, -v - rjeÄiti mod.\n"
#: ../urpme:58
#, c-format
@@ -1364,23 +1370,34 @@ msgstr "Nema ništa za uklanjanje"
msgid "Checking to remove the following packages"
msgstr "Provjeravam uklanjanje sljedećih paketa"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
+msgstr[1] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
+msgstr[2] "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "Remove %d packages?"
-msgstr "Da uklonim %d paketa?"
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Da uklonim %d paketa?"
+msgstr[1] "Da uklonim %d paketa?"
+msgstr[2] "Da uklonim %d paketa?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Uklanjanje nije uspjelo"
@@ -1635,7 +1652,7 @@ msgstr " --vendor - izdavaÄ\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - medij na kojem je paket pronađen\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - Å¡tampa verziju, izdanje i arhitekturu sa imenom.\n"
@@ -1645,12 +1662,12 @@ msgstr " -f - Å¡tampa verziju, izdanje i arhitekturu sa imenom.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Neispravan format: možete koristiti samo jedan viševrijednosni tag"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim navedenu okolinu na %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1659,7 +1676,7 @@ msgstr ""
"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
"mogao vratiti rezultate\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Možda želite koristiti --name da biste tražili imena paketa.\n"
@@ -1956,7 +1973,7 @@ msgstr " --nolock - ne zakljuÄavaj RPM bazu.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - ažuriraj samo pakete sa istom arhitekturom.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - izaberi sve pogotke na komandnoj liniji.\n"
@@ -1973,9 +1990,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - ne pretražuj 'provides' pri traženju paketa.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - tihi mod.\n"
+msgstr " --quiet, -q - tihi mod.\n"
#: ../urpmi:157
#, c-format
@@ -2030,62 +2047,61 @@ msgstr ""
"GreÅ¡ka: izgleda da je %s montiran samo za Äitanje.\n"
"Koristite opciju --allow-force za prinudnu operaciju."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Ažuriram medije...\n"
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (za ažuriranje)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (za ažuriranje)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (za instalaciju)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (za instalaciju)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Vaš izbor je? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Sljedeći paketi se ne mogu instalirati pošto zavise od sljedećih paketa\n"
"koji su stariji od instaliranih:\n"
"%s"
-msgstr[1] ""
-"Sljedeći paketi se ne mogu instalirati pošto zavise od sljedećih paketa\n"
-"koji su stariji od instaliranih:\n"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Sljedeći paketi se ne mogu instalirati pošto zavise od sljedećih paketa\n"
"koji su stariji od instaliranih:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2094,7 +2110,7 @@ msgstr ""
"\n"
"Svejedno nastavljate instalaciju?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
@@ -2104,66 +2120,65 @@ msgstr " (D/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-msgstr[1] ""
-"Neki od traženih paketa se ne mogu instalirati:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Neki od traženih paketa se ne mogu instalirati:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
"uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s\n"
-msgstr[1] ""
-"Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
-"uklonjeni da bi drugi mogli biti nadograđeni:\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[2] ""
+msgstr ""
"Instalacija se ne može nastaviti zato što sljedeći paketi trebaju biti\n"
"uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s"
-msgstr[1] ""
-"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Sljedeći paketi trebaju biti uklonjeni da bi drugi mogli biti nadograđeni:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(samo testiraj, uklanjanje neće biti izvršeno)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2172,110 +2187,119 @@ msgstr ""
"Morate biti root da biste instalirali sljedeće ovisnosti:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(samo testiraj, instalacija neće biti izvršena)"
-#: ../urpmi:594
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter kada budete spremni..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Sljedeći paketi imaju neispravne potpise"
-msgstr[1] "Sljedeći paketi imaju neispravne potpise"
-msgstr[2] "Sljedeći paketi imaju neispravne potpise"
+msgstr "Sljedeći paketi imaju neispravne potpise"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Sljedeći paketi imaju neispravne potpise"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Želite li nastaviti instalaciju ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuiram %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "instaliram %s iz %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instaliram %s"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "Instalacija nije uspjela:"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Da pokušam instalaciju bez provjere ovisnosti? (d/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "PokuÅ¡aj instalaciju joÅ¡ jaÄe (--force opcija)? (d/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instalacionih transakcija nije uspjelo"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instalacionih transakcija nije uspjelo"
+msgstr[1] "%d instalacionih transakcija nije uspjelo"
+msgstr[2] "%d instalacionih transakcija nije uspjelo"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalacija nije moguća"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "sve je već instalirano"
-msgstr[1] "sve je već instalirano"
-msgstr[2] "sve je već instalirano"
+msgstr "sve je već instalirano"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "sve je već instalirano"
-msgstr[1] "sve je već instalirano"
-msgstr[2] "sve je već instalirano"
+msgstr "sve je već instalirano"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "sve je već instalirano"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2287,14 +2311,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"upotreba: urpmi.addmedia [opcije] <ime> <url> [with <relativni_put>]\n"
+"upotreba: urpmi.addmedia [opcije] <ime> <url>\n"
"gdje je <url> jedan od\n"
-" [file:/]/<put> with <relativnim nazivom datoteke hdlist>\n"
-" ftp://<korisniÄko_ime>:<Å¡ifra>@<host>/<put> with <relativnim nazivom "
-"datoteke hdlist>\n"
-" ftp://<host>/<put> with <relativnim nazivom datoteke hdlist>\n"
-" http://<host>/<put> with <relativnim nazivom datoteke hdlist>\n"
-" removable://<put> with <relativnim nazivom datoteke hdlist>\n"
+" [file:/]/<put>\n"
+" ftp://<korisniÄko_ime>:<Å¡ifra>@<host>/<put>\n"
+" ftp://<host>/<put>\n"
+" http://<host>/<put>\n"
+" removable://<put>\n"
"\n"
"a [opcije] su\n"
@@ -2377,17 +2400,17 @@ msgstr " --nopubkey - nemoj uvoziti pubkey dodanog medija\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - dodaj medij u konfiguraciju, ali bez ažuriranja.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - oÄisti direktorij sa spremnikom zaglavlja.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tihi mod.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - rjeÄiti mod.\n"
@@ -2525,9 +2548,12 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "ÄŒistim direktorij za prepakiranje [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "Uklonjeno %d datoteka\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "Uklonjeno %d datoteka\n"
+msgstr[1] "Uklonjeno %d datoteka\n"
+msgstr[2] "Uklonjeno %d datoteka\n"
#: ../urpmi.recover:82
#, c-format
@@ -2585,12 +2611,12 @@ msgid "Disabling repackaging\n"
msgstr "IskljuÄujem prepakiranje\n"
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"upotreba: urpmi.removemedia [-a] <ime> ...\n"
+"upotreba: urpmi.removemedia (-a | <ime> ...)\n"
"gdje je <ime> naziv medija za uklanjanje.\n"
#: ../urpmi.removemedia:41
@@ -2652,26 +2678,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - ne ažuriraj, oznaÄi medij kao ukljuÄen.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - ne pokušavaj pronaći synthesis ili\n"
+" hdlist datoteku.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - izaberi ne-izmjenjive medije.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - prisili pravljenje hdlist datoteka.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Samo administrator (superkorisnik) može ažurirati medije"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ništa za update (koristite urpmi.addmedia da dodate medij)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2680,17 +2714,17 @@ msgstr ""
"stavka za update nedostaje\n"
"(jedan od %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "ignorišem medij %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "ukljuÄujem medij %s"
@@ -2795,67 +2829,70 @@ msgstr " --changelog - ispiši dnevnik izmjena.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - ispiši sažetak.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - obrnuta pretraga za ono Å¡to zahtijeva paket.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - proÅ¡irena obrnuta pretraga (ukljuÄuje virtuelne "
+"pakete).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - ukljuÄi pretragu 'provides' taga radi nalaženja.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompletan izlaz sa paketom za uklanjanje.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - proširi upit na ovisnosti paketa.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - ispiši grupe sa imenom.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - ispiÅ¡i korisne informacije u Äitljivom obliku.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista datoteka u paketu.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - ne pretražuj 'provides' pri traženju paketa (default).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - ukljuÄi pretragu 'provides' taga radi nalaženja.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - tihi mod.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - ispiši verziju i izdanje sa imenom.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - obrnuta pretraga za ono Å¡to zahtijeva paket.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - proÅ¡irena obrnuta pretraga (ukljuÄuje virtuelne pakete).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sljedeći paket je source paket (isto što i --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2863,54 +2900,83 @@ msgid ""
msgstr ""
" -u - ukloni paket ako je već instalirana novija verzija.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - nametni fuzzy pretragu (isto Å¡to i --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - kao -y, ali pretraga ne razlikuje mala i velika slova.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ili rpm datoteke dati na komandnoj liniji će biti ispitani.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes se može koristiti samo sa --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
+"mogao vratiti rezultate\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nije nađena lista datoteka\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Napomena: pošto nijedan od pretraženih medija ne koristi hdliste, urpmf nije "
+"mogao vratiti rezultate\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nije pronađen changelog\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Nije nađena lista datoteka\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr "Da bih zadovoljio ovisnosti, ukloniću sljedećih %d paketa (%d MB)"
+
+#, fuzzy
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Da nastavim sa instalacijom %d paketa? (%d MB)"
+#~ msgstr[1] "Da nastavim sa instalacijom %d paketa? (%d MB)"
+#~ msgstr[2] "Da nastavim sa instalacijom %d paketa? (%d MB)"
+
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d paketa, %d MB)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - ne pretražuj 'provides' pri traženju paketa "
+#~ "(default).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - obrnuta pretraga za ono Å¡to zahtijeva paket.\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/ca.po b/po/ca.po
index ce5a6389..dc292510 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ca\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-09-19 23:29+0200\n"
"Last-Translator: Albert Astals Cid <astals11@terra.es>\n"
"Language-Team: Catalan <kde-i18n-ca@kde.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=n!=1;\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "Instal·lació de RPM"
@@ -30,7 +30,7 @@ msgstr "Instal·lació de RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_D'acord"
@@ -98,7 +98,7 @@ msgstr "_Instal·lació"
msgid "_Save"
msgstr "_Desa"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Cancel·la"
@@ -108,28 +108,28 @@ msgstr "_Cancel·la"
msgid "Choose location to save file"
msgstr "Escolliu la ubicació un desar el fitxer"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Opcions desconegudes %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "No s'ha especificat cap paquet"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Si us plau, espereu..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "S'ha de ser root"
-#: ../gurpmi2:87
-#, fuzzy, c-format
+#: ../gurpmi2:88
+#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s\n"
@@ -137,45 +137,45 @@ msgid ""
msgstr ""
"Alguns dels paquets demanats no s'ha pogut instal·lar:\n"
"%s\n"
-"Voleu continuar?"
+"Voleu continuar igualment?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Advertència"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "D'acord"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (a actualitzar)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (a instal·lar)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Cal un dels paquets següents:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Avorta"
-#: ../gurpmi2:196
-#, fuzzy, c-format
+#: ../gurpmi2:197
+#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
@@ -183,45 +183,48 @@ msgid ""
msgstr ""
"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
"%s\n"
-"Voleu continuar?"
+"Voleu continuar igualment?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Per complir les dependències, s'instal·lara el següent paquet:"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Per complir les dependències, s'instal·laran el següent paquet (%d MB)"
-msgstr[1] ""
-"Per complir les dependències, s'instal·laran el següent paquet (%d MB)"
+msgstr "Per complir les dependències, s'instal·laran els paquets següents:"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d paquet, %d MB)"
+msgstr[1] "(%d paquets, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Instal·lació de paquets..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no es poden recuperar els paquets font. S'està interrompent"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Si us plau, inseriu la font anomenada \"%s\" al dispositiu [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "S'està descarregant el paquet `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -234,7 +237,7 @@ msgstr ""
"\n"
"Voleu continuar amb la instal·lació?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,37 +249,37 @@ msgstr ""
"%s\n"
"Potser voleu actualitzar la base de dades urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "s'està eliminant %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "S'està preparant..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Fet"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "La instal·lació ha fallat"
+msgid "Installation failed:"
+msgstr "La instal·lació ha fallat:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Ja està tot instal·lat"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instal·lació finalitzada"
@@ -325,63 +328,63 @@ msgstr "El superusuari és l'únic autoritzat per a instal·lar paquets"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "no s'ha pogut obrir rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "el nom del fitxer rpm és incorrecte [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "s'està recuperant els fitxer rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...recuperació feta"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ha fallat la recuperació: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no s'ha pogut accedir al fitxer rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no es pot analitzar \"%s\" en el fitxer [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "no s'ha pogut registrar el fitxer rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "error registrant els paquets locals"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -401,27 +404,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Necessiteu ser el superusuari per usar aquesta ordre! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no s'ha pogut llegir el fitxer rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
@@ -446,7 +449,7 @@ msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
@@ -455,16 +458,17 @@ msgstr "no s'ha pogut escriure el fitxer de configuració [%s]"
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
msgstr ""
+"Si us plau, entreu les vostres dades per accedir al servidor intermediari\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Nom d'usuari:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Contrasenya:"
#: ../urpm/download.pm:185
#, c-format
@@ -482,9 +486,9 @@ msgid "%s failed: exited with %d"
msgstr ""
#: ../urpm/download.pm:219
-#, fuzzy, c-format
+#, c-format
msgid "copy failed"
-msgstr "La còpia ha fallat"
+msgstr "la còpia ha fallat"
#: ../urpm/download.pm:225
#, fuzzy, c-format
@@ -578,7 +582,7 @@ msgstr "hi ha múltiples paquets amb el mateix nom de fitxer rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "no s'ha pogut analitzar correctament [%s] en el valor \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "no es pot accedir al fitxer list de \"%s\", s'ignora la font"
@@ -692,9 +696,9 @@ msgid "No base defined"
msgstr "No s'ha especificat cap paquet"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "No s'ha pogut connectar al servidor"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -716,7 +720,7 @@ msgstr "atenció: l'md5sum de %s no està disponible al fitxer MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "s'està computant el md5sum de la font hdlist (o síntesi) existent"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -725,249 +729,249 @@ msgstr ""
"la font virtual \"%s\" no hauria de tenir definit cap hdlist ni fitxer list, "
"font ignorada"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "la font virtual \"%s\" ha de tenir una url neta, font ignorada"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "el nom del fitxer rpm és incorrecte [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "no es pot trobar el fitxer list per a \"%s\", s'ha ignorat la font"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "s'ha construït el fitxer de síntesi hdlist per a la font \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no es pot accedir al fitxer hdlist de \"%s\", font ignorada"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "la font \"%s\" ha provat d'utilitzar un hdlist en ús, font ignorada"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"la font \"%s\" ha provat d'utilitzar un fitxer list en ús, font ignorada"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "provant de passar per alt la font existent \"%s\", evitant"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "massa punts de muntatge per la font extraïble \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "agafant dispositiu extraïble com a \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "La font \"%s\" és una imatge ISO, es muntarà al vol"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "utilitzant un dispositiu extraïble diferent [%s] per \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "no s'ha pogut determinar el camí i el nom de la font extraïble \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "escriure fitxer de configuració [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "No es pot usar el mode paral·lel amb el mode use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "s'està utilitzant la font associada al mode paral·lel : %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--synthesis no es pot usar amb --media, --excludemedia, --sortmedia, --"
-"update ni --parallel"
+"update, --use-distrib ni --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "s'està fent segona passada per a computar dependències\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "s'està saltant el paquet %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "instal·laria en comptes d'actualitzar el paquet %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "la font \"%s\" ja existeix"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "La font virtual ha de ser local"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "s'estan llegint les capçaleres de la font \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "s'està esborrant la font \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "no s'ha pogut accedir a la primera font d'instal·lació"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "s'està recuperant el fitxer hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "no s'ha pogut obrir rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"no s'ha pogut accedir la primera font d'instal·lació (no s'ha trobat fitxer "
"hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "s'ha intentant seleccionar una font inexistent \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "s'està seleccionant múltiples fonts: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "s'està esborrant la font \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "s'està reconfigurant l'urpmi per la font \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "..la reconfiguració ha fallat"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguració acabada"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "la font \"%s\" no ha estat seleccionada"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "s'està examinant el fitxer hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "s'està examinant el fitxer de síntesi [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "s'està construint l'hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -976,79 +980,79 @@ msgstr ""
"No s'ha pogut construir el fitxer de síntesi per la font \"%s\". El vostre "
"fitxer hdlist pot estar corrupte."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"s'ha trobat un problema llegint el fitxer hdlist o de síntesi de la font \"%s"
"\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "..la còpia ha fallat"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "s'està copiant el fitxer de descripció de \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...còpia feta"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "s'està escrivint el fitxer list per la font \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "la còpia de [%s] ha fallat (el fitxer és sospitosament petit)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "s'està computant el md5sum de la font hdlist (o síntesi)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "la còpia de [%s] ha fallat (el md5sum no concorda)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "s'està computant el md5sum de la font hdlist (o síntesi) recuperada"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ha fallat la recuperació: el md5sum no concorda"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "no s'han trobat fitxers rpm des de [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "s'està llegint els fitxers rpm des de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no s'ha pogut llegir els fitxers rpm des de [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "no s'ha llegit cap rpm"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1058,78 +1062,78 @@ msgstr ""
"no s'ha pogut accedir a la font \"%s\",\n"
"pot passar si havies muntat manualment el directori al crear la font."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "s'està recuperant el hdlist font (o la síntesi) de \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "s'ha trobat l'hdlist (o síntesi) buscat a %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "no s'ha trobat el fitxer hdlist per a la font \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "s'està examinant el fitxer de clau pública de \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...s'ha importat la clau %s del fitxer de clau pública de \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no s'ha pogut importat el fitxer de clau pública de \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "s'està escrivint el fitxer list per la font \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "s'ha afegit la font %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no es pot analitzar el fitxer hdlist de \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "s'ha trobat un problema llegint el fitxer de síntesi de la font \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "s'estan llegint les capçaleres de la font \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Elecció incorrecta, torneu-ho a provar\n"
@@ -1165,8 +1169,8 @@ msgid "unmounting %s"
msgstr "s'està desmuntant %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "la font \"%s\" no ha estat seleccionada"
#: ../urpm/removable.pm:143
@@ -1185,47 +1189,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "no s'ha pogut accedir a al font \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "No hi cap paquet anomenat %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Els paquets següents contenen %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "degut a que falten %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "degut a %s no satisfetes"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Res a eliminar"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "per tal de mantenir %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "per tal d'instal·lar %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "degut a conflictes amb %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "no demanat"
@@ -1246,7 +1250,7 @@ msgid "Missing signature (%s)"
msgstr "Falta la signatura (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1256,7 +1260,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpme versió %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
"GNU.\n"
"\n"
@@ -1321,19 +1325,19 @@ msgid ""
msgstr ""
#: ../urpme:55 ../urpmi:119 ../urpmq:74
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr " --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
+msgstr " --probe-synthesis - usa el fitxer de síntesi.\n"
#: ../urpme:56 ../urpmi:120 ../urpmq:75
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr " --probe-hdlist - intenta trobar un fitxer hdlist.\n"
+msgstr " --probe-hdlist - usa el fitxer hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " -verbose - mode detallat.\n"
+msgstr " --verbose, -v - mode detallat.\n"
#: ../urpme:58
#, c-format
@@ -1372,30 +1376,39 @@ msgstr "Res a eliminar"
msgid "Checking to remove the following packages"
msgstr ""
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"Per a complir les dependències, s'eliminaran els següents %d paquets (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Per a complir les dependències, s'eliminara el següent paquet"
+msgstr[1] ""
+"Per a complir les dependències, s'eliminaran els següents %d paquets"
-#: ../urpme:134
-#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "s'està eliminant el paquet %s"
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Elimina %d paquet?"
+msgstr[1] "Elimina %d paquets?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "L'eliminació ha fallat"
#: ../urpmf:29
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
@@ -1405,16 +1418,16 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf versió %s\n"
-"Copyright (C) 2002-2004 Mandriva.\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
"GNU.\n"
"\n"
-"sintaxi:\n"
+"sintaxi: urpmf [opcions] patró-expressió\n"
#: ../urpmf:36
-#, fuzzy, c-format
+#, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - mostra aquest missatge d'ajuda.\n"
+msgstr " --help - mostra la informació de la versió.\n"
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1518,16 +1531,15 @@ msgid " ! - unary NOT.\n"
msgstr " ! - NOT unari.\n"
#: ../urpmf:56
-#, fuzzy, c-format
+#, c-format
msgid " ( ) - left and right parentheses.\n"
-msgstr " ) - parentesi dret per tancar expressions de grup.\n"
+msgstr ""
+" ( ) - parentesis esquerre i dret per expressions de grup.\n"
#: ../urpmf:57
-#, fuzzy, c-format
+#, c-format
msgid "List of tags:\n"
-msgstr ""
-"Llista de dades per restaurar:\n"
-"\n"
+msgstr "Llista de etiquetes:\n"
#: ../urpmf:58
#, fuzzy, c-format
@@ -1535,9 +1547,9 @@ msgid " --qf - specify a printf-like output format\n"
msgstr " --X - utilitza l'interfície X.\n"
#: ../urpmf:59
-#, fuzzy, c-format
+#, c-format
msgid " example: '%%name:%%files'\n"
-msgstr " el valor per defecte és %s.\n"
+msgstr " exemple: '%%name:%%files'\n"
#: ../urpmf:60
#, fuzzy, c-format
@@ -1545,10 +1557,9 @@ msgid " --arch - architecture\n"
msgstr " --url - mostra l'etiqueta url: url.\n"
#: ../urpmf:61
-#, fuzzy, c-format
+#, c-format
msgid " --buildhost - build host\n"
-msgstr ""
-" --buildhost - mostra l'etiqueta buildhost: màquina de construcció.\n"
+msgstr " --buildhost - màquina de construcció.\n"
#: ../urpmf:62
#, c-format
@@ -1561,15 +1572,15 @@ msgid " --conffiles - configuration files\n"
msgstr "Mòdul de configuració de la consola"
#: ../urpmf:64
-#, fuzzy, c-format
+#, c-format
msgid " --conflicts - conflict tags\n"
msgstr ""
" --conflicts - mostra l'etiqueta conflicts: tots els conflictes.\n"
#: ../urpmf:65
-#, fuzzy, c-format
+#, c-format
msgid " --description - package description\n"
-msgstr " --description - mostra l'etiqueta description: descripció.\n"
+msgstr " --description - mostra la descripció.\n"
#: ../urpmf:66
#, c-format
@@ -1577,7 +1588,7 @@ msgid " --distribution - distribution\n"
msgstr ""
#: ../urpmf:67
-#, fuzzy, c-format
+#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - mostra l'etiqueta epoch: època.\n"
@@ -1587,14 +1598,14 @@ msgid " --filename - filename of the package\n"
msgstr " --name - imprimeix només els noms dels paquets.\n"
#: ../urpmf:69
-#, fuzzy, c-format
+#, c-format
msgid " --files - list of files contained in the package\n"
-msgstr " -l - llista els fitxers del paquet.\n"
+msgstr " --files - llista els fitxers del paquet.\n"
#: ../urpmf:70
-#, fuzzy, c-format
+#, c-format
msgid " --group - group\n"
-msgstr " --group - mostra l'etiqueta group: grup.\n"
+msgstr " --group - mostra el grup del paquet.\n"
#: ../urpmf:71
#, fuzzy, c-format
@@ -1602,25 +1613,25 @@ msgid " --name - package name\n"
msgstr " --name - imprimeix només els noms dels paquets.\n"
#: ../urpmf:72
-#, fuzzy, c-format
+#, c-format
msgid " --obsoletes - obsoletes tags\n"
msgstr ""
" --obsoletes - mostra l'etiqueta obsoletes: tots els paquets que deixa "
"obsolets.\n"
#: ../urpmf:73
-#, fuzzy, c-format
+#, c-format
msgid " --packager - packager\n"
-msgstr " --packager - mostra l'etiqueta packager: empaquetador.\n"
+msgstr " --packager - empaquetador.\n"
#: ../urpmf:74
-#, fuzzy, c-format
+#, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - mostra l'etiqueta provides: tots allò que proporciona.\n"
#: ../urpmf:75
-#, fuzzy, c-format
+#, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - mostra l'etiqueta requires: tots allò que necessita.\n"
@@ -1636,9 +1647,9 @@ msgid " --sourcerpm - source rpm name\n"
msgstr " --sourcerpm - mostra l'etiqueta sourcerpm: rpm de codi font.\n"
#: ../urpmf:78
-#, fuzzy, c-format
+#, c-format
msgid " --summary - summary\n"
-msgstr " --summary, -S - imprimeix el resum.\n"
+msgstr " --summary - imprimeix el resum.\n"
#: ../urpmf:79
#, fuzzy, c-format
@@ -1655,7 +1666,7 @@ msgstr " -verbose - mode detallat.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - llista els fitxers del paquet.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1666,25 +1677,25 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1694,19 +1705,19 @@ msgid ""
"usage:\n"
msgstr ""
"urpmi versió %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
"GNU.\n"
"\n"
"sintaxi:\n"
#: ../urpmi:88
-#, fuzzy, c-format
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-" --searchmedia - utilitza només les fonts donades per cercar (o "
-"actualitzar) paquets.\n"
+" --searchmedia - utilitza només les fonts donades per cercar "
+"paquets.\n"
#: ../urpmi:91
#, c-format
@@ -1731,14 +1742,14 @@ msgstr ""
"sistema.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - deshabilita la comprovació MD5SUM.\n"
+msgstr " --no-md5sum - deshabilita la comprovació MD5SUM.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - força l'actualització de la clau gpg.\n"
+msgstr " --force-key - força l'actualització de la clau gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1779,15 +1790,14 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --fuzzy - utilitza cerca difusa (igual que -y).\n"
+msgstr " --fuzzy, -y - utilitza cerca difusa.\n"
#: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
msgid " --src, -s - next package is a source package.\n"
-msgstr ""
-" --src - el paquet següent és un paquet font (igual que -s).\n"
+msgstr " --src,- s - el paquet següent és un paquet font.\n"
#: ../urpmi:106
#, c-format
@@ -1847,12 +1857,12 @@ msgstr " --wget - usa wget per a recuperar fitxers llunyans.\n"
#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:77
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
-msgstr " --curl - use curl per a recuperar fitxers llunyans.\n"
+msgstr " --curl - usa curl per a recuperar fitxers llunyans.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --curl - use curl per a recuperar fitxers llunyans.\n"
+msgstr " --prozilla - usa prozilla per a recuperar fitxers llunyans.\n"
#: ../urpmi:124
#, c-format
@@ -1917,14 +1927,14 @@ msgstr ""
" que s'indica en l'argument següent.\n"
#: ../urpmi:138
-#, fuzzy, c-format
+#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
" --verify-rpm - verifica la signatura rpm abans de la instal·lació\n"
" (--no-verify-rpm la deshabilita, per defecte està "
-"habilitat).\n"
+"habilitat)\n"
#: ../urpmi:140
#, fuzzy, c-format
@@ -1983,7 +1993,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2002,9 +2012,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - no busquis en 'provides' per a trobar paquets.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - mode silenciós.\n"
+msgstr " --quiet, -q - mode silenciós.\n"
#: ../urpmi:157
#, c-format
@@ -2056,59 +2066,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr " (a actualitzar)"
+msgstr "%s: %s (a actualitzar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr " (a actualitzar)"
+msgstr "%s (a actualitzar)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr " (a instal·lar)"
+msgstr "%s: %s (a instal·lar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr " (a instal·lar)"
+msgstr "%s (a instal·lar)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Quina és la vostra elecció? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Voleu continuar igualment?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
@@ -2118,56 +2131,65 @@ msgstr " (S/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Alguns dels paquets demanats no es poden instal·lar:\n"
"%s"
-#: ../urpmi:534
-#, fuzzy, c-format
+#: ../urpmi:535
+#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"La instal·lació no pot continuar ja que el següent paquet\n"
+"s'ha d'eliminar per poder actualitzar uns altres:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"La instal·lació no pot continuar ja que els següents paquets\n"
-"s'han d'eliminar per poder actualitzar uns altres:\n"
-"%s\n"
-msgstr[1] ""
+msgstr ""
"La instal·lació no pot continuar ja que els següents paquets\n"
"s'han d'eliminar per poder actualitzar uns altres:\n"
"%s\n"
-#: ../urpmi:541
-#, fuzzy, c-format
+#: ../urpmi:544
+#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
+msgstr ""
+"El paquets següent s'ha d'eliminar per poder actualitzar uns altres:\n"
"%s"
-msgstr[0] ""
-"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[1] ""
+msgstr ""
"Els paquets següents s'han d'eliminar per poder actualitzar uns altres:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2176,107 +2198,118 @@ msgstr ""
"Es necessita ser 'root' per a instal·lar les següents dependències:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
-#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] ""
-msgstr[1] ""
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "No s'han pogut instal·lar els paquets (%s)!"
+msgstr[1] "No s'han pogut instal·lar els paquets (%s)!"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Premeu Intro quan estigui fet..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Cancel·la"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Els paquets següents tenen signatures incorrectes"
-msgstr[1] "Els paquets següents tenen signatures incorrectes"
+msgstr "Els paquets següents tenen signatures incorrectes"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Els paquets següents tenen signatures incorrectes"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voleu continuar la instal·lació ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "La instal·lació ha fallat"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "s'està distribuint %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "s'està instal·lant %s des de %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "s'està instal·lant %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "La instal·lació ha fallat"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
"Voleu intentar la instal·lació sense comprovar les dependències? (s/N) "
-#: ../urpmi:780
-#, fuzzy, c-format
+#: ../urpmi:776
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Voleu intentar la insta·lació encara amb més força (--force)? (s/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "han fallat %d transaccions d'instal·lació"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "ha fallat %d transacció d'instal·lació"
+msgstr[1] "han fallat %d transaccions d'instal·lació"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "La instal·lació és possible"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Ja està tot instal·lat"
-msgstr[1] "Ja està tot instal·lat"
+msgstr "Ja està tot instal·lat"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Ja està tot instal·lat"
-msgstr[1] "Ja està tot instal·lat"
+msgstr "Ja està tot instal·lat"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Ja està tot instal·lat"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "s'esta reiniciant urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2288,14 +2321,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"sintaxi: urpmi.addmedia [opcions] <nom> <url> [with <camí_relatiu>]\n"
+"sintaxi: urpmi.addmedia [opcions] <nom> <url>\n"
"on <url> és un dels següents:\n"
-" [file:/]/<camí> with <cami relatiu del fitxer hdlist>\n"
-" ftp://<usuari>:<contrasenya>@<ordinador>/<camí> with <nom relatiu del "
-"fitxer hdlist>\n"
-" ftp://<ordinador>/<camí> with <nom relatiu del fitxer hdlist>\n"
-" http://<ordinador>/<camí> with <nom relatiu del fitxer hdlist>\n"
-" removable://<camí> with <nom relatiu del fitxer hdlist>\n"
+" [file:/]/<camí>\n"
+" ftp://<usuari>:<contrasenya>@<ordinador>/<camí>\n"
+" ftp://<ordinador>/<camí>\n"
+" http://<ordinador>/<camí>\n"
+" removable://<camí>\n"
"\n"
"i [opcions] són\n"
@@ -2305,14 +2337,14 @@ msgid " --update - create an update medium.\n"
msgstr " --update - crea una font d'actualització.\n"
#: ../urpmi.addmedia:55
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr " --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
+msgstr " --probe-synthesis - usa el fitxer de síntesi.\n"
#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr " --probe-hdlist - intenta trobar un fitxer hdlist.\n"
+msgstr " --probe-hdlist - usa el fitxer hdlist.\n"
#: ../urpmi.addmedia:57
#, c-format
@@ -2320,11 +2352,9 @@ msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
msgstr ""
#: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
-msgstr ""
-" --no-probe - no intenta buscar cap síntesi o\n"
-" fitxer hdlist.\n"
+msgstr " --no-probe - no intenta buscar cap fitxer síntesi o hdlist.\n"
#: ../urpmi.addmedia:61
#, c-format
@@ -2376,17 +2406,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - buida el directori de memòria cau de capçaleres.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mode silenciós.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - mode detallat.\n"
@@ -2444,7 +2474,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "no es pot crear la font \"%s\"\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2453,8 +2483,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpme versió %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"urpmi.recover versió %s\n"
+"Copyright (C) 2006 Mandriva.\n"
"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
"GNU.\n"
"\n"
@@ -2521,8 +2551,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2580,12 +2612,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"sintaxi: urpmi.removemedia [-a] <nom> ...\n"
+"sintaxi: urpmi.removemedia (-a | <nom> ...)\n"
"on <nom> és el nom de la font a eliminar.\n"
#: ../urpmi.removemedia:41
@@ -2648,27 +2680,36 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - no intenta buscar cap síntesi o\n"
+" fitxer hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - selecciona tots les fonts no extraïbles.\n"
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, c-format
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -f - imposa la generació de fitxers hdlist.\n"
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr ""
+" -f - força l'actualització dels fitxers synthesis/hdlist\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "El superusuari és l'únic autoritzat per a actualitzar fonts"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"no hi ha res per actualitzar (utilitzeu urpmi.addmedia per afegir una font)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2677,23 +2718,23 @@ msgstr ""
"falta l'entrada per actualitzar\n"
"(una de %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "s'està ignorant la font %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "s'està habilitant la font %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2703,7 +2744,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq versió %s\n"
-"Copyright (C) 2000-2005 Mandriva.\n"
+"Copyright (C) 2000-2006 Mandriva.\n"
"Aquest programa és lliure i es pot redistribuir sota els termes de la GPL de "
"GNU.\n"
"\n"
@@ -2791,69 +2832,71 @@ msgstr " --changelog - mostra els canvis.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprimeix el resum.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - cerca inversa a que necessita el paquet.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - cerca inversa a que necessita el paquet.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - busca en 'provides' per a trobar paquets.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - amplia la cerca a les dependències dels paquets.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - imprimeix grups amb el nom.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - mostra informació útil en un forma llegible pels humans.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - llista els fitxers del paquet.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - no busquis en 'provides' per a trobar paquets (per "
-"defecte).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - busca en 'provides' per a trobar paquets.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - mode silenciós.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - mostra la versió i llançament juntament amb el nom.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - cerca inversa a que necessita el paquet.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - cerca inversa a que necessita el paquet.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - el següent paquet és un paquet font (igual que --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2862,61 +2905,70 @@ msgstr ""
" -u - elimina el paquet si hi ha instal·lada una versió més "
"nova.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - força una cerca difusa (igual que --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" noms o fitxers rpm subministrats en la línia d'ordres seran demanats.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes només es pot usar amb --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "No s'ha trobat la llista de fitxers\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "No s'ha trobat la llista de canvis\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "No s'ha trobat la llista de fitxers\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Per a complir les dependències, s'eliminaran els següents %d paquets (%d "
+#~ "MB)"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Per complir les dependències, s'instal·laran el següent paquet (%d MB)"
-#~ msgstr[1] ""
-#~ "Per complir les dependències, s'instal·laran el següent paquet (%d MB)"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - no busquis en 'provides' per a trobar paquets (per "
+#~ "defecte).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - cerca inversa a que necessita el paquet.\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2926,42 +2978,6 @@ msgstr "No s'ha trobat la llista de canvis\n"
#~ "Per complir les dependències, s'instal·laran els %d paquets següents:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Per complir les dependències, s'instal·laran els %d paquets següents:\n"
-#~ "%s\n"
-#~ msgstr[1] ""
-#~ "Per complir les dependències, s'instal·laran els %d paquets següents:\n"
-#~ "%s\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "La instal·lació ha fallat"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "S'està instal·lant el paquet `%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "s'està examinant el fitxer de síntesi [%s]"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "s'està distribuint %s"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Instal·lació de paquets..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Instal·lació de paquets..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - intenta trobar un fitxer de síntesi.\n"
@@ -3023,10 +3039,6 @@ msgstr "No s'ha trobat la llista de canvis\n"
#~ msgid "using process %d for executing transaction"
#~ msgstr "s'està usant el procés %d per executar la transacció"
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Els paquets següents contenen %s: %s"
-
#~ msgid "copying hdlists file..."
#~ msgstr "s'està copiant el fitxer hdlists..."
@@ -3206,15 +3218,6 @@ msgstr "No s'ha trobat la llista de canvis\n"
#~ "Alguns dels paquets demanats no es poden instal·lar:\n"
#~ "%s"
-#, fuzzy
-#~ msgid ""
-#~ " --keep - keep existing packages if possible, reject requested\n"
-#~ " packages that leads to remove.\n"
-#~ msgstr ""
-#~ " --keep - manté els paquets existents si és possible, rebutja "
-#~ "els paquets demanats\n"
-#~ " que porten a la eliminació d'altres paquets.\n"
-
#~ msgid "unable to write file [%s]"
#~ msgstr "no s'ha pogut escriure el fitxer [%s]"
diff --git a/po/cy.po b/po/cy.po
index 8ff304ab..a6d90b91 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Mandriva Linux\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-23 19:44+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-03-02 20:33-0000\n"
"Last-Translator: Rhoslyn Prys <post@meddal.com>\n"
"Language-Team: Cymraeg\n"
@@ -106,12 +106,12 @@ msgstr "_Dileu"
msgid "Choose location to save file"
msgstr "Dewiswch leoliad i gadw'r ffeil"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Dewis anhysbys %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Heb enwi pecyn"
@@ -142,7 +142,7 @@ msgstr ""
msgid "Warning"
msgstr "Rhybudd"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Iawn"
@@ -235,7 +235,7 @@ msgstr ""
"\n"
"Hoffech chi barhau gyda'r gosod?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,7 +246,7 @@ msgstr ""
"%s\n"
"Hoffech chi ddiweddaru eich cronfa ddata urpmi?"
-#: ../gurpmi2:292 ../urpme:141 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "tynnu %s"
@@ -266,10 +266,10 @@ msgstr "Gosod pecyn `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Gorffen"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Methodd y gosod"
+msgid "Installation failed:"
+msgstr "Methodd y gosod:"
#: ../gurpmi2:344
#, c-format
@@ -325,63 +325,63 @@ msgstr "Dim ond uwch ddefnyddiwr sy'n cael gosod pecynnau"
msgid "Running urpmi in restricted mode..."
msgstr "Rhedeg urpmi mewn modd cyfyngedig..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "methu agor rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "wedi canfod %d pennawd rpm yn yr ystorfa, tynnu %d hen bennawd"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "enw ffeil rpm annilys [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "adfer ffeil rpm (%s)..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr ".cwblhau adfer"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "... methodd ail-lwytho: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "methu cael mynediad ffeil rpm (%s)"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "methu didoli ffeil spec %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "methu cofrestr ffeil rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Saernïaeth anghydnaws ar gyfer rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "gwall cofrestru pecynnau lleol"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Mae'r weithred yn waharddedig wrth redeg ym modd cyfyngedig"
@@ -421,7 +421,7 @@ msgstr "Methu defnyddio %s gyda %s"
msgid "Too many arguments\n"
msgstr "Gormod o ymresymiadau\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "adeiladu ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
@@ -446,7 +446,7 @@ msgstr "Methu creu ffeil config (%s)"
msgid "medium `%s' is defined twice, aborting"
msgstr "mae cyfrwng '%s' wedi ei ddiffinio ddwy waith, cau"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "methu ysgrifennu i ffeil ffurfweddiad (%s)"
@@ -576,7 +576,7 @@ msgstr "mae yna becynnau niferus gyda'r un enw ffeil rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "methu didoli (%s) yn gywir ar werth \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "methu cael mynediad ffeil rhestr \"%s\", anwybyddu'r cyfrwng"
@@ -712,7 +712,7 @@ msgstr "rhybudd: nid yw md5sum ar gyfer %s ar gael yn ffeil MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "cyfrifo md5sum ffynhonnell presennol hdlist (neu synthesis) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -721,105 +721,105 @@ msgstr ""
"dylai cyfrwng rhithiol \"%s\" fod a rhestr ffeiliau hdlist, anwybyddwyd y "
"cyfrwng"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "dylai cyfrwng rhithiol \"%s\" gael url clir, anwybyddu'r cyfrwng"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "enw hdlist annilys"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "methu canfod rhestr ffeil \"%s\", cyfrwng wedi ei anwybyddu"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "nid ddylai \"synthesis\" gael ei osod (canolig \"%s\")"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" i'w osod (canolig \"%s\")"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "methu cael mynediad i ffeil hdlist\"%s\", anwybyddu'r cyfrwng"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "methu cael mynediad ffeil rhestr \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"cyfrwng \"%s\" yn ceisio defnyddio rhestr mewn defnydd, anwybyddu'r cyfrwng"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "ceisio osgoi'r cyfrwng presennol \"%s\", hepgor"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "gormod o bwyntiau gosod ar gyfer cyfrwng symudol \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "cymryd dyfais symudol fel \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
"Delwedd ISO yw cyfrwng \"%s\" , a fydd yn cael ei osod wrth ei ddefnyddio."
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "defnyddio dyfais symudol gwahanol (%s) ar gyfer \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "methu adfer enw llwybr ar gyfer cyfrwng symudadwy \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "ysgrifennodd %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "ysgrifennu ffeil ffurfweddu (%s)"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Methu defnyddio'r modd paralel gyda'r modd use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "defnyddio cyfrwng cysylltiedig ar gyfer modd paralel: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -828,145 +828,145 @@ msgstr ""
"--nid oes modd defnyddio synthesis gyda --media, --excludemedia, --"
"sortmedia, --diweddaru, --use-distrib or --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Sylw: dim hdlist ar gyfer cyfrwng \"%s\", methu dychwelyd canlyniadau ar ei "
"gyfer"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Cychwyn chwilio: %s diwedd: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "cyflawni ail ymgais i gyfrifo dibyniaethau\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "hepgor pecyn %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "gosod yn lle uwchraddio pecyn %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "cyfrwng \"%s\" yn bodoli eisoes"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "rhaid i'r rhith gyfrwng fod yn lleol"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(anwybyddwyd drwy ragosodiad)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ychwanegu cyfrwng \"%s\", cyn cyfrwng pell \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "ychwanegu cyfrwng \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "methu mowntio cyfrwng y dosbarthiad"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "nid yw'r lleoliad i weld yn cynnwys unrhyw ddosbarthiad"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "estyn ffeil media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "methu didoli media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"methu cael mynediad at gyfrwng y dosbarthiad (heb ganfod ffeil media.cfg)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ceisio dewis y cyfrwng nad yw'n bod \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "dewis aml-gyfrwng: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "dewis cyfrwng \"%s\":"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "ail-ffurfweddu urpmi ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...methodd ail-ffurfweddu"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "cwblhau ail-ffurfweddu"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Gwall wrth gynhyrchu ffeil enwau: heb ganfod dibyniaeth %d"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Gwall wrth gynhyrchu ffeil enwau: Methu ysgrifennu ffeil (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "archwilio ffeil hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "archwilio ffeil synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "adeiladu hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,77 +975,77 @@ msgstr ""
"Methu adeiladu ffeil synthesis ar gyfer cyfrwng \"%s\". Efallai bod eich "
"ffeil hdlist yn llygredig."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem darllen hdlist neu ffeil synthesis y cyfrwng \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...methodd y copïo"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copïo ffeil disgrifiad o \"%s\""
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...cwblhau'r copïo"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copïo [%s] ar gyfer cyfrwng \"%s\"..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "methodd copïo (%s) (Mae'r ffeil yn rhy fach)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist gopïwyd (neu synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "methodd copïo (%s) (md5sum gwallus)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "cyfrifo md5sum o ffynhonnell hdlist adferwyd (neu synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... methodd ail-lwytho: anghysondeb md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "heb ganfod ffeiliau rpm o [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "darllen ffeiliau rpm o [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "methu darllen ffeiliau rpm o (%s): %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "heb ddarllen rpmau"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1055,67 +1055,67 @@ msgstr ""
"maethu cael mynediad i gyfrwng \"%s\",\n"
"gall hyn ddigwydd os ydych wedi gosod y cyfeiriadur wrth greu'r cyfrwng."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ffeil hdlist annilys %s ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "adfer ffynhonnell hdlist (neu synthesis) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "canfod hdlist (neu synthesis) holwyd fel %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "dim ffeil hdlist synthesis file ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "archwilio ffeil pubkey \"%s\""
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...allwedd %s wedi ei fewnforio o ffeil pubkey \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "methu mewnforio ffeil pubkey \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "ysgrifennu rhestr ffeil ar gyfer cyfrwng \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "cyfrwng \"%s\" wedi ei ddiweddaru"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "methu didoli ffeil hdlist \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "anhawster darllen synthesis ffeil cyfrwng \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "darllen pennawd o'r cyfrwng \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
@@ -1124,13 +1124,13 @@ msgstr "Nn"
# you can put here the letters for 'yes' for your language, so people
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Dewis gwael, ceisiwch eto\n"
@@ -1185,47 +1185,47 @@ msgstr "cyfrwng annealladwy \"%s\" wedi ei nodi'n symudadwy ond nid yw"
msgid "unable to access medium \"%s\""
msgstr "methu cael mynediad at gyfrwng. \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Dim pecyn o'r enw %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Mae pecynnau canlynol yn cynnwys %s: %s:"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "oherwydd %s coll"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s heb ei foddloni"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "ceisio hybu %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "fel modd i gadw %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "er mwyn gosod %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "oherwydd gwrthdaro gyda %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "diofyn"
@@ -1393,7 +1393,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] "Tynnu pecynnau %d?"
msgstr[1] "Tynnu pecynnau %d?"
-#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
@@ -1658,7 +1658,7 @@ msgstr " --vendor - gwerthwr\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - y cyfrwng lle cafwyd y pecyn\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
@@ -1668,12 +1668,12 @@ msgstr " -f - argraffu fersiwn a rhyddhad ac arch gydag enw.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Fformat anghywir: gallwch ddefnyddio un tag aml-werth yn unig"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "ddefnyddio amgylchedd penodol ar %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1682,7 +1682,7 @@ msgstr ""
"Sylw: gan nad oedd unrhyw gyfrwng chwiliwyd yn defnyddio hdlists, methodd "
"urpmf â chynnig canlyniad\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Efallai yr hoffech ddefnyddio --name i chwilio am enwau pecynnau.\n"
@@ -1981,7 +1981,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - uwchraddio dim ond pecynnau gyda'r un bensaernïaeth.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - dewis pob cydweddiad ar y llinell gorchymyn.\n"
@@ -2213,94 +2213,94 @@ msgstr[1] "Parhau gyda gosod %d pecyn?"
msgid "Press Enter when ready..."
msgstr "Pwyso Enter pan yn barod..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Dileu"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "Mae gan y pecyn canlynol lofnod gwallus"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Mae gan y pecynnau canlynol lofnod gwallus"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ydych chi am barhau gosod?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Methodd y gosod"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "dosbarthu %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "gosod %s o %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "gosod %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Methodd y gosod:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Ceisio gosod heb wirio dibyniaethau? (i/N)"
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mwy o orfodaeth gyda'r gosod? (--force)? (y/N)"
-#: ../urpmi:825
+#: ../urpmi:815
#, c-format
msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] "methodd trosglwyddiad gosod %d"
msgstr[1] "methodd trosglwyddiad gosod %d"
-#: ../urpmi:835
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Gosod yn bosibl"
-#: ../urpmi:840
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Mae'r pecynnau'n rhai diweddaraf"
-#: ../urpmi:848
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "Pecyn %s wedi ei osod eisoes"
-#: ../urpmi:849
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Pecynnau %s wedi eu gosod eisoes"
-#: ../urpmi:852
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "Methu gosod pecyn %s"
-#: ../urpmi:853
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Methu gosod pecynnau %s"
-#: ../urpmi:872
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "ailgychwyn urpmi"
@@ -2855,55 +2855,57 @@ msgstr ""
" --whatrequires-recursive\n"
" - chwilio nôl estyndig (yn cynnwys rhith becynnau) \n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - allbwn cyfan a phecyn i'w dynnu\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ymestyn ymholiad i ddibyniaethau pecynnau.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - argraffu grwpiau gydag enw hefyd.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - argraffu gwybodaeth ddefnyddiol mewn ffordd ddarllenadwy "
"i bobl.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - rhestri'r ffeiliau mewn pecyn.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - yn cyfateb i -du.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - caniatáu i chwilio canfod pecyn.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - argraffu fersiwn a rhyddhad gydag enw hefyd.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" --s - pecyn nesaf yn becyn ffynhonnell (yr un peth â --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2912,52 +2914,52 @@ msgstr ""
" -u - tynnu pecyn os oes yna fersiwn mwy diweddar wedi ei "
"osod.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - gosod chwilio fuzzy (fel --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - fel -y, ond yn gorfodi cydweddu diffyg cydweddiad maint "
"llythrennau.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" bydd enwau neu ffeiliau rpm sy'n cael eu rhoi ar y llinell orchymyn yn cael "
"eu holi.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "dim ond gyda --paralel mae modd defnyddio --list-nodes"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer pecyn "
"%s"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"dim hdlist ar gyfer cyfrwng \"%s\", dim ond canlyniad rhannol ar gyfer "
"pecynnau %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
"pecyn %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2965,16 +2967,14 @@ msgstr ""
"dim hdlist ar gyfer cyfrwng\"%s\", methu canfod unrhyw ganlyniad ar gyfer "
"pecynnau %s"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Heb ganfod filelist\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Heb ganfod changelog\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Heb ganfod filelist\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
#~ msgstr ""
diff --git a/po/da.po b/po/da.po
index 3741bf51..f3747c5b 100644
--- a/po/da.po
+++ b/po/da.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: da1\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-10-01 17:20+0200\n"
"Last-Translator: Keld Simonsen <keld@rap.dk>\n"
"Language-Team: <da@li.org>\n"
@@ -27,7 +27,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM-installering"
@@ -37,7 +37,7 @@ msgstr "RPM-installering"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Fejl: kunne ikke finde fil %s, vil afbryde handling"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_O.k."
@@ -104,7 +104,7 @@ msgstr "_Installér"
msgid "_Save"
msgstr "_Gem"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Annullér"
@@ -114,27 +114,27 @@ msgstr "_Annullér"
msgid "Choose location to save file"
msgstr "Vælg sted at gemme filen"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "ukendt valg '%s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ingen pakker angivet"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Vent venligst..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Skal være root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -145,42 +145,42 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "O.k."
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (skal opgraderes)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (skal installeres)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Der er brug for en af de følgende pakker:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Afbryd"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -191,43 +191,48 @@ msgstr ""
"%s\n"
"Skal installationen fortsættes alligevel?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
-msgstr[1] ""
+msgstr ""
"For at tilfredsstille afhængigheder vil den følgende pakke blive installeret "
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"For at tilfredsstille afhængigheder vil de følgende pakker blive installeret"
+
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d pakker, %d MB)"
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pakke, %d MB)"
+msgstr[1] "(%d pakker, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Pakkeinstallation..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kan ikke hente kilde-pakker, afslutter med fejl"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vær venlig at indsætte mediet med navnet %s i enhed [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Henter pakke %s..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -240,7 +245,7 @@ msgstr ""
"\n"
"Ønsker du at fortsætte installeringen?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -251,37 +256,37 @@ msgstr ""
"%s\n"
"Du ønsker måske at opdatere din urpmi-database"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "fjerner %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Forbereder..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakke `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Færdig"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Installationen fejlede"
+msgid "Installation failed:"
+msgstr "Installationen fejlede:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "alting er allerede installeret"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Installationen færdig"
@@ -330,63 +335,63 @@ msgstr "Kun superbrugeren har lov til at installere pakker"
msgid "Running urpmi in restricted mode..."
msgstr "Kører urpmi i begrænset tilstand..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "kunne ikke åbne rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldigt rpm-filnavn [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "henter rpm-fil [%s]..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...hentning færdig"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...hentning mislykkedes: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kunne ikke nå rpm fil [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "kunne ikke fortolke spec-fil '%s [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "kunne ikke registrere rpm-fil"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]"
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "fejl ved registrering af lokale pakker"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denne handling er forbudt ved kørsel i begrænset tilstand"
@@ -406,27 +411,27 @@ msgstr "Miljøkatalog %s eksisterer ikke"
msgid "You need to be root to use --use-distrib"
msgstr "Du skal være rod (root) for at bruge --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan ikke læse rpm-fil \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "byggede hdlist syntese fil for medie \"%s\""
@@ -451,7 +456,7 @@ msgstr "kunne ikke skrive config-fil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "kunne ikke skrive config-fil [%s]"
@@ -459,17 +464,17 @@ msgstr "kunne ikke skrive config-fil [%s]"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Indtast dine adgangsoplysninger for adgang til proxy\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Brugernavn:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Kodeord:"
#: ../urpm/download.pm:185
#, c-format
@@ -581,7 +586,7 @@ msgstr "der er flere pakker med samme rpm-filnavn \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "kunne ikke fortolke [%s] korrekt ved værdi \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "kan ikke få adgang til filen \"%s\", medie ignoreret"
@@ -694,9 +699,9 @@ msgid "No base defined"
msgstr "Ingen pakker angivet"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Kan ikke tildele farvetabelselementer"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -714,11 +719,11 @@ msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "advarsel: md5sum for %s er ikke tilgængelig i MD5SUM-fil"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "beregner md5sum på eksisterende kilde-hdlist (eller -syntese)"
+msgstr "beregner md5sum på eksisterende kilde-hdlist (eller -syntese) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -727,250 +732,250 @@ msgstr ""
"det virtuelle medie \"%s\" bør ikke have defineret en hdlist- eller list-"
"fil, medie ignoreret"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuelt medie \"%s\" bør have en klar url, medie ignoreret"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "ugyldigt rpm-filnavn [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "kunne ikke finde listefil for \"%s\", medie ignoreret"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "byggede hdlist syntese fil for medie \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kunne ikke nå hdlist-fil af \"%s\", medie ignoreret"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "kunne ikke fortolke hdlist-filen \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "medie \"%s\" prøver at bruge en allerede brugt hdlist, medie ignoreret"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "medie \"%s\" prøver at bruge en allerede brugt liste, medie ignoreret"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "prøver at forbigå eksisterende medie \"%s\", springer over"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "For mange monteringspunkter for udskifteligt medium \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "tager udskifteligt medium som \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Medie \"%s\" er et ISO-aftryk, vil blive monteret omgående"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "bruger en anden udskiftelig enhed [%s] for \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "kan ikke finde stinavn for udskifteligt medie \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "skriver config fil [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Kan ikke bruge parallel-tilstand med 'use-distrib '-tilstand"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "bruger tilknyttet medie for parallel tilstand: %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--synthesis kan ikke bruges med --media, --excludemedia, --sortmedia, --"
-"update eller --parallel"
+"update, --use-distrib eller --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
"stand til at returnere noget resultat\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Søgnings-start: %s slut: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "udfører andet gennemløb for at beregne afhængigheder\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "overspringer pakke %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ville installere i stedet for at opgradere pakke %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medie \"%s\" eksisterer allerede"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuelt medie skal være lokalt"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "læser hoveder fra medium \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "fjerner medium \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "kan ikke få adgang til første installationsmedium"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denne url ser ikke ud til at indeholde nogen distrib"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "modtager media.cfg-fil..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "kunne ikke læse media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"kunne ikke få fat på det første installationsmedium (ingen hdlists fil "
"fundet)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "prøver at vælge ikke-eksisterende medie \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "vælger flere medier: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "fjerner medium \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "omkonfigurerer urpmi for medie \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...omkonfigurering mislykkedes"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "omkonfigurering færdig"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fejl ved generering af navnefil: afhængighed %d ikke fundet"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Fejl ved generering af navnefil: Kan ikke skrive til fil (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medie \"%s\" er ikke valgt"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "undersøger hdlist-fil [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "undersøger syntese-fil [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -979,77 +984,77 @@ msgstr ""
"Kunne ikke bygge syntese-fil for medie \"%s\". Din hdlist-fil er måske "
"ødelagt."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem ved læsning af hdlist- eller syntese-fil for medie \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiering mislykkedes"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierer beskrivelsesfil for \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiering færdig"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skriver liste-fil for medie \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering af [%s] mislykkedes (filen er mistænkeligt lille)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "beregner md5sum på kopieret kilde-hdlist (eller -syntese)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopi af [%s] mislykkedes (md5sum-uoverensstemmelse)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "beregner md5sum på hentet kilde-hdlist (eller -syntese)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...hentning mislykkedes: md5sum: passer ikke"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ingen rpm filer fundet fra [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "læser rpm-filer fra [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kunne ikke læse rpm-filer fra [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "ingen rpm'er læst"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1059,78 +1064,78 @@ msgstr ""
"Kan ikke tilgå medie '%s',\n"
"dette kan ske hvis du manuelt monterede kataloget ved oprettelsen af mediet."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ingen hdlist-fil fundet for medie \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "henter kilde-hdlist (eller -syntese) for \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "fandt undersøgte hdlist (eller syntese) for \"%s\"..."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ingen hdlist-fil fundet for medie \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersøger pubkey-fil for '%s'"
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importeret nøgle %s fra pubkey-fil for \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunne ikke importere pubkey-fil for \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skriver liste-fil for medie \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "tilføjede medie %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kunne ikke fortolke hdlist-filen \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem ved læsning af syntese-fil for medie \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "læser hoveder fra medium \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyJj"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Undskyld, dårligt valg, prøv igen\n"
@@ -1166,8 +1171,8 @@ msgid "unmounting %s"
msgstr "afmonterer %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "medie \"%s\" er ikke valgt"
#: ../urpm/removable.pm:143
@@ -1185,47 +1190,47 @@ msgstr "inkonsistent medie \"%s\" mærket udskifteligt, men er det ikke"
msgid "unable to access medium \"%s\""
msgstr "kunne ikke nå medie \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ingen pakke kaldet %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Følgende pakker indeholder %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "grundet manglende %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "grundet uopfyldt %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "prøver at fremme %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "for at kunne beholde %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "for at kunne installere %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "grundet modstrid med %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "ikke ønsket"
@@ -1331,9 +1336,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - forsøg at finde og bruge hdlist-fil.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " -v - udførlig tilstand.\n"
+msgstr " --verbose, -v - udførlig tilstand.\n"
#: ../urpme:58
#, c-format
@@ -1370,25 +1375,34 @@ msgstr "Ingenting at fjerne"
msgid "Checking to remove the following packages"
msgstr "Tjekker for at fjerne de følgende pakker"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
+msgstr[1] ""
+"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"For at tilfredsstille afhængigheder vil de følgende %d pakker blive fjernet "
-"(%d MB)"
+msgid " (%d MB)"
+msgstr " (%d MB)"
-#: ../urpme:134
+#: ../urpme:137
#, c-format
-msgid "Remove %d packages?"
-msgstr "Skal %d pakker fjernes?"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Skal %d pakke fjernes?"
+msgstr[1] "Skal %d pakker fjernes?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Fjernelse mislykkedes"
@@ -1647,7 +1661,7 @@ msgstr " --vendor - leverandør\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - mediet i hvilken pakken blev fundet\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
@@ -1657,12 +1671,12 @@ msgstr " -f - udskriv version, udgave og arkitektur med navn.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldigt format: du kan kun bruge flerværdi-etiketter"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "bruger særligt miljø på %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1671,7 +1685,7 @@ msgstr ""
"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
"stand til at returnere noget resultat\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Måske ønsker du at bruge --name for at søge efter pakkenavne.\n"
@@ -1723,14 +1737,14 @@ msgstr ""
" --auto-select - vælg automatisk pakker for opgradering af systemet.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - deaktivér kontrol med MD5SUM fil.\n"
+msgstr " --no-md5sum - deaktivér kontrol med MD5SUM fil.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - gennemtving opdatering af gpg-nøgle.\n"
+msgstr " --force-key - gennemtving opdatering af gpg-nøgle.\n"
#: ../urpmi:96
#, c-format
@@ -1840,9 +1854,10 @@ msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - brug 'curl' til at hente retrieve eksterne filer.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --curl - brug 'curl' til at hente retrieve eksterne filer.\n"
+msgstr ""
+" --prozilla - brug 'prozilla' til at hente retrieve eksterne filer.\n"
#: ../urpmi:124
#, c-format
@@ -1860,9 +1875,9 @@ msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - ekstra valg som skal gives til wget\n"
#: ../urpmi:127
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --curl-options - ekstra valg som skal gives til curl\n"
+msgstr " --prozilla-options - ekstra valg som skal gives til prozilla\n"
#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
#, c-format
@@ -1974,7 +1989,7 @@ msgstr " --nolock - lås ikke rpm-database.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - opgradér kun pakker med den samme arkitektur.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vælg alle træffere på kommandolinje.\n"
@@ -1990,9 +2005,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - søg ikke i 'provides' for at finde pakke.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - stille udgave.\n"
+msgstr " --quiet, -q - stille udgave.\n"
#: ../urpmi:157
#, c-format
@@ -2047,58 +2062,61 @@ msgstr ""
"Fejl: %s ser ud til at være monteret kun læsbart.\n"
"Brug --allow-force for at gennemtvinge handlingen."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Opdaterer medie...\n"
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr " (skal opgraderes)"
+msgstr "%s: %s (skal opgraderes)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr " (skal opgraderes)"
+msgstr "%s (skal opgraderes)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr " (skal installeres)"
+msgstr "%s: %s (skal installeres)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr " (skal installeres)"
+msgstr "%s (skal installeres)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hvad er dit valg? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"De følgende pakker kan ikke installeres, fordi de afhænger af pakker,\n"
"som er ældre end de installerede:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"De følgende pakker kan ikke installeres, fordi de afhænger af pakker,\n"
"som er ældre end de installerede:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2107,7 +2125,7 @@ msgstr ""
"\n"
"Fortsæt installationen alligevel?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
@@ -2117,56 +2135,65 @@ msgstr " (J/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Nogen forespurgte pakker kan ikke installeres:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Installationen kan ikke fortsætte fordi de følgende pakker\n"
"skal fjernes for at andre kan opgraderes:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Installationen kan ikke fortsætte fordi de følgende pakker\n"
"skal fjernes for at andre kan opgraderes:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"De følgende pakker skal fjernes for at andre kan opgraderes:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(kun test, fjernelse vil egentlig ikke blive gennemført)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2175,106 +2202,117 @@ msgstr ""
"Du skal være root for at installere de følgende afhængigheder:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(kun test, installation vil egentlig ikke blive gennemført)"
-#: ../urpmi:594
-#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Fortsæt installationen med de %d pakker? (%d MB)"
-msgstr[1] "Fortsæt installationen med de %d pakker? (%d MB)"
+#: ../urpmi:597
+#, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Fortsæt installationen med de %d pakke?"
+msgstr[1] "Fortsæt installationen med de %d pakker?"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Tryk på retur, når den er klar..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Annullér"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "De følgende pakker har dårlige signaturer"
-msgstr[1] "De følgende pakker har dårlige signaturer"
+msgstr "De følgende pakker har dårlige signaturer"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "De følgende pakker har dårlige signaturer"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ønsker du at fortsætte installationen?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen fejlede"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuerer %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "installerer %s fra %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "installerer %s"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "Installationen fejlede:"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prøv installation uden at tjekke afhængigheder? (j/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prøv endnu hårdere at installere (--force)? (j/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installationstrasaktioner mislykkedes"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installationstrasaktioner mislykkedes"
+msgstr[1] "%d installationstrasaktioner mislykkedes"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Installation er mulig"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "alting er allerede installeret"
-msgstr[1] "alting er allerede installeret"
+msgstr "alting er allerede installeret"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "alting er allerede installeret"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "alting er allerede installeret"
-msgstr[1] "alting er allerede installeret"
+msgstr "alting er allerede installeret"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "alting er allerede installeret"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "genstarter urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2286,14 +2324,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"brug: urpmi.addmedia [valgmuligheder] <navn> <url> [with <relativ sti>]\n"
+"brug: urpmi.addmedia [valgmuligheder] <navn> <url>\n"
"hvor <url> er en af\n"
-" [file:/]/<sti> with <relativt filnavn for hdlist>\n"
-" ftp://<login>:<adgangskode>@<vært>/<sti> with <relativt filnavn for "
-"hdlist>\n"
-" ftp://<vært>/<sti> with <relativt filnavn for hdlist>\n"
-" http://<vært>/<sti> with <relativt filnavn for hdlist>\n"
-" removable://<sti> with <relativt filnavn for hdlist>\n"
+" [file:/]/<sti>\n"
+" ftp://<login>:<adgangskode>@<vært>/<sti>\n"
+" ftp://<vært>/<sti>\n"
+" http://<vært>/<sti>\n"
+" removable://<sti>\n"
"\n"
"og [valgmuligheder] er følgende\n"
@@ -2319,7 +2356,7 @@ msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
msgstr ""
#: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
msgstr ""
" --no-probe - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
@@ -2376,17 +2413,17 @@ msgstr " --nopubkey - importér ikke pubkey fra tilføjet medie\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - tilføj mediet i config, men opdatér det ikke.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - rydder katalog med cache for headere.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - stille udgave.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - udførlig tilstand.\n"
@@ -2524,9 +2561,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Renser ud i genpakningskatalog [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d filer fjernet\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d filer fjernet\n"
+msgstr[1] "%d filer fjernet\n"
#: ../urpmi.recover:82
#, c-format
@@ -2584,12 +2623,12 @@ msgid "Disabling repackaging\n"
msgstr "Deaktiverer genpakning\n"
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"brug: urpmi.removemedia [-a] <navn> ...\n"
+"brug: urpmi.removemedia (-a | <navn> ...)\n"
"hvor <navn> er et medie-navn der skal fjernes.\n"
#: ../urpmi.removemedia:41
@@ -2651,26 +2690,33 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - opdatér ikke, markér mediet som aktiveret.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - forsøg ikke at finde og bruge syntese- eller hdlist-fil.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - vælg alle ikke-udskiftelige medier.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - gennemfør generering af hdlist-filer.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Kun superbrugeren har lov til at opdatere medier"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ingenting at opdatere (brug urpmi.addmedia til at tilføje et medie)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2679,17 +2725,17 @@ msgstr ""
"mangler det element der skal opdateres\n"
"(én af %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "ignorerer medie %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "aktiverer medie %s"
@@ -2794,66 +2840,68 @@ msgstr " --changelog - udskriv ændringslog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - skriv resumé.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - omvendt søgning til hvad der kræver pakke.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - udvidet omvendt søgning (inklusive virtuelle pakker).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - søg i 'provides' for at finde pakke.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - færdiggør uddata med pakke der skal fjernes.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - udvid forespørgsel til pakkeafhængigheder.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - udskriv også grupper med navn.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - udskriv nyttig information på læsevenlig form.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l.. - udskriv filer i pakken.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - søg ikke i 'provides' for at finde pakke (standard).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - søg i 'provides' for at finde pakke.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - stille udgave.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - udskriv også version og udgave med navn.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - omvendt søgning til hvad der kræver pakke.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - udvidet omvendt søgning (inklusive virtuelle pakker).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - næste pakke er en kildepakke (samme som --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2862,64 +2910,82 @@ msgstr ""
" -u - fjern pakke hvis en nyere version allerede er "
"installeret.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - gennemfør upræcis søgning (samme som --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - som -y, men tvinger matchning uden forske på små og store "
"bogstaver.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " navne eller rpm-filer givne på kommandolinjen bliver forespurgt.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan kun bruges med --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
+"stand til at returnere noget resultat\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ingen filliste fundet\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Bemærk: da ingen af de undersøgte medier bruger en hdlist, var urpmf ikke i "
+"stand til at returnere noget resultat\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ændringslog fundet\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Ingen filliste fundet\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "For at tilfredsstille afhængigheder vil den følgende pakke blive "
-#~ "installeret "
-#~ msgstr[1] ""
-#~ "For at tilfredsstille afhængigheder vil den følgende pakke blive "
-#~ "installeret "
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "For at tilfredsstille afhængigheder vil de følgende %d pakker blive "
+#~ "fjernet (%d MB)"
+
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Fortsæt installationen med de %d pakke? (%d MB)"
+#~ msgstr[1] "Fortsæt installationen med de %d pakker? (%d MB)"
+
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d pakker, %d MB)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - søg ikke i 'provides' for at finde pakke (standard).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - omvendt søgning til hvad der kræver pakke.\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2930,18 +2996,6 @@ msgstr "Ingen ændringslog fundet\n"
#~ "installeret:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "For at tilfredsstille afhængigheder vil de følgende pakker blive "
-#~ "installeret"
-#~ msgstr[1] ""
-#~ "For at tilfredsstille afhængigheder vil de følgende pakker blive "
-#~ "installeret"
-
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "overspringer medie %s: ingen hdlist"
diff --git a/po/el.po b/po/el.po
index 3727417e..3ba3674c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-el\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-03-04 12:15+0200\n"
"Last-Translator: Theophanis Mastakas <mastakas@otenet.gr>\n"
"Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -24,7 +24,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "Εγκατάσταση RPM"
@@ -34,7 +34,7 @@ msgstr "Εγκατάσταση RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Εντάξει"
@@ -103,7 +103,7 @@ msgstr "_Εγκατάσταση"
msgid "_Save"
msgstr "_Αποθήκευση"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_ΑκÏÏωση"
@@ -113,27 +113,27 @@ msgstr "_ΑκÏÏωση"
msgid "Choose location to save file"
msgstr "Επιλογή τοποθεσίας για αποθήκευση αÏχείου"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Άγνωστη επιλογή %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Δεν οÏίστηκαν πακέτα"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "ΠαÏακαλώ πεÏιμένετε..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "ΠÏέπει να είστε διαχειÏιστής"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -144,42 +144,42 @@ msgstr ""
"%s\n"
"Συνέχεια εγκατάστασης ;"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "ΠÏοσοχή"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Εντάξει"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (Ï€Ïος αναβάθμιση)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (Ï€Ïος εγκατάσταση)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ένα εκ των παÏακάτω πακέτων απαιτείται:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Ματαίωση"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -190,45 +190,50 @@ msgstr ""
"%s\n"
"Συνέχεια εγκατάστασης;"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Για να ικανοποιηθοÏν οι εξαÏτήσεις, το παÏακάτω πακέτο Ï€Ïόκειται να "
-"εγκατεστηθεί"
-msgstr[1] ""
+msgstr ""
"Για να ικανοποιηθοÏν οι εξαÏτήσεις, το παÏακάτω πακέτο Ï€Ïόκειται να "
"εγκατεστηθεί"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
-msgid "(%d packages, %d MB)"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Για να ικανοποιηθοÏν οι εξαÏτήσεις, τα ακόλουθα πακέτα Ï€Ïόκειται να "
+"εγκατασταθοÏν"
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d πακέτο, %d MB)"
+msgstr[1] "(%d πακέτα, %d MB)"
+
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Εγκατάσταση πακέτου..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "αδυναμία λήψης των πακέτων πηγαίου κώδικα, ματαίωση"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "ΠαÏακαλώ βάλτε το μέσο με όνομα \"%s\" στη συσκευή [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Λήψη πακέτου `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -242,7 +247,7 @@ msgstr ""
"\n"
"Θέλετε να συνεχίσετε την εγκατάσταση ;"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -253,37 +258,37 @@ msgstr ""
"%s\n"
"Ίσως θέλετε να αναβαθμίσετε τη βάση δεδομένων urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "αφαίÏεση %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "ΠÏοετοιμασία..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Εγκατάσταση πακέτου `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_ΟλοκληÏώθηκε"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Η εγκατάσταση απέτυχε"
+msgid "Installation failed:"
+msgstr "Η εγκατάσταση απέτυχε:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Η εγκατάσταση τελείωσε"
@@ -333,63 +338,63 @@ msgstr "Μόνο ο διαχειÏιστής επιτÏέπεται να εγκÎ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "αδυναμία ανοίγματος του rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "μη έγκυÏο όνομα αÏχείου rpm [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "ανάκτηση αÏχείου rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...η ανάκτηση ολοκληÏώθηκε"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "... η ανάκτηση απέτυχε: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "αδυναμία Ï€Ïόσβασης στο αÏχείο rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "αδυναμία ανάλυσης του \"%s\" στο αÏχείο [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "αδυναμία δήλωσης του αÏχείου rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "σφάλμα κατά την δήλωση των τοπικών πακέτων"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -409,27 +414,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "ΠÏέπει να είστε root για να κάνετε χÏήση της εντολής ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: αδυναμία ανάγνωσης αÏχείου rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "δημιουÏγία αÏχείου σÏνθεσης hdlist για το μέσο \"%s\""
@@ -454,7 +459,7 @@ msgstr "αδυναμία εγγÏαφής του αÏχείου Ïυθμίσεω
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "αδυναμία εγγÏαφής του αÏχείου Ïυθμίσεων [%s]"
@@ -462,17 +467,17 @@ msgstr "αδυναμία εγγÏαφής του αÏχείου Ïυθμίσεω
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "ΠαÏακαλώ εισάγετε πιστοποίηση για Ï€Ïόσβαση διαμεσολαβητή\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Όνομα χÏήστη:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Κωδικός Ï€Ïόσβασης:"
#: ../urpm/download.pm:185
#, c-format
@@ -584,7 +589,7 @@ msgstr "υπάÏχουν πολλαπλά πακέτα με το ίδιο όνο
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "αδυναμία σωστής ανάλυσης του [%s] στην τιμή \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "αδυναμία Ï€Ïόσβασης στο αÏχείο λίστας του \"%s\", το μέσο αγνοείται"
@@ -698,9 +703,9 @@ msgid "No base defined"
msgstr "Δεν οÏίστηκαν πακέτα"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Αδυναμία διάθεσης εγγÏαφών colormap"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -718,11 +723,11 @@ msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "Ï€Ïοειδοποίηση: μη διαθέσιμο md5sum για %s στο αÏχείο MD5SUM"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "υπολογισμός md5sum από υπάÏχουσα πηγή hdlist (ή synthesis)"
+msgstr "υπολογισμός md5sum από υπάÏχουσα πηγή hdlist (ή synthesis) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -731,257 +736,257 @@ msgstr ""
"το εικονικό μέσο \"%s\" δεν Ï€Ïέπει να έχει Ï€ÏοσδιοÏισμένο αÏχείο hdlist ή "
"αÏχείο λίστας, το μέσο αγνοείται"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"το εικονικό μέσο \"%s\" Ï€Ïέπει να έχει ένα καθαÏÏŒ σÏνδεσμο url, το μέσο "
"αγνοείται"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "μη έγκυÏο όνομα αÏχείου rpm [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "αδυναμία εÏÏεσης αÏχείου λίστας για το \"%s\", το μέσο αγνοείται"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "Ï€Ïοσπάθεια επιλογής ανÏπαÏκτου μέσου \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "δημιουÏγία αÏχείου σÏνθεσης hdlist για το μέσο \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "αδυναμία Ï€Ïόσβασης στο αÏχείο hdlist του \"%s\", το μέσο αγνοείται"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "αδυναμία ανάλυσης του hdlist αÏχείου από το \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"το μέσο \"%s\" Ï€Ïοσπαθεί να χÏησιμοποιήσει την ήδη χÏησιμοποιημένη hdlist, "
"το μέσο αγνοείται"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"το μέσο \"%s\" Ï€Ïοσπαθεί να χÏησιμοποιήσει την ήδη χÏησιμοποιημένη λίστα, το "
"μέσο αγνοείται"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "Ï€Ïοσπάθεια παÏάκαμψης του υπάÏχοντος μέσου \"%s\", αποφυγή"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "πολλαπλά σημεία σÏνδεσης για το αφαιÏοÏμενο μέσο \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "λήψη της αφαιÏοÏμενης συσκευής ως \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Το μέσο \"%s\" είναι ένα αÏχείο ISO, θα Ï€ÏοσαÏτηθεί on-the-fly"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "χÏήση διαφοÏετικής αφαιÏοÏμενης συσκευής [%s] για το \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
"αδυναμία ανάκτησης της διαδÏομής (pathname) για το αφαιÏοÏμενο μέσο \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "εγγÏαφή αÏχείου Ïυθμίσεων [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
"Δεν μποÏεί να χÏησιμοποιηθεί παÏάλληλη κατάσταση με use-distrib κατάσταση"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "χÏήση συνεÏγασίας μέσου για παÏάλληλη κατάσταση: %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--synthesis δεν μποÏεί να χÏησιμοποιηθεί μαζί με --media, --excludemedia, --"
-"sortmedia, --update or --parallel"
+"sortmedia, --update, --use-distrib ή --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Σημείωση: Î±Ï†Î¿Ï Î´ÎµÎ½ έγινε αναζήτηση σε κανένα μέσο που χÏησιμοποιεί hdlists, "
"το urpmf δεν μπόÏεσε να επιστÏέψει κανένα αποτέλεσμα\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "ΈναÏξη αναζήτησης: %s τέλος: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "γίνεται δεÏτεÏος έλεγχος για να υπολογιστοÏν οι εξαÏτήσεις\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "παÏάλειψη πακέτου %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "θα εγκαταστήσει αντί για να αναβαθμίσει το πακέτο %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "το μέσο \"%s\" υπάÏχει ήδη"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "το εικονικό μέσο χÏειάζεται να είναι τοπικό"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "αφαίÏεση μέσου \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "αδυναμία Ï€Ïόσβασης στο Ï€Ïώτο μέσο εγκατάστασης"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "ανάκτηση αÏχείου hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "αδυναμία ανοίγματος του rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"αδυναμία Ï€Ïόσβασης στο Ï€Ïώτο μέσο εγκατάστασης (δεν βÏέθηκε αÏχείο hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Ï€Ïοσπάθεια επιλογής ανÏπαÏκτου μέσου \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "επιλογή πολλαπλών μέσων: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "αφαίÏεση μέσου \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "επαναÏÏθμιση urpmi για το μέσο \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...η επαναÏÏθμιση απέτυχε"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "επαναÏÏθμιση πέτυχε"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "εξέταση αÏχείου hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "εξέταση αÏχείου σÏνθεσης [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "δημιουÏγία hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -990,78 +995,78 @@ msgstr ""
"αδυναμία δημιουÏγίας αÏχείου σÏνθεσης για το μέσο \"%s\". Το αÏχείο hdlist "
"μποÏεί να είναι λανθασμένο."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"Ï€Ïόβλημα ανάγνωσης του hdlist ή του αÏχείου σÏνθεσης από το μέσο \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...η αντιγÏαφή απέτυχε"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "αντιγÏαφή διαδÏομής αÏχείου από \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...η αντιγÏαφή ολοκληÏώθηκε"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "εγγÏαφή αÏχείου λίστας για το μέσο \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "αντιγÏαφή από [%s] απέτυχε (το αÏχείο είναι Ïποπτα μικÏÏŒ)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "υπολογισμός md5sum από αντιγÏαμμένης πηγής hdlist (ή synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "η αντιγÏαφή του [%s] απέτυχε (τα md5sum δεν ταιÏιάζουν)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "υπολογισμός md5sum του ανακτημένου πηγαίου hdlist (ή synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... η ανάκτηση απέτυχε: Ασυμφωνία md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "δεν βÏέθηκαν αÏχεία rpm από το [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "ανάγνωση αÏχείων rpm από το [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "αδυναμία ανάγνωσης αÏχείων rpm από το [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "καμία ανάγνωση rpm πακέτων"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1072,78 +1077,78 @@ msgstr ""
"αυτό μποÏεί να συμβαίνει εάν έχετε Ï€ÏοσαÏτήσει μόνοι σας τον κατάλογο όταν "
"δημιουÏγήθηκε το μέσο."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "δεν βÏέθηκε αÏχείο hdlist για το μέσο \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "ανάκτηση πηγής hdlist (ή synthesis) από \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "βÏέθηκε ανακτημένο hdlist (ή synthesis) σαν %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "δεν βÏέθηκε αÏχείο hdlist για το μέσο \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Εξέταση αÏχείου δημοσίου ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±Ï€ÏŒ το \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...εισαγωγή ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï %s από το αÏχείο δημοσίου ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±Ï€ÏŒ το \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "αδυναμία εισαγωγής αÏχείου δημοσίου ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Î±Ï€ÏŒ το \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "εγγÏαφή αÏχείου λίστας για το μέσο \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Ï€Ïοστίθεται το μέσο %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "αδυναμία ανάλυσης του hdlist αÏχείου από το \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Ï€Ïόβλημα ανάγνωσης του αÏχείου σÏνθεσης από το μέσο \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "ανάγνωση επικεφαλίδων από το μέσο \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "ΟοNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "ÎνYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Λυπάμαι, κακή επιλογή, Ï€Ïοσπαθήστε ξανά\n"
@@ -1179,8 +1184,8 @@ msgid "unmounting %s"
msgstr "αποπÏοσαÏÏ„ÏŽ το %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "δεν έχει επιλεγεί το μέσο \"%s\""
#: ../urpm/removable.pm:143
@@ -1200,47 +1205,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "αδυναμία Ï€Ïόσβασης στο μέσο \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Κανένα πακέτο με το όνομα %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Τα παÏακάτω πακέτα πεÏιέχουν %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "λόγω ελλείψεων %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "λόγω μη ικανοποίησης %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "Ï€Ïοσπάθεια ενίσχυσης του %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "για να κÏατηθεί το %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "για να εγκατασταθεί το %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "λόγω συγκÏοÏσεων με το %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "δεν ζητήθηκαν"
@@ -1309,9 +1314,9 @@ msgstr ""
" --parallel - διανεμημένα urpmi κατά μήκος των μηχανών με ψευδώνυμα.\n"
#: ../urpme:49 ../urpmi:146
-#, fuzzy, c-format
+#, c-format
msgid " --repackage - Re-package the files before erasing\n"
-msgstr " --packager - "
+msgstr ""
#: ../urpme:50
#, c-format
@@ -1333,12 +1338,12 @@ msgid " --noscripts - do not execute package scriptlet(s).\n"
msgstr " --description - Ï„Ïπωσε την ετικέτα πεÏιγÏαφής: πεÏιγÏαφή.\n"
#: ../urpme:53
-#, fuzzy, c-format
+#, c-format
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - ÏÏθμιση urpmi απευθείας από ένα δέντÏο διανομής, χÏήσιμο\n"
+" --use-distrib - ÏÏθμιση urpme απευθείας από ένα δέντÏο διανομής, χÏήσιμο\n"
" για την (απ)εγκατάσταση ενός chroot με την --root "
"επιλογή.\n"
@@ -1357,9 +1362,9 @@ msgstr ""
" synthesis hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - αναλυτική λειτουÏγία.\n"
+msgstr " --verbose, -v - αναλυτική λειτουÏγία.\n"
#: ../urpme:58
#, c-format
@@ -1397,25 +1402,36 @@ msgstr "Τίποτα Ï€Ïος αφαίÏεση"
msgid "Checking to remove the following packages"
msgstr "Έλεγχος για την αφαίÏεση των παÏακάτω πακέτων"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Για να ικανοποιηθοÏν οι εξαÏτήσεις, τα παÏακάτω πακέτα %d θα αφαιÏεθοÏν (%d "
+"MB)"
+msgstr[1] ""
"Για να ικανοποιηθοÏν οι εξαÏτήσεις, τα παÏακάτω πακέτα %d θα αφαιÏεθοÏν (%d "
"MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "Remove %d packages?"
-msgstr "ΑφαίÏεση πακέτων %d ;"
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ΑφαίÏεση πακέτων %d ;"
+msgstr[1] "ΑφαίÏεση πακέτων %d ;"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (ν/Ο) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Η αφαίÏεση απέτυχε"
@@ -1540,12 +1556,12 @@ msgstr " -ο - δυαδικός OR τελεστής.\n"
#: ../urpmf:55
#, fuzzy, c-format
msgid " ! - unary NOT.\n"
-msgstr " ! - unary NOT.\n"
+msgstr " -ο - δυαδικός OR τελεστής.\n"
#: ../urpmf:56
#, c-format
msgid " ( ) - left and right parentheses.\n"
-msgstr " ( ) - αÏιστεÏή και δεξιά παÏένθεση.\n"
+msgstr " ( ) - αÏιστεÏή και δεξιά παÏένθεση.\n"
#: ../urpmf:57
#, c-format
@@ -1553,9 +1569,9 @@ msgid "List of tags:\n"
msgstr "Κατάλογος ετικετών:\n"
#: ../urpmf:58
-#, fuzzy, c-format
+#, c-format
msgid " --qf - specify a printf-like output format\n"
-msgstr " --gf - "
+msgstr ""
#: ../urpmf:59
#, c-format
@@ -1598,7 +1614,7 @@ msgid " --distribution - distribution\n"
msgstr ""
#: ../urpmf:67
-#, fuzzy, c-format
+#, c-format
msgid " --epoch - epoch\n"
msgstr " --epoch - .\n"
@@ -1633,13 +1649,13 @@ msgid " --packager - packager\n"
msgstr " --packager - δημιουÏγός πακέτου\n"
#: ../urpmf:74
-#, fuzzy, c-format
+#, c-format
msgid " --provides - provides tags\n"
msgstr ""
" --provides - Ï„Ïπωσε την ετικέτα με τις παÏοχές: όλες οι παÏοχές.\n"
#: ../urpmf:75
-#, fuzzy, c-format
+#, c-format
msgid " --requires - requires tags\n"
msgstr ""
" --requires - Ï„Ïπωσε την ετικέτα με τις εξαÏτήσεις: όλες οι "
@@ -1675,7 +1691,7 @@ msgstr " --vendor - κατασκευαστής\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - το μέσο στο οποίο βÏέθηκε το πακέτο\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1687,12 +1703,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "χÏήση συγκεκÏιμένου πεÏιβάλλοντος στο %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1701,7 +1717,7 @@ msgstr ""
"Σημείωση: Î±Ï†Î¿Ï Î´ÎµÎ½ έγινε αναζήτηση σε κανένα μέσο που χÏησιμοποιεί hdlists, "
"το urpmf δεν μπόÏεσε να επιστÏέψει κανένα αποτέλεσμα\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1803,7 +1819,7 @@ msgstr ""
#: ../urpmi:104
#, fuzzy, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --all - Ï„Ïπωσε όλα τα tags."
+msgstr " --fuzzy, -y - Ï„Ïπωσε όλα τα tags.\n"
#: ../urpmi:105
#, c-format
@@ -1880,10 +1896,11 @@ msgstr ""
" --curl - χÏήση του curl για την ανάκτηση απομακÏυσμένων αÏχείων.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
msgstr ""
-" --curl - χÏήση του curl για την ανάκτηση απομακÏυσμένων αÏχείων.\n"
+" --prozilla - χÏήση του prozilla για την ανάκτηση απομακÏυσμένων "
+"αÏχείων.\n"
#: ../urpmi:124
#, c-format
@@ -2010,7 +2027,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - αναβάθμισε μόνο τα πακέτα με την ίδια αÏχιτεκτονική.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2083,52 +2100,55 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr " (Ï€Ïος αναβάθμιση)"
+msgstr "%s: %s (Ï€Ïος αναβάθμιση)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr " (Ï€Ïος αναβάθμιση)"
+msgstr "%s (Ï€Ïος αναβάθμιση)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr " (Ï€Ïος εγκατάσταση)"
+msgstr "%s: %s (Ï€Ïος εγκατάσταση)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr " (Ï€Ïος εγκατάσταση)"
+msgstr "%s (Ï€Ïος εγκατάσταση)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ποια είναι η επιλογή σας; (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2137,7 +2157,7 @@ msgstr ""
"\n"
"Îα συνεχίσω την εγκατάσταση;"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Î/ο) "
@@ -2147,56 +2167,65 @@ msgstr " (Î/ο) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"ΟÏισμένα πακέτα που ζητήθηκαν δεν μποÏοÏν να εγκατασταθοÏν:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"ΟÏισμένα πακέτα που ζητήθηκαν δεν μποÏοÏν να εγκατασταθοÏν:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Η εγκατάσταση δεν μποÏεί να συνεχιστεί διότι τα παÏακάτω πακέτα Ï€Ïέπει να "
"αφαιÏεθοÏν για να αναβαθμιστοÏν κάποια άλλα:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Η εγκατάσταση δεν μποÏεί να συνεχιστεί διότι τα παÏακάτω πακέτα Ï€Ïέπει να "
"αφαιÏεθοÏν για να αναβαθμιστοÏν κάποια άλλα:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Τα παÏακάτω πακέτα Ï€Ïέπει να αφαιÏεθοÏν για να αναβαθμιστοÏν κάποια άλλα:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Τα παÏακάτω πακέτα Ï€Ïέπει να αφαιÏεθοÏν για να αναβαθμιστοÏν κάποια άλλα:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2206,106 +2235,117 @@ msgstr ""
"εξαÏτήσεις:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Πατήστε enter όταν τελειώσετε..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "ΑκÏÏωση"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Τα παÏακάτω πακέτα πεÏιέχουν κακές υπογÏαφές"
-msgstr[1] "Τα παÏακάτω πακέτα πεÏιέχουν κακές υπογÏαφές"
+msgstr "Τα παÏακάτω πακέτα πεÏιέχουν κακές υπογÏαφές"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Τα παÏακάτω πακέτα πεÏιέχουν κακές υπογÏαφές"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Θέλετε να συνεχίσετε την εγκατάσταση ;"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Η εγκατάσταση απέτυχε"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "κατανομή %s:"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "εγκατάσταση %s από %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "εγκατάσταση %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Η εγκατάσταση απέτυχε"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ΠÏοσπάθεια για εγκατάσταση χωÏίς τον έλεγχο των εξαÏτήσεων; (y/N) "
-#: ../urpmi:780
-#, fuzzy, c-format
+#: ../urpmi:776
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "ΠÏοσπάθεια για πιο δυνατή εγκατάσταση (--force); (y/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "%d αποτυχία διεÏγασιών εγκατάστασης"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d αποτυχία διεÏγασιών εγκατάστασης"
+msgstr[1] "%d αποτυχία διεÏγασιών εγκατάστασης"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Η εγκατάσταση είναι δυνατή"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-msgstr[1] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
+msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
-msgstr[1] "Το(α) πακέτο(α) είναι ήδη εγκατεστημένα"
+msgstr "Το πακέτο είναι ήδη εγκατεστημένα"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Τα πακέτα είναι ήδη εγκατεστημένα"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "Επανεκκίνηση urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2317,15 +2357,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"χÏήση: urpmi.addmedia [επιλογές] <name> <url> [with <σχετική διαδÏομή του "
-"hdlist>]\n"
+"χÏήση: urpmi.addmedia [επιλογές] <name> <url>\n"
"όπου <url> είναι ένα εκ των\n"
-" [file:/]/<διαδÏομή> with <σχετική διαδÏομή του hdlist>\n"
-" ftp://<login>:<password>@<host>/<path> with <σχετική διαδÏομή του "
-"hdlist>\n"
-" ftp://<host>/<path> with <σχετική διαδÏομή του hdlist>\n"
-" http://<host>/<path> with <σχετική διαδÏομή του hdlist>\n"
-" removable://<διαδÏομή> with <σχετική διαδÏομή του hdlist>\n"
+" [file:/]/<διαδÏομή>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" removable://<διαδÏομή>\n"
"\n"
"όπου [επιλογές] είναι από\n"
@@ -2406,17 +2444,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, fuzzy, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -v - αναλυτική λειτουÏγία.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - σιωπηλή λειτουÏγία.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - αναλυτική πεÏιγÏαφή.\n"
@@ -2474,7 +2512,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "αδυναμία δημιουÏγίας του μέσου \"%s\"\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2483,8 +2521,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"Έκδοση urpme %s\n"
-"Copyright (C) 1999-2005 Mandriva.\n"
+"Έκδοση urpmi.recover %s\n"
+"Copyright (C) 2006 Mandriva.\n"
"Αυτό είναι ελεÏθεÏο λογισμικό και μποÏεί να διανεμηθεί υπό τους ÏŒÏους της "
"GNU GPL.\n"
"\n"
@@ -2551,9 +2589,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr ""
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d αÏχεία αφαιÏέθηκαν\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d αÏχεία αφαιÏέθηκαν\n"
+msgstr[1] "%d αÏχεία αφαιÏέθηκαν\n"
#: ../urpmi.recover:82
#, c-format
@@ -2611,12 +2651,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"χÏήση: urpmi.removemedia [-a] <όνομα> ...\n"
+"χÏήση: urpmi.removemedia (-a | <όνομα> ...)\n"
"όπου <όνομα> είναι ένα μέσο Ï€Ïος διαγÏαφή.\n"
#: ../urpmi.removemedia:41
@@ -2679,27 +2719,35 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" -h - ΠÏοσπάθησε να βÏεις και να χÏησιμοποιήσεις το αÏχείο\n"
+" synthesis hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - επιλογή όλων των μη αφαιÏοÏμενων μέσων.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - αναγκαστική δημιουÏγία αÏχείων hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Μόνο ο διαχειÏιστής επιτÏέπεται να αναβαθμίσει μέσο"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"τίποτα για αναβάθμιση (χÏησιμοποιήστε urpmi.addmedia για Ï€Ïοσθήκη μέσου)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2708,23 +2756,23 @@ msgstr ""
"η επιλογή για αναβάθμιση λείπει\n"
"(ένα εκ των %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "Αγνόηση μέσου %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "ενεÏγοποίηση μέσου %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2734,7 +2782,7 @@ msgid ""
"usage:\n"
msgstr ""
"Έκδοση urpmq %s\n"
-"Copyright (C) 2000-2005 Mandriva.\n"
+"Copyright (C) 2000-2006 Mandriva.\n"
"Αυτό είναι ελεÏθεÏο λογισμικό και μποÏεί να διανεμηθεί υπό τους ÏŒÏους της "
"GNU GPL.\n"
"\n"
@@ -2820,68 +2868,68 @@ msgstr " --all - Ï„Ïπωσε όλα τις ετικέτες.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - Ï„Ïπωσε την ετικέτα πεÏίληψης: πεÏίληψη.\n"
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " -a - επιλογή όλων των μέσων.\n"
+
#: ../urpmq:88
#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -a - επιλογή όλων των μέσων.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " --X - χÏήση διεπαφής X.\n"
+
+#: ../urpmq:93
+#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " γÏαμμή εντολών αλλά χωÏίς όνομα πακέτου)."
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - εκτεταμένο εÏώτημα στις εξαÏτήσεις των πακέτων.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -q - σιωπηλή λειτουÏγία.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - αναγκαστική δημιουÏγία αÏχείων hdlist.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - λίστα αÏχείων στο πακέτο.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
-"src).\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " --X - χÏήση διεπαφής X.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -q - σιωπηλή λειτουÏγία.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - αναλυτική λειτουÏγία.\n"
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -a - επιλογή όλων των μέσων.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -a - επιλογή όλων των μέσων.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
"src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2890,64 +2938,66 @@ msgstr ""
" -u - αφαίÏεση πακέτου εάν μια πιο Ï€Ïόσφατη έκδοση είναι ήδη "
"εγκατεστημένη.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, fuzzy, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -s - το επόμενο πακέτο είναι πηγαίο πακέτο (ίδιο με το --"
"src).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " --list - εμφάνιση διαθέσιμων πακέτων.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --all - Ï„Ïπωσε όλα τα tags."
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Σημείωση: Î±Ï†Î¿Ï Î´ÎµÎ½ έγινε αναζήτηση σε κανένα μέσο που χÏησιμοποιεί hdlists, "
+"το urpmf δεν μπόÏεσε να επιστÏέψει κανένα αποτέλεσμα\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Δεν βÏέθηκε αÏχείο λίστας (filelist)\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Σημείωση: Î±Ï†Î¿Ï Î´ÎµÎ½ έγινε αναζήτηση σε κανένα μέσο που χÏησιμοποιεί hdlists, "
+"το urpmf δεν μπόÏεσε να επιστÏέψει κανένα αποτέλεσμα\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Δεν βÏέθηκε αÏχείο αλλαγών (changelog)\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Δεν βÏέθηκε αÏχείο λίστας (filelist)\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Για να ικανοποιηθοÏν οι εξαÏτήσεις, το παÏακάτω πακέτο Ï€Ïόκειται να "
-#~ "εγκατεστηθεί"
-#~ msgstr[1] ""
-#~ "Για να ικανοποιηθοÏν οι εξαÏτήσεις, το παÏακάτω πακέτο Ï€Ïόκειται να "
-#~ "εγκατεστηθεί"
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Για να ικανοποιηθοÏν οι εξαÏτήσεις, τα παÏακάτω πακέτα %d θα αφαιÏεθοÏν (%"
+#~ "d MB)"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2958,32 +3008,12 @@ msgstr "Δεν βÏέθηκε αÏχείο αλλαγών (changelog)\n"
#~ "εγκατασταθοÏν:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Για να ικανοποιηθοÏν οι εξαÏτήσεις, τα ακόλουθα πακέτα Ï€Ïόκειται να "
-#~ "εγκατασταθοÏν"
-#~ msgstr[1] ""
-#~ "Για να ικανοποιηθοÏν οι εξαÏτήσεις, τα ακόλουθα πακέτα Ï€Ïόκειται να "
-#~ "εγκατασταθοÏν"
-
-#, fuzzy
-#~ msgid "skipping media %s: no hdlist"
-#~ msgstr "αποφυγή μέσου %s: δεν υπάÏχει hdlist\n"
-
#~ msgid "Installation failed on node %s"
#~ msgstr "Η εγκατάσταση απέτυχε στον κόμβο %s"
#~ msgid "Installing packages on nodes..."
#~ msgstr "Εγκατάσταση πακέτων στους κόμβους..."
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "εξέταση αÏχείου σÏνθεσης [%s]"
-
#~ msgid "Distributing files to %s..."
#~ msgstr "Κατανομή αÏχείων στο %s..."
@@ -2993,16 +3023,6 @@ msgstr "Δεν βÏέθηκε αÏχείο αλλαγών (changelog)\n"
#~ msgid "Preparing install on %s..."
#~ msgstr "ΠÏοετοιμάζω εγκατάσταση σε %s...."
-#, fuzzy
-#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
-#~ msgstr ""
-#~ " -h - ΠÏοσπάθησε να βÏεις και να χÏησιμοποιήσεις το αÏχείο\n"
-#~ " synthesis hdlist.\n"
-
-#, fuzzy
-#~ msgid "`with' missing for network media\n"
-#~ msgstr "το `with' λείπει από το ftp media\n"
-
#~ msgid ""
#~ "\n"
#~ "unknown options '%s'\n"
@@ -3061,10 +3081,6 @@ msgstr "Δεν βÏέθηκε αÏχείο αλλαγών (changelog)\n"
#~ " --norebuild - μην Ï€Ïοσπαθείς να ξαναδημιουÏγήσεις την hdlist εάν δεν "
#~ "είναι εγγÏάψιμη.\n"
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Τα παÏακάτω πακέτα πεÏιέχουν %s: %s"
-
#~ msgid "copying hdlists file..."
#~ msgstr "αντιγÏαφή αÏχείου hdlist..."
diff --git a/po/eo.po b/po/eo.po
index 5a5c0678..5fdd64ee 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-eo\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-01-13 10:05+0100\n"
"Last-Translator: Grégoire COLBERT <gcolbert2004@noos.fr>\n"
"Language-Team: Esperanto <mandrak-eo@yahoogroups.com>\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: KBabel 1.0.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM instalado"
@@ -33,7 +33,7 @@ msgstr "RPM instalado"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Jes"
@@ -99,7 +99,7 @@ msgstr "_Instalu"
msgid "_Save"
msgstr "_Konservu"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Nuligu"
@@ -109,28 +109,28 @@ msgstr "_Nuligu"
msgid "Choose location to save file"
msgstr "Elektu dosieraron por konservi tiun dosieron"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Nekonataj opcio %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Neniu pakaĵo indikita"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Bonvole atendu..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Devas esti sistemestro"
-#: ../gurpmi2:87
-#, fuzzy, c-format
+#: ../gurpmi2:88
+#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
"%s\n"
@@ -138,45 +138,45 @@ msgid ""
msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s\n"
-"Ĉu mi daŭrigu?"
+"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Averto"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Jes"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (Äisdatigi)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (instali)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Unu el la sekvantaj pakaĵoj estas bezonata:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "Ĉ_esigu"
-#: ../gurpmi2:196
-#, fuzzy, c-format
+#: ../gurpmi2:197
+#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s\n"
@@ -184,45 +184,52 @@ msgid ""
msgstr ""
"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu Äisdatigotaj:\n"
"%s\n"
-"Ĉu mi daŭrigu?"
+"Ĉu vi deziras tamen daŭrigi?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
-msgstr[1] ""
+msgstr ""
"Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Por plenumi la dependaĵojn, la %d sekvanta(j) pakaĵo(j) devas ankaŭ\n"
+"esti instalataj:\n"
+"%s\n"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pakaĵo, %d MB)"
+msgstr[1] "(%d pakaĵoj, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Instalado de pakaĵo..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Ne povas preni fontajn pakaĵojn, mi ĉesiÄas."
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bonvole enÅovu la medion nomata \"%s\" en aparaton [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Mi elÅutas pakaĵon '%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -236,7 +243,7 @@ msgstr ""
"\n"
"Ĉu vi deziras tamen daŭrigi la instaladon ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -247,37 +254,37 @@ msgstr ""
"%s\n"
"Eble vi Äisdatigu vian urpmi-datenbazon"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "foriganta %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Mi preparas..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Finata"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Instalado malsukcesis"
+msgid "Installation failed:"
+msgstr "Instalado malsukcesis:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "La pakaĵo(j) estas jam instalita(j)"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalo finita"
@@ -326,63 +333,63 @@ msgstr "Nur superuzulo rajtas instali pakaĵojn"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "ne povis malfermi rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nevalida rpm-a dosiernomo [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mi ekstraktas rpm-dosieron [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "... ekstraktado farita"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ekstraktado malsukcesis: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne povis atingi rpm-an dosieron [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne povis analizi \"%s\" en dosiero [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ne povas registri rpm-dosieron"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "eraro dum registri lokajn pakaĵojn"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -402,27 +409,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Vi devas esti \"root\" por uzi ĉi tiun ordonon ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne povas legi rpm-an dosieron \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
@@ -447,7 +454,7 @@ msgstr "ne povas skribi konfigurodosieron [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne povas skribi konfigurodosieron [%s]"
@@ -460,12 +467,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Salutnomo :"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Pasvorto:"
#: ../urpm/download.pm:185
#, c-format
@@ -578,7 +585,7 @@ msgstr ""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ne povis Äuste analizi [%s] je valoro \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ne povis atingi listdosieron de \"%s\", ignoris medion"
@@ -691,7 +698,7 @@ msgstr "Neniu pakaĵo indikita"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -714,7 +721,7 @@ msgstr "atentu: md5-sumo por %s ne haveblas en dosiero MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "mi kalkulas md5sum de ekzistanta hd-listo (aÅ­ sintezo)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -723,104 +730,104 @@ msgstr ""
"virtuala datenportilo \"%s\" ne havu difinitan hdlist aÅ­ list-dosieron, "
"datenportilo ignorata"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuala datenportilo \"%s\" havu klaran url, datenportilo ignorata"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nevalida rpm-a dosiernomo [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ne povis trovi listdosieron por \"%s\", ignoris medion"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "provas elekti neekzistantan datenportilon \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "konstruis hdlist-an sintezan dosieron por medio \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne povas atingi \"hdlist\" dosieron de \"%s\", ignoris medion"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ne povis analizi hdlist dosieron de \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"datenportilo \"%s\" provas uzi jam uzitan hdlist, datenportilo ignorata"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"datenportilo \"%s\" provis uzi jam uzitan liston, ignoras datenportilon"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "provas ĉirkaŭiri ekzistantan medion \"%s:, evitas"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "tro da surmetingoj por movebla datenportilo \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "prenante moveblan aparaton kiel \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "uzante alian moveblan aparaton [%s] por \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ne povis ektrakti padonomon por movebla datenportilo \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "skribu konfiguran dosieron [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ne povas uzi paralelan traktilon kun la moduso use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "uzanta asociitaj datenportiloj por paralela modo: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -829,145 +836,145 @@ msgstr ""
"--sintezo ne uzeblas kun --media, --excludemedia, --sortmedia, --update aÅ­ --"
"parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Serĉo startas al: %s finas al: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "mi faras duan pason por kalkuli dependaĵojn\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "transsaltu pakaĵon %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "instalus anstataÅ­ Äisdatigi pakaĵon %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medio \"%s\" jam ekzistas"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuala datenportilo devas esti loka"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "foriganta datenportilon \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ne povis aliri la unuan instal-datenportilon"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "mi ekstraktas la dosieron hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ne povis malfermi rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"neeblas aliri la unuan instal-datenportilon (ne trovis hdlists-dosieron)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "provas elekti neekzistantan datenportilon \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "mi elektas plurtipan datenportilon: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "foriganta datenportilon \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfiguras urpmi-on por datenportilo \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfigurado malsukcesis"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "rekonfigurado finita"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medio \"%s\" ne estas elektata"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "kontrolanta hdlist-dosieron [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "mi kontrolas la sintezo-dosieron [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "konstruas \"hdlist\" [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -976,77 +983,77 @@ msgstr ""
"Ne povis konstrui syntezan dosieron por medio \"%s\".Via hd-list-dosiero "
"estas probable nevalida."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problemo legante la hdlist aÅ­ sintezo-dosiero de datenportilo \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiado malsukcesis"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "mi kopias priskrib-dosieron de \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiado farita"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skribante list-dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiado de [%s] malsukcesis (dosiero estas strange malgranda)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "mi kalkulas md5sum de kopiita font-hdlist (aÅ­ sintezo)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiado de [%s] malsukcesis (md5sum-konfuzo)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "kalkulata md5sum de ekstraktita fonto hdlist (aÅ­ sintezo)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ekstraktado malsukcesis: md5sum-konfuzo"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "neniom da rpm-aj dosieroj trovataj de [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "mi legas la rpm-dosierojn de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne povis legi rpm-dosierojn de [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "neniu rpm-a dosiero legita"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1056,78 +1063,78 @@ msgstr ""
"ne povas aliri datenportilon \"%s\",\n"
"tio povas okazi se vi mane surmetis la dosierujon kreante la datenportilon."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "ekstraktanta la font-hd-liston (aÅ­ sintezon) de \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "provita hd-listo (aÅ­ sintezo) trovita kiel %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "neniu \"hdlist\" dosiero trovita por medio \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kontrolante la publikan ĉifroÅlosilon de \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importis ĉifroÅlosilon %s de \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne povis importi la publikan ĉifroÅlosilon de \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skribante list-dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "aldonita datenportilo %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne povis analizi hdlist dosieron de \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemo por legi sintezan dosieron por datenportilo \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "mi legas la ĉapojn de la datenportilo \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyJj"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "BedaÅ­rinde, nevalida elekto, reprovu\n"
@@ -1163,8 +1170,8 @@ msgid "unmounting %s"
msgstr "malmuntas %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "medio \"%s\" ne estas elektata"
#: ../urpm/removable.pm:143
@@ -1182,47 +1189,47 @@ msgstr "malkohera medio \"%s\" indikita forigebla sed ne vere"
msgid "unable to access medium \"%s\""
msgstr "ne povis atingi medion \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Neniu pakaĵo nomata %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "pro mankanta %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "pro neplenumita %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "mi provas disponigi %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "por konservi %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "por instali %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "pro konflikto kun %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nepetita"
@@ -1367,24 +1374,32 @@ msgstr "Nenio forigenda"
msgid "Checking to remove the following packages"
msgstr "Mi kontrolas por forigi la sekvantajn pakaĵojn"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Por plenumi dependaĵojn, la sekvanta pakaĵo estas forigota"
+msgstr[1] "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj"
-#: ../urpme:134
-#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "mi forigas la pakaĵon %s"
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Malinstalu %d pakaĵon?"
+msgstr[1] "Malinstalu %d pakaĵojn?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Forigado malsukcesis"
@@ -1637,7 +1652,7 @@ msgstr " --verbose - babilema modo.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - listigu dosierojn en la pakaĵo.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1648,12 +1663,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "uzante specifan medion sur %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1662,7 +1677,7 @@ msgstr ""
"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
"doni rezulton\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Eblas ke vi volas uzi --name por serĉi pakaĵ-nomojn.\n"
@@ -1964,7 +1979,7 @@ msgstr " --noclean - konservu rpm ne uzatan en kaÅejo.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - Äisdatigu nur pakaĵoj por la sama arkitekturo.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - elektu ĉiujn kongruojn en la komanda linio.\n"
@@ -2035,67 +2050,70 @@ msgstr ""
"Eraro: %s Åajnas esti nur legebla.\n"
"Uzu --allow-force por provi skribadon."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (Äisdatigi)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (Äisdatigi)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (instali)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (instali)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Kiu estas via elekto? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"La sekvantaj pakaĵoj ne povas esti instalataj ĉar ili dependas de aliaj "
"pakaĵoj\n"
"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"La sekvantaj pakaĵoj ne povas esti instalataj ĉar ili dependas de aliaj "
"pakaĵoj\n"
"kiuj estas pli malnovaj ol tiuj kiuj estas jam instalataj:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ĉu mi devus daŭri malgraŭe?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
@@ -2105,56 +2123,65 @@ msgstr " (J/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Iuj postulataj pakaĵoj ne instaleblas:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"La instalado ne daŭrigeblas ĉar la sekvantaj pakaĵoj\n"
"forigotas por ke aliaj estu Äisdatigotaj:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"La instalado ne daŭrigeblas ĉar la sekvantaj pakaĵoj\n"
"forigotas por ke aliaj estu Äisdatigotaj:\n"
"%s\n"
-#: ../urpmi:541
-#, fuzzy, c-format
+#: ../urpmi:544
+#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
+msgstr ""
+"La sekvanta pakaĵo estas forigota por ke aliaj estu Äisdatigotaj:\n"
"%s"
-msgstr[0] ""
-"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu Äisdatigotaj:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[1] ""
+msgstr ""
"La sekvantaj pakaĵoj estas forigotaj por ke aliaj estu Äisdatigotaj:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2163,106 +2190,117 @@ msgstr ""
"Vi devas esti root por instali la sekvantajn dependaĵojn:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Premu la enigklavon kiam vi pretas..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Nuligu"
-#: ../urpmi:666
-#, fuzzy, c-format
+#: ../urpmi:671
+#, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "La sekvantaj pakaĵoj havas malÄustajn signaturojn"
-msgstr[1] "La sekvantaj pakaĵoj havas malÄustajn signaturojn"
+msgstr "La sekvanta pakaĵo havas malÄustan signaturon"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "La sekvantaj pakaĵoj havas malÄustajn signaturojn"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ĉu vi deziras daŭrigi la instaladon ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalado malsukcesis"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuanta %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "instalas %s el %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalas %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalado malsukcesis"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provu instaladon sen kontroli dependaĵojn? (j/N) "
-#: ../urpmi:780
-#, fuzzy, c-format
+#: ../urpmi:776
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provu instaladon eĉ pli forte (--force)? (j/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "La instal-transakcio %d malsukcesis"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instal-transakcio malsukcesis"
+msgstr[1] "%d instal-transakcioj malsukcesis"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalado eblas"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
-#, fuzzy, c-format
+#: ../urpmi:838
+#, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "La pakaĵo(j) estas jam instalita(j)"
-msgstr[1] "La pakaĵo(j) estas jam instalita(j)"
+msgstr "La pakaĵo %s estas jam instalita"
-#: ../urpmi:843
+#: ../urpmi:839
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "La pakaĵoj %s estas jam instalitaj"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "La pakaĵo(j) estas jam instalita(j)"
-msgstr[1] "La pakaĵo(j) estas jam instalita(j)"
+msgstr "La pakaĵo estas jam instalita"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "La pakaĵoj estas jam instalitaj"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "restartas urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2274,14 +2312,12 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"uzado: urpmi.addmedia [opcioj] <nomo> <url> [with <relativa dosieronomo>\n"
-"kie <url> estas unu el\n"
-" [file:/]/<pado> with <relativa dosieronomo de hd-listo>\n"
-" ftp://<salutnomo>:<pasvorto>@<servilo>/<pado> with <relativa "
-"dosieronomo de hd-listo>\n"
-" ftp://<servilo>/<pado> with <relativa dosieronomo de hd-listo>\n"
-" http://<servilo>/<pado> with <relativa dosieronomo de hd-listo>\n"
-" removable://<pado> with <relativa dosieronomo de hd-listo>\n"
+"uzado: urpmi.addmedia [opcioj] <nomo> <url>\n"
+" [file:/]/<pado>\n"
+" ftp://<salutnomo>:<pasvorto>@<servilo>/<pado>\n"
+" ftp://<servilo>/<pado>\n"
+" http://<servilo>/<pado>\n"
+" removable://<pado>\n"
"\n"
"kaj [opcioj] estas de\n"
@@ -2291,14 +2327,14 @@ msgid " --update - create an update medium.\n"
msgstr " --update - kreu Äisdatigan datenportilon.\n"
#: ../urpmi.addmedia:55
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr " --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
+msgstr " --probe-synthesis - uzu sintezan dosieron.\n"
#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr " --probe-hdlist - provu trovi kaj uzi hd-listan dosieron.\n"
+msgstr " --probe-hdlist - uzu hd-listan dosieron.\n"
#: ../urpmi.addmedia:57
#, c-format
@@ -2306,11 +2342,9 @@ msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
msgstr ""
#: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
-msgstr ""
-" --no-probe - ne provu trovi ian sintezon aÅ­\n"
-" hdlist-dosieron.\n"
+msgstr " --no-probe - ne provu trovi ian sintezon aÅ­ hdlist-dosieron.\n"
#: ../urpmi.addmedia:61
#, c-format
@@ -2365,17 +2399,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - purigu la dosieron de kap-kaÅejo.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - silenta modo.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - babilema modo.\n"
@@ -2396,9 +2430,9 @@ msgid "Only superuser is allowed to add media"
msgstr "Nur superuzulo rajtas aldoni datenportilon"
#: ../urpmi.addmedia:121
-#, fuzzy, c-format
+#, c-format
msgid "creating config file [%s]"
-msgstr "Mi kreos konfiguran dosieron [%s]"
+msgstr "mi kreos konfiguran dosieron [%s]"
#: ../urpmi.addmedia:122
#, c-format
@@ -2433,7 +2467,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "ne povis krei medion \"%s\"\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2442,8 +2476,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate versio %s\n"
-"Kopirajto © 1999-2005 Mandriva.\n"
+"urpmi.recover versio %s\n"
+"Kopirajto © 2006 Mandriva.\n"
"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
"GNU GPL.\n"
"\n"
@@ -2509,8 +2543,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2568,12 +2604,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"uzado: urpmi.removemedia [-a] <nomo> ...\n"
+"uzado: urpmi.removemedia (-a | <nomo> ...)\n"
"kie <nomo> estas la nomo de la forigota datenportilo.\n"
#: ../urpmi.removemedia:41
@@ -2636,26 +2672,32 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - ne Äisdatigu sed marku la medion kiel ebligita.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr " --no-probe - ne provu trovi ian sintezon aÅ­ hdlist-dosieron.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - elektu ĉiujn nemoveblajn datenportilojn.\n"
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, c-format
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -f - trudu generadon de hdlist-dosieroj.\n"
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr " -f - trudu Äisdatigon de sintezo/hdlist-dosieroj.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Nur superuzulo rajtas Äisdatigi pakaĵojn"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nenio por Äisdatigi (uzu urpmi.addmedia por aldoni medion)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2664,23 +2706,23 @@ msgstr ""
"la enskribaĵo por Äisgatigi mankas\n"
"(unu el %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "preterlasante datenportilon \"%s\":"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "ebligante datenportilon \"%s\""
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2689,8 +2731,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"mdkupdate versio %s\n"
-"Kopirajto © 2000-2005 Mandriva.\n"
+"urpmq versio %s\n"
+"Kopirajto © 2000-2006 Mandriva.\n"
"Tio ĉi estas libera programaro kaj povas esti pludisdonata sub la termoj de "
"GNU GPL.\n"
"\n"
@@ -2777,66 +2819,69 @@ msgstr " --changelog - printu la ĵurnalon de la ÅanÄoj.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --group - printu etikedan resumon: summary.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - serĉu en \"provides\" por trovi la pakaĵon.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompleta eligo kun forigota pakaĵo.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - etendu la informmendon al pakaĵ-dependaĵoj.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - printu grupojn ankaÅ­ kun nomo.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - presu uzeblan informon en homlega formo.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - listigu dosierojn en la pakaĵo.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - ne serĉu en \"provides\" por trovi pakaĵon (defaŭlte).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - serĉu en \"provides\" por trovi la pakaĵon.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - silenta modo.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - presu version kaj ankaÅ­ eldonon kun nomo.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sekvanta pakaĵo estas font-pakaĵo (same kiel --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2844,113 +2889,84 @@ msgid ""
msgstr ""
" -u - forigu pakaĵon se pli freÅa versio estas jaminstalita.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - trudu serĉadon de dubindaĵoj (same kiel --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - same kiel -y, sed uskleco-blinda.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" nomoj aÅ­ rpm-dosieroj donitaj en komand-linio estas informmendataj.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes uzeblas nur kun --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
+"doni rezulton\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Neniu \"filelist\" trovita\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Notu: ĉar neniu serĉita datenportilo uzas hdlist-dosierojn, urpmf ne povis "
+"doni rezulton\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Neniu \"changelog\" trovita\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Neniu \"filelist\" trovita\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
-#~ msgstr[1] ""
-#~ "Por plenumi dependaĵojn, la sekvanta pakaĵo estos ankaŭ instalita (%d MB)"
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Por plenumi dependaĵojn, la %d sekvantaj pakaĵoj estas forigotaj (%d MB)"
#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
+#~ " -P - do not search in provides to find package (default).\n"
#~ msgstr ""
-#~ "Por plenumi la dependaĵojn, la %d sekvanta(j) pakaĵo(j) devas ankaŭ\n"
-#~ "esti instalataj:\n"
-#~ "%s\n"
+#~ " -P - ne serĉu en \"provides\" por trovi pakaĵon "
+#~ "(defaÅ­lte).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - retroiru serĉadon al tio kion postulas la pakaĵo.\n"
-#, fuzzy
#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Por plenumi la dependaĵojn, la %d sekvanta(j) pakaĵo(j) devas ankaŭ\n"
-#~ "esti instalataj:\n"
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
#~ "%s\n"
-#~ msgstr[1] ""
+#~ msgstr ""
#~ "Por plenumi la dependaĵojn, la %d sekvanta(j) pakaĵo(j) devas ankaŭ\n"
#~ "esti instalataj:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid "skipping media %s: no hdlist"
-#~ msgstr "preterlasas medion %s: neniu hd-listo\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Instalado malsukcesis"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "Mi instalas pakaĵon '%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "mi kontrolas la sintezo-dosieron [%s]"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "distribuanta %s"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Instalado de pakaĵo..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Instalado de pakaĵo..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - provu trovi kaj uzi sintezan dosieron.\n"
@@ -3014,10 +3030,6 @@ msgstr "Neniu \"changelog\" trovita\n"
#~ msgstr ""
#~ " --norebuild - ne provu rekonstrui hd-listo se Äi ne estas legebla.\n"
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "La sekvantaj pakaĵoj enhavas %s: %s"
-
#~ msgid "copying hdlists file..."
#~ msgstr "kopianta la hdlists-dosieron..."
@@ -3204,15 +3216,6 @@ msgstr "Neniu \"changelog\" trovita\n"
#~ "Iuj postulataj pakaĵoj ne instaleblas:\n"
#~ "%s"
-#, fuzzy
-#~ msgid ""
-#~ " --keep - keep existing packages if possible, reject requested\n"
-#~ " packages that leads to remove.\n"
-#~ msgstr ""
-#~ " --keep - konservu ekzistantajn pakaĵojn laŭeble, rifuzu "
-#~ "postulatajn\n"
-#~ " pakaĵojn kiuj kondukas al forigo.\n"
-
#~ msgid "unable to write file [%s]"
#~ msgstr "ne povas skribi dosieron [%s]"
diff --git a/po/es.po b/po/es.po
index 06c76f4a..57459947 100644
--- a/po/es.po
+++ b/po/es.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-04-29 13:26+0200\n"
"Last-Translator: José Manuel Pérez <jmprodu@hotmail.com>\n"
"Language-Team: Español <es@li.org>\n"
@@ -28,7 +28,7 @@ msgstr ""
"X-Generator: KBabel 1.10\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPMs"
@@ -38,7 +38,7 @@ msgstr "Instalación de RPMs"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -106,7 +106,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Guardar"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -116,27 +116,27 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Elija ubicación para guardar archivo"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Opción desconocida «%s»"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ningún paquete especificado"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Por favor, espere..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -147,42 +147,42 @@ msgstr ""
"%s\n"
"¿Continuar a pesar de todo?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Aceptar"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (para actualizar)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (para instalar)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Elección de paquetes"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Uno de los paquetes siguientes es necesario:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -193,43 +193,47 @@ msgstr ""
"%s\n"
"¿Continuar a pesar de todo?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Para satisfacer las dependencias, se instalará el paquete siguiente (%d MB)"
-msgstr[1] ""
-"Para satisfacer las dependencias, se instalará el paquete siguiente (%d MB)"
+msgstr "Para satisfacer las dependencias, se instalará el paquete siguiente"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
-msgid "(%d packages, %d MB)"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Para satisfacer las dependencias, se instalarán los paquetes siguientes:"
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d paquete, %d MB)"
+msgstr[1] "(%d paquetes, %d MB)"
+
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Instalación de paquete..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no se pueden obtener los paquetes fuente, abortando"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor, inserte el soporte denominado «%s» en el dispositivo [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando paquete `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -242,7 +246,7 @@ msgstr ""
"\n"
"¿Desea continuar con la instalación?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -253,37 +257,37 @@ msgstr ""
"%s\n"
"Puede querer actualizar su base de datos de urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "quitando %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Preparando..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando paquete `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Hecho"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Falló la instalación"
+msgid "Installation failed:"
+msgstr "Falló la instalación:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "ya está todo instalado"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Finalizó la instalación"
@@ -332,63 +336,63 @@ msgstr "Sólo el superusuario está autorizado a instalar paquetes"
msgid "Running urpmi in restricted mode..."
msgstr "Lanzando urpmi en modo restringido..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "no se puede abrir rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nombre de archivo rpm no válido [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "obteniendo archivo rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...recuperación hecha"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...falló la recuperación: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no se puede acceder al archivo rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no se pudo interpretar el archivo spec %s [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "no se puede registrar el archivo rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatible para el rpm [%s]"
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "error registrando paquetes locales"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida en modo restringido"
@@ -408,27 +412,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Necesita ser root para usar --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no se puede leer el archivo rpm «%s»\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
@@ -453,7 +457,7 @@ msgstr "no se puede escribir el archivo de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "no se puede escribir el archivo de configuración [%s]"
@@ -461,17 +465,17 @@ msgstr "no se puede escribir el archivo de configuración [%s]"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Por favor, ingrese sus credenciales para acceder al proxy\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Nombre de usuario:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Contraseña:"
#: ../urpm/download.pm:185
#, c-format
@@ -489,9 +493,9 @@ msgid "%s failed: exited with %d"
msgstr ""
#: ../urpm/download.pm:219
-#, fuzzy, c-format
+#, c-format
msgid "copy failed"
-msgstr "Falló la copia"
+msgstr "falló la copia"
#: ../urpm/download.pm:225
#, fuzzy, c-format
@@ -583,7 +587,7 @@ msgstr "hay muchos paquetes con el mismo nombre de archivo rpm «%s»"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "no se puede analizar correctamente [%s] sobre el valor «%s»"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "no se puede acceder al archivo de la lista de «%s», soporte ignorado"
@@ -697,9 +701,9 @@ msgid "No base defined"
msgstr "Ningún paquete especificado"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "No se puede conectar con el servidor"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -717,11 +721,11 @@ msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "atención: md5sum para %s no está disponible en el fichero MD5SUM"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "computando md5sum de hdlist fuente (o síntesis) existente"
+msgstr "computando md5sum de hdlist fuente (o síntesis) existente [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -730,250 +734,250 @@ msgstr ""
"el soporte virtual «%s» no debería tener definido hdlist o archivo de lista, "
"soporte ignorado"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "el soporte virtual «%s» debería tener una URL limpia, soporte ignorado"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nombre de archivo rpm no válido [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "no se puede encontrar el archivo de lista para «%s», soporte ignorado"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "intentando seleccionar soporte inexistente \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "se generó el archivo de síntesis hdlist para el soporte «%s»"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no se puede acceder al archivo hdlist de «%s», soporte ignorado"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "no se puede interpretar el archivo hdlist de «%s»"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "el soporte «%s» intenta utilizar un hdlist ya usado, soporte ignorado"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "el soporte «%s» intenta utilizar una lista ya usada, soporte ignorado"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "intentando pasar al soporte existente «%s», evitando"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "demasiados puntos de montaje para soportes extraíbles «%s»"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "tomar dispositivo extraíble como «%s»"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "El soporte «%s» es una imagen ISO, será montada al vuelo"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "usar dispositivo extraíble diferente [%s] para «%s»"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "no se puede recuperar el nombre de ruta para el soporte extraíble «%s»"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "escrito archivo de configuración [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "No se puede usar el modo paralelo con el modo use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "usando el soporte asociado para el modo paralelo: %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--synthesis no se puede usar con --media, --excludemedia, --sortmedia, --"
-"update o --parallel"
+"update, --use-distrib o --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
"resultado alguno\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Inicio de la búsqueda: %s fin: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "realizando una segunda pasada para computar las dependencias\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "omitiendo paquete %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "instalaría en vez de actualizar el paquete %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "ya existe el soporte «%s»"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "el soporte virtual debe ser local"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "leyendo encabezados del soporte «%s»"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "quitando el soporte «%s»"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "no se puede acceder al primer soporte de la instalación"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "recuperando archivo media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "no se puede interpretar media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"no se puede acceder al primer soporte de la instalación (no se encontró el "
"archivo hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "intentando seleccionar soporte inexistente \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionando soportes múltiples: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "quitando el soporte «%s»"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando urpmi para el soporte «%s»"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...falló la reconfiguración"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguración terminada"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
-#, fuzzy, c-format
+#: ../urpm/media.pm:1073
+#, c-format
msgid "medium \"%s\" is up-to-date"
-msgstr "el soporte «%s» no está seleccionado"
+msgstr "el soporte «%s» está al día"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinando el archivo hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando el archivo de síntesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "generando hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -982,77 +986,77 @@ msgstr ""
"No se puede generar el archivo de síntesis para el soporte «%s». Su archivo "
"hdlist puede estar corrupto."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema leyendo hdlist o el archivo de síntesis del soporte «%s»"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...falló la copia"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiando descripción de archivo de «%s»..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...copia hecha"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "escribiendo archivo de lista para el soporte «%s»"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "falló la copia de [%s] (el archivo es sospechosamente pequeño)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "computando md5sum de hdlist fuente (o síntesis) copiado"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "falló la copia de [%s] (no coincide md5sum)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "computando md5sum del hdlist fuente (o síntesis) recuperado"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...falló la recuperación: no concuerda md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "no se encontraron archivos rpm en [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "leyendo archivos rpm de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no se pueden leer los archivos rpm de [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "no se leyeron rpms"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1062,78 +1066,78 @@ msgstr ""
"no se puede acceder soporte \"%s\",\n"
"esto puede ocurrir si montó manualmente el directorio cuando creó el soporte."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "recuperando hdlist fuente (o síntesis) de «%s»..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "encontrado hdlist por prueba (o síntesis) como «%s»"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "no se encuentra el archivo hdlist para el soporte «%s»"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando archivo de clave pública de «%s»..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... se importó clave %s desde archivo de clave pública de «%s»"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no se puede importar archivo de clave pública de «%s»"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "escribiendo archivo de lista para el soporte «%s»"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "añadido soporte %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no se puede interpretar el archivo hdlist de «%s»"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema leyendo el archivo de síntesis del soporte «%s»"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "leyendo encabezados del soporte «%s»"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Disculpe, elección incorrecta, reinténtelo\n"
@@ -1169,8 +1173,8 @@ msgid "unmounting %s"
msgstr "desmontando %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "el soporte «%s» no está seleccionado"
#: ../urpm/removable.pm:143
@@ -1188,47 +1192,47 @@ msgstr "soporte no coherente «%s» marcado como borrable, pero no borrado"
msgid "unable to access medium \"%s\""
msgstr "no se puede acceder al soporte «%s»"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ningún paquete llamado %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Los siguientes paquetes contienen %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "debido a que no se satisfizo %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "intentando promover %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "para mantener %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "debido a conflictos con %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "no pedido"
@@ -1249,7 +1253,7 @@ msgid "Missing signature (%s)"
msgstr "Falta firma (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1259,7 +1263,7 @@ msgid ""
"usage:\n"
msgstr ""
"urmpe versión %s\n"
-"Copyright © 1999-2005 Mandriva.\n"
+"Copyright © 1999-2006 Mandriva.\n"
"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
"GPL.\n"
"\n"
@@ -1319,29 +1323,29 @@ msgid " --noscripts - do not execute package scriptlet(s).\n"
msgstr " --description - imprime etiqueta de descripción: description.\n"
#: ../urpme:53
-#, fuzzy, c-format
+#, c-format
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - configurar urpmi al vuelo desde un árbol de "
+" --use-distrib - configurar urpme al vuelo desde un árbol de "
"distribución,\n"
" útil para (des)instalar un chroot con la opción --root.\n"
#: ../urpme:55 ../urpmi:119 ../urpmq:74
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr " --probe-synthesis - intentar y encontrar archivo synthesis.\n"
+msgstr " --probe-synthesis - usar archivo synthesis.\n"
#: ../urpme:56 ../urpmi:120 ../urpmq:75
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr " --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
+msgstr " --probe-hdlist - usar archivo hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - modo informativo.\n"
+msgstr " --verbose, -v - modo informativo.\n"
#: ../urpme:58
#, c-format
@@ -1380,31 +1384,39 @@ msgstr "Nada que quitar"
msgid "Checking to remove the following packages"
msgstr "Verificando para quitar los paquetes siguientes"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"Para satisfacer las dependencias, se quitarán los %d paquetes siguientes (%d "
-"MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Para satisfacer las dependencias, se quitará el paquete siguiente"
+msgstr[1] ""
+"Para satisfacer las dependencias, se quitarán los %d paquetes siguientes"
-#: ../urpme:134
-#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "quitando paquete %s"
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "¿Quitar %d paquete?"
+msgstr[1] "¿Quitar %d paquetes?"
+
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Falló la desinstalación"
#: ../urpmf:29
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
@@ -1414,16 +1426,16 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urmpf versión %s\n"
-"Copyright © 2002-2004 Mandriva.\n"
+"Copyright © 2002-2006 Mandriva.\n"
"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
"GPL.\n"
"\n"
-"uso:\n"
+"usage: urpmf [opciones] patrón-expresión\n"
#: ../urpmf:36
#, fuzzy, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - imprime este mensaje de ayuda.\n"
+msgstr " --version - mostrar la versión de este programa.\n"
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1482,14 +1494,13 @@ msgstr " --verbose - modo informativo.\n"
#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
msgstr ""
-" -i - ignora distinción entre mayús. y minús. en todos los "
-"patrones.\n"
+" -i - ignora distinción entre mayús. y minús. en los patrones.\n"
#: ../urpmf:48
-#, fuzzy, c-format
+#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
msgstr ""
-" -i - ignora distinción entre mayús. y minús. en todos los "
+" -I - hace la distinción entre mayús. y minús. en los "
"patrones.\n"
#: ../urpmf:49
@@ -1528,10 +1539,10 @@ msgid " ! - unary NOT.\n"
msgstr " ! - NO unario.\n"
#: ../urpmf:56
-#, fuzzy, c-format
+#, c-format
msgid " ( ) - left and right parentheses.\n"
msgstr ""
-" ) - paréntesis derecho para cerrar grupo de expresiones.\n"
+" ( ) - paréntesis izq. y der. para grupos de expresiones.\n"
#: ../urpmf:57
#, fuzzy, c-format
@@ -1661,7 +1672,7 @@ msgstr " --verbose - modo informativo.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - lista los archivos en el paquete.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1672,12 +1683,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "uasando un entorno específico en %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1686,13 +1697,13 @@ msgstr ""
"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
"resultado alguno\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Puede querer utilizar --name para buscar nombres de paquetes.\n"
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1702,7 +1713,7 @@ msgid ""
"usage:\n"
msgstr ""
"urmpi versión %s\n"
-"Copyright © 1999-2005 Mandriva.\n"
+"Copyright © 1999-2006 Mandriva.\n"
"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
"GPL.\n"
"\n"
@@ -1739,14 +1750,14 @@ msgstr ""
"sistema.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - deshabilitar la prueba MD5SUM sobre el archivo.\n"
+msgstr " --no-md5sum - deshabilitar la prueba MD5SUM sobre el archivo.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - forzar actualización de clave gpg.\n"
+msgstr " --force-key - forzar actualización de clave gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1790,14 +1801,14 @@ msgstr ""
" --split-length - tamaño de transacción pequeña, predeterminado es %d.\n"
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --fuzzy - forzar búsqueda difusa (lo mismo que -y).\n"
+msgstr " --fuzzy, -y - forzar búsqueda difusa.\n"
#: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
msgid " --src, -s - next package is a source package.\n"
-msgstr " --src - sig. paquete es paquete fuente (igual que -s).\n"
+msgstr " --src, -s - paquete siguiente es paquete fuente.\n"
#: ../urpmi:106
#, c-format
@@ -1858,9 +1869,9 @@ msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usa curl para recuperar archivos remotos.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --curl - usa curl para recuperar archivos remotos.\n"
+msgstr " --prozilla - usa curl para recuperar archivos remotos.\n"
#: ../urpmi:124
#, c-format
@@ -1925,7 +1936,7 @@ msgstr ""
" por el argumento siguiente.\n"
#: ../urpmi:138
-#, fuzzy, c-format
+#, c-format
msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
@@ -1934,13 +1945,12 @@ msgstr ""
" (--no-verify-rpm lo deshabilita, habilitado predet.).\n"
#: ../urpmi:140
-#, fuzzy, c-format
+#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
msgstr ""
-" --test - verificar si se puede llevar a cabo la instalación sin "
-"problemas.\n"
+" --test - sólo verificar si se puede instalar sin problemas.\n"
#: ../urpmi:141
#, c-format
@@ -1994,7 +2004,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - actualiza sólo paquetes con la misma arquitectura.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2012,9 +2022,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -p - no buscar en «provides» para encontrar paquete.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - modo silencioso.\n"
+msgstr " --quiet, -q - modo silencioso.\n"
#: ../urpmi:157
#, c-format
@@ -2067,124 +2077,138 @@ msgstr ""
"Error: %s parece estar montado como sólo lectura.\n"
"Use --allow-force para forzar la operación"
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr " (para actualizar)"
+msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr " (para actualizar)"
+msgstr "%s (para actualizar)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr " (para instalar)"
+msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr " (para instalar)"
+msgstr "%s (para instalar)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "¿Qué elige? (1-%d)"
-#: ../urpmi:482
-#, fuzzy, c-format
+#: ../urpmi:481
+#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"El siguiente paquete no puede instalarse porque depende de paquetes\n"
+"más antiguos que los ya instalados:\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-"Los siguientes paquetes no pueden instalarse porque dependen de paquetes\n"
-"más antiguos que los ya instalados:\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"Los siguientes paquetes no pueden instalarse porque dependen de paquetes\n"
"más antiguos que los ya instalados:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
-#, fuzzy, c-format
+#: ../urpmi:491 ../urpmi:511
+#, c-format
msgid ""
"\n"
"Continue installation anyway?"
-msgstr "¿Seguir adelante?"
+msgstr ""
+"\n"
+"¿Seguir adelante con la instalación?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
#: ../urpmi:503
-#, fuzzy, c-format
+#, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
+msgstr ""
+"No se puede instalar el paquete pedido:\n"
"%s"
-msgstr[0] ""
-"No se puede instalar algún paquete pedido:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[1] ""
-"No se puede instalar algún paquete pedido:\n"
+msgstr ""
+"No se puede instalar algunos paquetes pedidos:\n"
"%s"
-#: ../urpmi:534
-#, fuzzy, c-format
+#: ../urpmi:535
+#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"La instalación no puede continuar porque se tienen que quitar el paquete\n"
+"siguiente para poder actualizar otros:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"La instalación no puede continuar porque se tienen quitar los paquetes\n"
-"siguientes para poder actualizar otros:\n"
-"%s\n"
-msgstr[1] ""
-"La instalación no puede continuar porque se tienen quitar los paquetes\n"
+msgstr ""
+"La instalación no puede continuar porque se tienen que quitar los paquetes\n"
"siguientes para poder actualizar otros:\n"
"%s\n"
-#: ../urpmi:541
-#, fuzzy, c-format
+#: ../urpmi:544
+#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
+msgstr ""
+"Se tiene que quitar el paquete siguiente para poder actualizar otros:\n"
"%s"
-msgstr[0] ""
-"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[1] ""
+msgstr ""
"Se tienen que quitar los paquetes siguientes para poder actualizar otros:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2193,106 +2217,117 @@ msgstr ""
"Necesita ser root para instalar las dependencias siguientes:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "¿Efectuar la instalación del paquete?"
+msgstr[1] "¿Efectuar la instalación de los %d paquetes?"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Presione «Intro» cuando esté listo..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:666
-#, fuzzy, c-format
+#: ../urpmi:671
+#, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Los siguientes paquetes contienen firmas no válidas"
-msgstr[1] "Los siguientes paquetes contienen firmas no válidas"
+msgstr "El siguiente paquete contienen una firma no válida"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Los siguientes paquetes contienen firmas no válidas"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "¿Desea continuar con la instalación?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Falló la instalación"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuyendo %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s desde %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalando %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Falló la instalación"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "¿Intentar de instalar sin verificar las dependencias? (s/N) "
-#: ../urpmi:780
-#, fuzzy, c-format
+#: ../urpmi:776
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "¿Intentar con más fuerza la instalación (--force)? (s/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "fallaron %d transacciones de instalación"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "falló una transacción de instalación"
+msgstr[1] "fallaron %d transacciones de instalación"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Es posible la instalación"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
-#, fuzzy, c-format
+#: ../urpmi:838
+#, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "ya está todo instalado"
-msgstr[1] "ya está todo instalado"
+msgstr "El paquete %s ya está instalado"
-#: ../urpmi:843
-#, fuzzy, c-format
+#: ../urpmi:839
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Los paquetes %s ya están instalados"
+
+#: ../urpmi:842
+#, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "ya está todo instalado"
-msgstr[1] "ya está todo instalado"
+msgstr "El paquete %s no se puede instalar"
-#: ../urpmi:863
+#: ../urpmi:843
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Los paquetes %s no se pueden instalar"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2304,14 +2339,12 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"uso: urpmi.addmedia [opciones] <nombre> <url> [with <ruta_relativa>]\n"
-"donde <url> es uno de\n"
-" [file:/]/<ruta> with <nombre de hdlist relativo>\n"
-" ftp://<usuario>:<contraseña>@<host>/<ruta> with <nombre de hdlist "
-"relativo>\n"
-" ftp://<host>/<ruta> with <nombre de hdlist relativo>\n"
-" http://<host>/<ruta> with <nombre de hdlist relativo>\n"
-" removable://<ruta> with <nombre de hdlist relativo>\n"
+"uso: urpmi.addmedia [opciones] <nombre> <url>\n"
+" [file:/]/<ruta>\n"
+" ftp://<usuario>:<contraseña>@<host>/<ruta>\n"
+" ftp://<host>/<ruta>\n"
+" http://<host>/<ruta>\n"
+" removable://<ruta>\n"
"\n"
"y [opciones] es uno o varios de\n"
@@ -2321,14 +2354,14 @@ msgid " --update - create an update medium.\n"
msgstr " --update - crea sólo soporte de actualización.\n"
#: ../urpmi.addmedia:55
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr " --probe-synthesis - intentar y encontrar archivo synthesis.\n"
+msgstr " --probe-synthesis - usar archivo synthesis.\n"
#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr " --probe-hdlist - intentar encontrar y usar archivo hdlist.\n"
+msgstr " --probe-hdlist - usar archivo hdlist.\n"
#: ../urpmi.addmedia:57
#, c-format
@@ -2394,17 +2427,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - añadir el soporte en config, pero no actualizarlo.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - limpia dir. encabezados de cache.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modo silencioso.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - modo informativo.\n"
@@ -2425,9 +2458,9 @@ msgid "Only superuser is allowed to add media"
msgstr "Sólo el superusuario está autorizado a añadir soportes"
#: ../urpmi.addmedia:121
-#, fuzzy, c-format
+#, c-format
msgid "creating config file [%s]"
-msgstr "Creará el archivo de configuración [%s]"
+msgstr "creando el archivo de configuración [%s]"
#: ../urpmi.addmedia:122
#, c-format
@@ -2462,7 +2495,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "no se puede crear soporte «%s»\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2471,8 +2504,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urmpe versión %s\n"
-"Copyright © 1999-2005 Mandriva.\n"
+"urmpi.recover versión %s\n"
+"Copyright © 2006 Mandriva.\n"
"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
"GPL.\n"
"\n"
@@ -2538,8 +2571,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "se quitó un archivo\n"
+msgstr[1] "se quitaron %d archivos\n"
#: ../urpmi.recover:82
#, c-format
@@ -2597,12 +2632,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"uso: urpmi.removemedia [-a] <nombre> ...\n"
+"uso: urpmi.removemedia (-a | <nombre> ...)\n"
"donde <nombre> es nombre del soporte a borrar.\n"
#: ../urpmi.removemedia:41
@@ -2664,26 +2699,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - no actualizar, marcar el soporte como activado.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - no intentar encontrar archivos synthesis o hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - selecciona todos los soportes no extraíbles.\n"
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, c-format
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -f - fuerza generación de archivos hdlist.\n"
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr ""
+" -f - fuerza actualización de archivos synthesis/hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Sólo el superusuario está autorizado a actualizar soportes"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nada para actualizar (use urpmi.addmedia para agregar un soporte)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2692,23 +2735,23 @@ msgstr ""
"falta la entrada a actualizar\n"
"(una de %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "«%s»"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "Ignorando soporte %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "activando el soporte %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2718,7 +2761,7 @@ msgid ""
"usage:\n"
msgstr ""
"urmpq versión %s\n"
-"Copyright © 2002-2005 Mandriva.\n"
+"Copyright © 2002-2006 Mandriva.\n"
"Esto es software libre y se debe redistribuir bajo los términos de la GNU "
"GPL.\n"
"\n"
@@ -2810,70 +2853,71 @@ msgstr " --changelog - imprimir el registro de cambios.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - imprimir el descriptivo corto (summary).\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - búsqueda inversa de lo que necesita el paquete.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - búsqueda inversa extendida (incluye los paquetes "
+"virtuales).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - busca en provides para encontrar paquete.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - completar salida con paquete(s) a quitar.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extiende consulta a las dependencias del paquete.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - imprimir los grupos junto con los nombres.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - imprimir información útil en formato legible para las "
"personas.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista los archivos en el paquete.\n"
-#: ../urpmq:94
+#: ../urpmq:99
#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - no busca en «provides» para encontrar paquete "
-"(predeterminado).\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -m - equivalente a -du.\n"
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - busca en provides para encontrar paquete.\n"
-
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - imprimir versión y revisión junto con el nombre.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - búsqueda inversa de lo que necesita el paquete.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - búsqueda inversa extendida (incluye los paquetes "
-"virtuales).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - sig. paquete es paquete fuente (igual que --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2882,85 +2926,83 @@ msgstr ""
" -u - quitar paquete si ya está instalada una versión más "
"reciente.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - forzar búsqueda difusa (lo mismo que --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - como -y, pero fuerza la no distinción entre mayúsculas y "
"minúsculas.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" los nombres o archivos rpm dados en línea de comandos se consultan.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes sólo se puede utilizar con --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
+"resultado alguno\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "No se encontró filelist\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Nota: debido a que ningún soporte usa hdlists, urpmf no pudo retornar "
+"resultado alguno\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "No se encontró changelog\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "No se encontró filelist\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Para satisfacer las dependencias, se instalará el paquete siguiente (%d "
-#~ "MB)"
-#~ msgstr[1] ""
-#~ "Para satisfacer las dependencias, se instalará el paquete siguiente (%d "
-#~ "MB)"
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Para satisfacer las dependencias, se quitarán los %d paquetes siguientes "
+#~ "(%d MB)"
#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
+#~ " -P - do not search in provides to find package (default).\n"
#~ msgstr ""
-#~ "Para satisfacer las dependencias, se instalarán los %d paquetes "
-#~ "siguientes:\n"
-#~ "%s\n"
+#~ " -P - no busca en «provides» para encontrar paquete "
+#~ "(predeterminado).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - búsqueda inversa de lo que necesita el paquete.\n"
-#, fuzzy
#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Para satisfacer las dependencias, se instalarán los %d paquetes "
-#~ "siguientes:\n"
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
#~ "%s\n"
-#~ msgstr[1] ""
+#~ msgstr ""
#~ "Para satisfacer las dependencias, se instalarán los %d paquetes "
#~ "siguientes:\n"
#~ "%s\n"
@@ -2968,30 +3010,6 @@ msgstr "No se encontró changelog\n"
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "omitiendo soporte %s: sin hdlist"
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Falló la instalación"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "Instalando paquete `%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "examinando el archivo de síntesis [%s]"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "distribuyendo %s"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Instalación de paquete..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Instalación de paquete..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - intentar y encontrar archivo synthesis.\n"
diff --git a/po/eu.po b/po/eu.po
index eb5dbeee..ef36ad8b 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-05-08 23:54+0200\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: EUSKARA <itzulpena@euskalgnu.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM instalaketa"
@@ -30,7 +30,7 @@ msgstr "RPM instalaketa"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Akatsa: ezin da %s fitxategia aurkitu, eragiketa galaraziko da"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ados"
@@ -96,7 +96,7 @@ msgstr "_Instalatu"
msgid "_Save"
msgstr "_Gorde"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Utzi"
@@ -106,27 +106,27 @@ msgstr "_Utzi"
msgid "Choose location to save file"
msgstr "Aukeratu fitxategiko gordetzeko kokalekua"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Aukera ezezaguna %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ez da paketerik zehaztu"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Itxaron mesedez..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Root izan behar da"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Kontuz"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ados"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (Eguneratu)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (instalatu)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Paketa aukera"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ondoko paketeetako bat behar da:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Geldiarazi"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -183,41 +183,46 @@ msgstr ""
"%s\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Mendekotasunak asetzeko, ondorengo paketea instalatuko da"
-msgstr[1] "Mendekotasunak asetzeko, ondorengo paketea instalatuko da"
+msgstr "Mendekotasunak asetzeko, ondorengo paketea instalatuko da:"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d pakete, %d MB)"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pakete, %d MB)"
+msgstr[1] "(%d pakete, %d MB)"
+
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Paketearen instalazioa..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ezin dira iturburuko paketeak lortu, abortatzen"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Sartu \"%s\" izena duen euskarria [%s] gailuan"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' paketea deskargatzen..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -230,7 +235,7 @@ msgstr ""
"\n"
"Instalazioarekin jarraitu nahi duzu?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -241,37 +246,37 @@ msgstr ""
"%s\n"
"Zure urpmi datu-basea eguneratzea komeni da"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s kentzen"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Prestatzen..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' paketea instalatzen (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Eginda"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalazioak huts egin du"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Dena dago instalatuta"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalazioa amaitu da"
@@ -320,63 +325,63 @@ msgstr "Supererabiltzaileak bakarrik du paketeak instalatzeko baimena"
msgid "Running urpmi in restricted mode..."
msgstr "urpmi modu murriztuan exekutatzen..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "ezin da rpmdb ireki"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm fitxategi-izen baliogabea [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm fitxategia berreskuratzen..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...berreskuratu da"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...berreskuratzeak huts egin du: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ezin izan da rpm fitxategia atzitu [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] fitxategian ezin da \"%s\" analizatu"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ezin da rpm fitxategia erregistratu"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "rpm-rentzako arkitektura bateraezina [%s]"
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "errorea pakete lokalak erregistratzean"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Eragiketa hau debekatuta dago modu murriztuan exekutatzerakoan"
@@ -396,27 +401,27 @@ msgstr "%s ingurune direktorioa ez da existitzen"
msgid "You need to be root to use --use-distrib"
msgstr "Root-a izan behar duzu --use-distrib erabiltzeko"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ezin da \"%s\" rpm fitxategia irakurri\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
@@ -441,7 +446,7 @@ msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
@@ -449,17 +454,17 @@ msgstr "ezin da [%s] konfigurazio-fitxategia idatzi"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Mesedez sartu proxy-ra sartzeko zure egiaztapen datuak\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Erabiltzaile izena:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Pasahitza:"
#: ../urpm/download.pm:185
#, c-format
@@ -571,7 +576,7 @@ msgstr "pakete bat baino gehiago dago \"%s\" rpm fitxategi-izen berarekin"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ezin da [%s] \"%s\" balioan ondo analizatu"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -686,9 +691,9 @@ msgid "No base defined"
msgstr "Ez da paketerik zehaztu"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Ezin dira kolore-maparen sarrerak esleitu"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -706,11 +711,11 @@ msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "oharra: %s-rentzako md5sum ezin da eskuratu MD5SUM fitxategian"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
+msgstr "iturburuko hdlist-en md5sum kalkulatzen (edo laburpena) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -719,257 +724,257 @@ msgstr ""
"\"%s\" euskarri birtualak ez luke hdlist edo fitxategi-zerrenda zehaztuta "
"eduki beharko, euskarriari ez ikusi egingo zaio"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"\"%s\" euskarri birtualak url garbia eduki beharko luke, ez ikusi egingo zaio"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "rpm fitxategi-izen baliogabea [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
"ezin da \"%s\"(r)en zerrenda-fitxategia aurkitu, euskarriari ez ikusi egin "
"zaio"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" euskarrirako hdlist laburpen-fitxategia eraiki da"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ezin da \"%s\"(r)en hdlist fitxategia atzitu, euskarriari jaramonik ez"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ezin da \"%s\"(r)en hdlist fitxategia analizatu"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"\"%s\" euskarria dagoeneko erabilita dagoen hdlist bat erabiltzen saiatzen "
"ari da, euskarriari ez ikusi egingo zaio"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"\"%s\" euskarria dagoeneko erabilita dagoen zerrenda bat erabiltzen saiatzen "
"ari da, euskarriari ez ikusi egingo zaio"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr ""
"existitzen den \"%s\" euskarriari jaramonik ez egiteko ahalegina, ekiditen"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "muntatze-puntu gehiegi \"%s\" euskarri aldagarriarentzat"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "gailu aldagarria \"%s\" gisa hartzen"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "\"%s\" euskarria ISO irudi bat da, behar denean muntatuko da"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "\"%s\"(e)rako gailu aldagarriak [%s] erabiltzen"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ezin da \"%s\" euskarri aldagarriaren bide-izena berreskuratu"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "[%s] konfigurazio-fitxategia idatzi"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Modu paraleloa ezin da use-distrib moduarekin erabili "
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "modu paralelorako asoziatutako euskarria erabiltzen: %s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
"--laburpena ezin da hauekin erabili: --media, --excludemedia, --sortmedia, --"
-"update edo -parallel"
+"update, --use-distrib edo --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
"izan du emaitzarik itzuli\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Bilaketa hasera: %s amaiera: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "mendekotasunak kontatzeko bigarren pasada egiten\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s paketea saltatzen"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s paketea eguneratu beharrean instalatu egingo luke"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" euskarria lehendik badago"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "euskarri birtualak bertokoa izan behar du"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" euskarritik goiburuak irakurtzen"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" euskarria kentzen"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ezin da lehen instalazio-euskarria atzitu"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlist fitxategia berreskuratzen..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ezin da rpmdb ireki"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ezin da lehen instalazio-euskarria atzitu (ez da hdlists fitxategia aurkitu)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "existitzen ez den \"%s\" euskarria hautatu nahian zabiltza"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "hainbat euskarri hautatzen: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" euskarria kentzen"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" euskarriarentzako urpmi birkonfiguratzen"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...birkonfiguraketak hutsegin du"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "birkonfiguraketa amaituta"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Akatsa izenen fitxategia sortzerakoan: ez da aurkitu %d menpekotasuna"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Akatsa izenen fitxategia sortzerakoan: Ezin da fitxategira idatzi (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" euskarria ez dago hautatuta"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "[%s] hdlist fitxategia aztertzen"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] laburpen-fitxategia aztertzen"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist eraikitzen"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -978,78 +983,78 @@ msgstr ""
"Ezin da \"%s\" euskarriarentzat synthesis fitxategia sortu. Baliteke zure "
"hdlist fitxategia hondatuta egotea."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "arazoa \"%s\" euskarriaren hdlist edo laburpen-fitxategia irakurtzean"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...ezin izan da kopiatu"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"(r)en deskribapen-fitxategia kopiatzen..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiatzea burutu da"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "ezin izan da [%s] kopiatu (fitxategia txikiegia da)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kopiatutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "ezin izan da [%s] kopiatu (md5sum ez dator bat)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"berreskuratutako iturburuko hdlist-en md5sum kalkulatzen (edo laburpena)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...berreskuratzeak huts egin du: md5sum ez dator bat"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s](e)n ez da rpm fitxategirik aurkitu"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s](e)ko rpm fitxategiak irakurtzen"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ezin izan da [%s](e)ko rpm fitxategirik irakurri: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "ez da rpm-rik irakurri"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1059,78 +1064,78 @@ msgstr ""
"ezin da \"%s\" euskarria atzitu,\n"
"agian euskarria sortzean direktorioa eskuz muntatu zenuelako izan daiteke."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\"(r)en iturburuko hdlist (edo laburpena) berreskuratzen..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "probatutako hdlist (edo laburpena) aurkitu da %s gisa"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ez da \"%s\" euskarriaren hdlist fitxategirik aurkitu"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"(r)en gako publikoen fitxategia aztertzen..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s gakoa inportatu da \"%s\"(r)en gako publikoen fitxategitik"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ezin da \"%s\"(r)en gako publikoen fitxategia inportatu"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" euskarriaren zerrenda-fitxategia idazten"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s euskarria gehitu da"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ezin da \"%s\"(r)en hdlist fitxategia analizatu"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "arazoa \"%s\" euskarriaren laburpen-fitxategia irakurtzean"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" euskarritik goiburuak irakurtzen"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "eEnN"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "bByYsS"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Aukera okerra, saiatu berriro\n"
@@ -1166,8 +1171,8 @@ msgid "unmounting %s"
msgstr "%s desmuntatzen"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "\"%s\" euskarria ez dago hautatuta"
#: ../urpm/removable.pm:143
@@ -1186,47 +1191,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "ezin izan dugu \"%s\" euskarria atzitu"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ez dago %s izeneko paketerik"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ondoko paketeek %s dute: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s falta delako"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s bete gabe dagoelako"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "%s jaso nahian"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s gordetzeko"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s instalatzeko"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s(r)ekin gatazkak daudelako"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "ez da eskatu"
@@ -1308,17 +1313,17 @@ msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr " --root - beste root bat erabiltzen du rpm instalatzeko.\n"
#: ../urpme:52
-#, fuzzy, c-format
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s).\n"
msgstr " --noscripts - ez du scriptlet(s) paketea exekutatzen\n"
#: ../urpme:53
-#, fuzzy, c-format
+#, c-format
msgid ""
" --use-distrib - configure urpme on the fly from a distrib tree, useful\n"
" to (un)install a chroot with --root option.\n"
msgstr ""
-" --use-distrib - urpmi berehala konfiguratzen du distrib zuhaitzetik, \n"
+" --use-distrib - urpme berehala konfiguratzen du distrib zuhaitzetik, \n"
" erabilgarria chroot --root aukerarekin (des)"
"instalatzeko.\n"
@@ -1336,9 +1341,9 @@ msgstr ""
" --probe-hdlist - hdlist fitxategia bilatzen eta erabiltzen saiatzen da.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - modu berritsua.\n"
+msgstr " --verbose, -v - modu berritsua.\n"
#: ../urpme:58
#, c-format
@@ -1377,24 +1382,34 @@ msgstr "Ez dago ezer kentzeko"
msgid "Checking to remove the following packages"
msgstr "Ondoko paketeak kentzeko egiaztatzen"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Mendekotasunak asetzeko, ondoko %d paketeak ezabatu egingo dira (%d MB)"
+msgstr[1] ""
"Mendekotasunak asetzeko, ondoko %d paketeak ezabatu egingo dira (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
#, c-format
-msgid "Remove %d packages?"
-msgstr "%d paketea ezabatu?"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d paketea ezabatu?"
+msgstr[1] "%d paketeak ezabatu?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (b/E) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Kentzean huts egin du"
@@ -1655,7 +1670,7 @@ msgstr " --verbose - hornitzailea\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - paketea zeukan euskarria\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1667,12 +1682,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formatu okerra: etiketa balio-anitz bakarra erabili dezakezu"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s(e)n ingurune espezifikoa erabiliz\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1681,7 +1696,7 @@ msgstr ""
"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
"izan du emaitzarik itzuli\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "--name erabili dezakezu pakete izenen arabera bilatzeko.\n"
@@ -1736,14 +1751,14 @@ msgstr ""
"hautatzen ditu\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
+msgstr " --no-md5sum - MD5SUM fitxategiaren egiaztapena desgaitzen du.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - gpg gakoa eguneratzera behartzen du.\n"
+msgstr " --force-key - gpg gakoa eguneratzera behartzen du.\n"
#: ../urpmi:96
#, c-format
@@ -1786,9 +1801,9 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - transakzio txikiaren luzera, lehenetsia %d da.\n"
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --fuzzy - hurbilketazko bilaketa inposatzen du (-y bezala).\n"
+msgstr " --fuzzy, -y - hurbilketazko bilaketa inposatzen du.\n"
#: ../urpmi:105
#, c-format
@@ -1855,9 +1870,10 @@ msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --curl - curl erabiltzen du urruneko fitxategiak eskuratzeko.\n"
+msgstr ""
+" --prozilla - prozilla erabiltzen du urruneko fitxategiak eskuratzeko.\n"
#: ../urpmi:124
#, c-format
@@ -1875,9 +1891,9 @@ msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - wget-i aukera gehigarriak pasatzeko\n"
#: ../urpmi:127
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --curl-options - curl-i aukera gehiago pasatzeko\n"
+msgstr " --prozilla-options - prozilla-i aukera gehiago pasatzeko\n"
#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
#, c-format
@@ -1992,7 +2008,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - berritu soilik arkitektura berdina duten paketeak.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komando-lerroko bat-etortze guztiak hautatzen ditu.\n"
@@ -2009,9 +2025,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -p - paketeak aurkitzeko bilaketa ez du 'provides'en egiten.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - modu lasaia.\n"
+msgstr " --quiet, -q - modu lasaia.\n"
#: ../urpmi:157
#, c-format
@@ -2064,58 +2080,61 @@ msgstr ""
"Akatsa: %s irakurri-soilik muntatu dela dirudi.\n"
"Erabili --allow-force eragiketa behartzeko."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Euskarria eguneratzen...\n"
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr " (Eguneratu)"
+msgstr "%s: %s (eguneratu)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr " (Eguneratu)"
+msgstr "%s (eguneratu)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr " (instalatu)"
+msgstr "%s: %s (instalatu)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr " (instalatu)"
+msgstr "%s (instalatu)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Zein hautatzen duzu? (1-%d) "
-#: ../urpmi:482
-#, fuzzy, c-format
+#: ../urpmi:481
+#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Ondoko paketea ezin dira instalatu instalatuta daudenak baino zaharrago\n"
+" batzuekiko menpekotasuna dutelako:\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-"Ondoko paketeak ezin dira instalatu instalatuta daudenak baino zaharrago\n"
-" batzuekiko menpekotasuna dutelako:\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"Ondoko paketeak ezin dira instalatu instalatuta daudenak baino zaharrago\n"
" batzuekiko menpekotasuna dutelako:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2124,7 +2143,7 @@ msgstr ""
"\n"
"Instalazioarekin jarraitu hala ere?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (B/e) "
@@ -2134,56 +2153,65 @@ msgstr " (B/e) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Eskatutako pakete bat ezin da instalatu:\n"
"%s"
-#: ../urpmi:534
-#, fuzzy, c-format
+#: ../urpmi:535
+#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"Ezin da instalazioarekin jarraitu, honako paketea\n"
+"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"Ezin da instalazioarekin jarraitu, honako paketeak\n"
-"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
-"%s\n"
-msgstr[1] ""
+msgstr ""
"Ezin da instalazioarekin jarraitu, honako paketeak\n"
"kendu egin behar direlako, beste batzuen bertsioa berritzeko:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Pakete hauek kendu egin behar dira besteak berritzeko:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(froga soilik, ezabaketa ez da egingo)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2192,106 +2220,117 @@ msgstr ""
"Root-a izan behar duzu ondoko mendekotasunak instalatzeko:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(froga soilik, instalazioa ez da egingo)"
-#: ../urpmi:594
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "%d paketeen instalazioarekin jarraitu? (%d MB)"
msgstr[1] "%d paketeen instalazioarekin jarraitu? (%d MB)"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Prest zaudenean sakatu Sartu..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Utzi"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Ondoko pakete hauek sinadura okerra dute"
-msgstr[1] "Ondoko pakete hauek sinadura okerra dute"
+msgstr "Ondoko pakete hauek sinadura okerra dute"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Ondoko pakete hauek sinadura okerra dute"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Instalatzen jarraitu nahi duzu?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazioak huts egin du"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "%s banatzen"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "%s %s-tik instalatzen"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s instalatzen"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalazioak huts egin du"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Mendekotasunak egiaztatu gabe saiatu nahi duzu instalatzen? (b/E) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Indar handiagoz instalatzen saiatu (--force)? (b/E) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instalazio transakzioek huts egin dute"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instalazio transakzioek huts egin dute"
+msgstr[1] "%d instalazio transakzioek huts egin dute"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalazioa posible da"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Dena dago instalatuta"
-msgstr[1] "Dena dago instalatuta"
+msgstr "Dena dago instalatuta"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Dena dago instalatuta"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Dena dago instalatuta"
-msgstr[1] "Dena dago instalatuta"
+msgstr "Dena dago instalatuta"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Dena dago instalatuta"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi berrabiarazten"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2303,16 +2342,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"Erabilera: urpmi.addmedia [aukerak] <izena> <url> [with <bide-erlatiboa>] \n"
+"Erabilera: urpmi.addmedia [aukerak] <izena> <url>\n"
"non <url> hauetako bat den\n"
-" [file:/]/<bide-izena> with <hdlist-en fitxategi-izen erlatiboa>\n"
-" ftp://<erabiltzaile-izena>:<pasahitza>@<ostalaria>/<bide-izena> with "
-"<hdlist-en fitxategi-izen erlatiboa>\n"
-" ftp://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
-"erlatiboa>\n"
-" http://<ostalaria>/<bide-izena> with <hdlist-en fitxategi-izen "
-"erlatiboa>\n"
-" removable://<bide-izena> with <hdlist-en fitxategi-izen erlatiboa>\n"
+" [file:/]/<bide-izena>\n"
+" ftp://<erabiltzaile-izena>:<pasahitza>@<ostalaria>/<bide-izena>\n"
+" ftp://<ostalaria>/<bide-izena>\n"
+" http://<ostalaria>/<bide-izena>\n"
+" removable://<bide-izena>\n"
"\n"
"eta [aukerak] hemengoak diren\n"
@@ -2340,11 +2376,10 @@ msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
msgstr ""
#: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
msgstr ""
-" --no-probe - ez saiatu laburpenik edo hdlist "
-"fitxategirik bilatzen\n"
+" --no-probe - ez saiatu laburpenik edo hdlist fitxategirik bilatzen\n"
#: ../urpmi.addmedia:61
#, c-format
@@ -2398,17 +2433,17 @@ msgstr " --nopubkey - ez inportatu erantsitako euskarrien gako-publikoa\n"
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - erantsi euskarria konfig-en, baino ez eguneratu.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - garbitu goiburuen cache direktorioa.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modu lasaia.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - modu berritsua.\n"
@@ -2546,9 +2581,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr ""
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "- %s ezabatuta dago\n"
+msgstr[1] "- %s ezabatuta dago\n"
#: ../urpmi.recover:82
#, c-format
@@ -2606,12 +2643,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"Erabilera: urpmi.removemedia [-a] <izena> ...\n"
+"Erabilera: urpmi.removemedia (-a | <izena> ...)\n"
"non <izena> kendu beharreko euskarri-izena den.\n"
#: ../urpmi.removemedia:41
@@ -2673,27 +2710,35 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - ez eguneratu, markatu euskarria gaitu gisa.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - ez saiatu laburpenik edo hdlist "
+"fitxategirik bilatzen\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - euskarri ez-aldagarri guztiak hautatzen ditu.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist fitxategiak sortzera behartzen du.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Supererabiltzaileak soilik dauka euskarriak eguneratzeko baimena"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"ez dago eguneratzeko ezer (erabili urpmi.addmedia euskarria gehitzeko)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2702,23 +2747,23 @@ msgstr ""
"eguneratu beharreko sarrera falta da\n"
"(%s(e)tako bat\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "%s euskarria baztertzen"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "%s euskarria gaitzen"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2728,7 +2773,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq %s bertsioa\n"
-"Copyright © 2000-2005 Mandriva.\n"
+"Copyright © 2000-2006 Mandriva.\n"
"Hau software askea da eta birbanatu egin daiteke GNU GLParen baldintzak "
"betetzen badira.\n"
"\n"
@@ -2822,73 +2867,74 @@ msgstr " --changelog - changelog inprimatzen du.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - laburpena inprimatu.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - paketeak behar duenaren alderantzizko bilaketa.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - alderantzizko bilaketa hedatua (alegiazko paketeak "
+"barne).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - bilatu 'provides'-en paketeak aurkitzeko.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - osatu irteera kendu behar den paketearekin.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - kontsulta paketeen mendekoetara zabaltzen du.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - taldeak ere izenarekin inprimatzen ditu.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - informazio erabilgarria pertsonek irakurtzeko moduan inprimatzen "
"du.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketeko fitxategiak zerrendatzen ditu.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - ez bilatu 'provides'-en paketeak aurkitzeko "
-"(lehenetsia).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - bilatu 'provides'-en paketeak aurkitzeko.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - modu lasaia.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - bertsioa eta argitalpena ere izenarekin inprimatzen "
"ditu.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - paketeak behar duenaren alderantzizko bilaketa.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - alderantzizko bilaketa hedatua (alegiazko paketeak "
-"barne).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - hurrengo paketea iturburu-pakete bat da (--src bezala).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2896,61 +2942,85 @@ msgid ""
msgstr ""
"-u - paketea kentzen du bertsio berriagoa instalatuta badago.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - inposatu hurbilketazko bilaketa (--fuzzy bezala).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y bezala, baino ez ditu hizki larri/xeheak "
"desberdinduko.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" komando-lerroan idatzitako izenak edo rpm fitxategiak kontsultatu dira.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--nodo-zerrendak honekin bakarrik erabil daitezke: --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
+"izan du emaitzarik itzuli\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ez da fitxategi-zerrenda aurkitu\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Oharra: bilatutako euskarriek ez dutenez hdlists erabiltzen, urpmf-ek ezin "
+"izan du emaitzarik itzuli\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ez da aldaketa-erregistroa aurkitu\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Ez da fitxategi-zerrenda aurkitu\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Mendekotasunak asetzeko, ondoko %d paketeak ezabatu egingo dira (%d MB)"
+
#, fuzzy
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "%d paketeen instalazioarekin jarraitu? (%d MB)"
+#~ msgstr[1] "%d paketeen instalazioarekin jarraitu? (%d MB)"
+
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d pakete, %d MB)"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] "Mendekotasunak asetzeko, ondorengo paketea instalatuko da"
-#~ msgstr[1] "Mendekotasunak asetzeko, ondorengo paketea instalatuko da"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - ez bilatu 'provides'-en paketeak aurkitzeko "
+#~ "(lehenetsia).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - paketeak behar duenaren alderantzizko bilaketa.\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2960,14 +3030,6 @@ msgstr "Ez da aldaketa-erregistroa aurkitu\n"
#~ "Mendekotasunak asetzeko, ondoko %d paketeak instalatuko dira:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-#~ msgstr[1] "Mendekotasunak asetzeko, ondoko paketeak instalatuko dira:"
-
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "saltatu %s euskarria: hdlist falta da"
diff --git a/po/fa.po b/po/fa.po
index 6179c510..e38e1904 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fa\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-02-06 08:42-0500\n"
"Last-Translator: \n"
"Language-Team: <en@li.org>\n"
@@ -20,7 +20,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "نصب RPM"
@@ -30,7 +30,7 @@ msgstr "نصب RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_تأیید"
@@ -96,7 +96,7 @@ msgstr "_نصب"
msgid "_Save"
msgstr "_ذخیره"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_لغو"
@@ -106,29 +106,29 @@ msgstr "_لغو"
msgid "Choose location to save file"
msgstr "مکان ذخیره‌ی پرونده را انتخاب کنید"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"گزینه‌های ناشناخته '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "هیچ بسته‌ای با نام %s"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "لطÙاً صبر کنید..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "باید مدیر باشید"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "هشدار"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "تایید"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (ارتقاء دادن)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (نصب کردن)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "یکی از بسته‌های بدنبال آمده لازم است:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_ترک"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,40 +185,45 @@ msgstr ""
"%s\n"
"ادامه میدهید؟"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
+msgstr "برای ارضای وابستگی‌ها، بسته‌ی بدنبال آمده نصب خواهد شد (%d مگابایت)"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(بسته‌های %d، %d مگابایت)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "نصب بسته..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "نمب‌توان بسته های منبع را دریاÙت کرد، پایان داده می‌شود"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "لطÙاً رسانه‌ی بنام \"%s\" بر دستگاه [%s] را داخل نمایید"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "بارگیری بسته `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -231,7 +236,7 @@ msgstr ""
"\n"
"آیا می‌خواهید نصب را ادامه دهید؟"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -242,37 +247,37 @@ msgstr ""
"%s\n"
"بهتر است بانک اطلاعات urpmi را بروزسازی نمایید"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "برداشتن %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "در حال آماده کردن..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "نصب بسته `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_انجام شد"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "نصب شکست خورد"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "همه چیز قبلاً نصب شده است"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "نصب پایان یاÙت"
@@ -321,63 +326,63 @@ msgstr "Ùقط کاربر برتر برای نصب بسته‌ها مجاز Ù…ÛŒ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "نمی‌توان rpmdb را باز کرد"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "نام پرونده rpm نامعتبر [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "در حال دریاÙت پرونده‌ی rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...دریاÙت انجام گرÙت"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...دریاÙت شکست خورد: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "نمی‌توان به پرونده rpm [%s] دسترسی یاÙت"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "نمی‌توان \"%s\" را در پرونده [%s] تجزیه کرد"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "نمی‌توان پرونده rpm را بایگانی کرد"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "خطا در بایگانی کردن بسته‌های محلی"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -397,27 +402,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "برای استÙاده از این Ùرمان باید مدیر باشید ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: نمی‌توان پرونده rpm \"%s\" را خواند\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
@@ -442,7 +447,7 @@ msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "نمی‌توان پرونده‌ی تنظیم [%s] را نوشت"
@@ -460,7 +465,7 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "واژه‌ی رمز:"
#: ../urpm/download.pm:185
#, c-format
@@ -572,7 +577,7 @@ msgstr "چندین بسته با نام پرونده rpm یکسان \"%s\" وجÙ
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "نمی توان بدرستی [%s] را بر ارزش \"%s\" تجزیه کرد"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -684,9 +689,9 @@ msgid "No base defined"
msgstr "هیچ بسته‌ای با نام %s"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "نمی‌توان مدخلهای نقشه‌رنگ را تخصیص داد"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -708,7 +713,7 @@ msgstr "هشدار: md5sum برای %s در پرونده MD5SUM وجود نداØ
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "حساب کردن md5sum برای hdlist منبع موجود (یا ترکیب)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -717,107 +722,107 @@ msgstr ""
"رسانه‌ی مجازی \"%s\" نباید سرلیست یا پرونده‌ی لیست را تعری٠می‌کرد، رسانه "
"نادیده گرÙته می‌شود"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"رسانه مجازی \"%s\" باید یک نشانی درست داشته باشد، رسانه نادیده گرÙته می‌شود"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "نام پرونده rpm نامعتبر [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "نمی‌توان پرونده لیست را برای \"%s\" پیدا کرد، رسانه نادیده گرÙته می‌شود"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "ساختن پرونده ترکیب hdlist برای رسانه \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "نمی‌توان به پرونده hdlist \"%s\" دسترسی یاÙت، رسانه نادیده گرÙته می‌شود "
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "نمی‌توان پرونده hdlist \"%s\" را تجزیه کرد"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"رسانه‌ی \"%s\" سعی می‌کند تا از لیست قبلاً استÙاده شده hdlist استÙاده کند، "
"نادیده‌گیری رسانه"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"رسانه \"%s\" تلاش می‌کند تا از یک لیست استÙاده شده استÙاده کند، رسانه نادیده "
"گرÙته می‌شود"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "تلاش برای گذشتن از کنار رسانه‌ی موجود \"%s\", پرهیز"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "نقاط سوارسازی بیش از اندازه برای رسانه قابل انتقال \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "پذیرش دستگاه‌های قابل انتقال مانند \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "رسانه \"%s\" یک تصویر ISO است، در حال اجرا سوار خواهد گردید"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "استÙاده از دستگاه قابل انتقال متÙاوت [%s] برای \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "نمی‌توان نام مسیر را برای رسانه قابل انتقال \"%s\" دریاÙت کرد"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "نگارش پرونده تنظیم [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "نمی‌توان از حالت موازی با حالت use-distrib استÙاده کرد"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "استÙاده از رسانه‌های مربوطه برای حالت موازی: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -826,144 +831,144 @@ msgstr ""
"--synthesis نمی‌تواند با --media, --excludemedia, --sortmedia, --update یا --"
"parallel استÙاده شود"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"توجه: چون هیچ رسانه‌ای با استÙاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "جستجو کردن با شروع در: %s پایان در: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "در حال اجرای دومین نوبت حساب کردن وابستگی‌ها\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "نادیده‌گیری بسته‌ی %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "بجای ارتقای بسته %s نصب خواهد شد"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "رسانه \"%s\" قبلاً وجود دارد"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "رسانه مجازی باید محلی باشد"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "خواندن سرآیندها از رسانه \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "برداشتن رسانه‌ی \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "نمی‌توان به اولین رسانه‌ی نصب دسترسی پیدا کرد"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "دریاÙت پرونده‌ی hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "نمی‌توان rpmdb را باز کرد"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ناتوان به دسترسی اولین رسانه‌ی نصب (هیچ پرونده‌ی hdlists دیسک پیدا شد)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "تلاش برای انتخاب رسانه‌ \"%s\" که وجود ندارد"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "انتخاب چندین رسانه ها: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "برداشتن رسانه‌ی \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "تنظیم مجدد urpmi برای رسانه \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...تنظیم مجدد شکست خورد"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "تنظیم مجدد انجام گردید"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "رسانه \"%s\" انتخاب نشده است"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "آزمایش پرونده hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "آزمایش پرونده ترکیب [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "ساختن hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -972,77 +977,77 @@ msgstr ""
"نمیتوان پرونده تجزیه را برای رسانه \"%s\" ساخت. پرونده hdlist شما ممکن است "
"خراب باشد."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "مشکل در خواندن سرلیست یا پرونده‌ی ترکیب رسانه‌ی \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...کپی کردن شکست خورد"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "کپی کردن پرونده‌ی توضیحات \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...کپی شد"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "کپی از [%s] شکست خورد (پرونده بطرز مشکوکی کوچک است)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "حساب کردن md5sum سرلیست منبع کپی شده (یا ترکیب)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "کپی کردن [%s] شکست خورد (عدم تطابق md5sum)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "حساب کردن md5sum از hdlist منبع دریاÙت شده (یا ترکیب)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...دریاÙت شکست خورد: عدم تطابق md5sum "
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "هیچ پرونده‌های rpm از [%s] پیدا نشد"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "خواندن پرونده‌های rpm از [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "نمی‌توان پرونده‌های rpm را از [%s] خواند: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "هیچ rpms خوانده نشد"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1053,78 +1058,78 @@ msgstr ""
"این می‌تواند در صورتی که شما شاخه را هنگام ایجاد رسانه دستی سوار کرده باشید "
"اتÙاق بیاÙتد."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یاÙت شد"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "دریاÙت hdlist منبع (یا ترکیب) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist (یا ترکیب) شناسایی شده مانند %s یاÙت شد"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "هیچ پرونده‌ی hdlist برای رسانه \"%s\" یاÙت شد"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "در حال آزمایش پرونده کلید عمومی \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...در حال وارد کردن کلید %s از پرونده کلیدعمومی \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "نمی‌توان پرونده کلید عمومی \"%s\" را وارد کرد"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "نگارش پرونده لیست برای رسانه \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "رسانه اضاÙÙ‡ شده %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "نمی‌توان پرونده hdlist \"%s\" را تجزیه کرد"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "مشکل در خواندن پرونده‌ی ترکیب رسانه‌ی \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "خواندن سرآیندها از رسانه \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnخنoO"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyبfF"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "متأسÙÙ…ØŒ انتخاب بد، دوباره امتحان کنید\n"
@@ -1160,8 +1165,8 @@ msgid "unmounting %s"
msgstr "پیاده کردن %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "رسانه \"%s\" انتخاب نشده است"
#: ../urpm/removable.pm:143
@@ -1179,47 +1184,47 @@ msgstr "رسانه بی‌ارتباط \"%s\" قابل انتقال نشان دØ
msgid "unable to access medium \"%s\""
msgstr "نمی‌توان به رسانه \"%s\" دسترسی پیدا کرد"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "هیچ بسته‌ای با نام %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "بدلیل عدم وجود %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "بدلیل عدم رضایت %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "تلاش برای ترÙیع %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "برای نگهداشتن %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "برای نصب %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "بدلیل اختلا٠با %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "خواسته نشده"
@@ -1240,7 +1245,7 @@ msgid "Missing signature (%s)"
msgstr "عدم وجود امضا (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1250,7 +1255,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpme version %s\n"
-"Copyright © 1999-2005 Mandriva.\n"
+"Copyright © 1999-2006 Mandriva.\n"
"این نرم‌اÙزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
"\n"
"طرز استÙاده:\n"
@@ -1325,9 +1330,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - تلاش برای پیدا کردن Ùˆ استÙاده از پرونده‌ی hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - حالت لغتی.\n"
+msgstr " --verbose, -v - حالت لغتی.\n"
#: ../urpme:58
#, c-format
@@ -1364,24 +1369,30 @@ msgstr "هیچ چیزی برای برداشتن"
msgid "Checking to remove the following packages"
msgstr "در حال بررسی برای برداشتن بسته‌های بدنبال آمده"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد (%d مگابایت)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d مگابایت)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "برداشتن بسته %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "برداشتن بسته %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "برداشتن شکست خورد"
@@ -1397,7 +1408,7 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf version %s\n"
-"Copyright © 2002-2004 Mandriva.\n"
+"Copyright © 2002-2006 Mandriva.\n"
"این نرم‌اÙزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
"\n"
"طرز استÙاده:\n"
@@ -1636,7 +1647,7 @@ msgstr " --verbose - حالت لغتی.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - پرونده‌های در بسته را Ùهرست می‌کند\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - چاپ نسخه، انتشار و ساختار با نام.\n"
@@ -1646,12 +1657,12 @@ msgstr " -f - چاپ نسخه، انتشار Ùˆ ساختار با Ù
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "استÙاده از محیط مشخص بر %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1660,13 +1671,13 @@ msgstr ""
"توجه: چون هیچ رسانه‌ای با استÙاده از hdlists جستجو نگردید، urpmf قادر نبود "
"نتیجه‌ای را بازگرداند\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "ممکن است بخواهید از -name برای جستجوی نام‌های بسته استÙاده کنید.\n"
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1676,7 +1687,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmi version %s\n"
-"Copyright © 1999-2005 Mandriva.\n"
+"Copyright © 1999-2006 Mandriva.\n"
"این نرم‌اÙزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
"\n"
"طرز استÙاده:\n"
@@ -1708,14 +1719,14 @@ msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - انتخاب بطور خودکار بسته‌ها برای ارتقای سیستم.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
+msgstr " --no-md5sum - بررسی MD5SUM پرونده را از کار می‌اندازد.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - اجبار بروزسازی کلید gpg.\n"
+msgstr " --force-key - اجبار بروزسازی کلید gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1957,7 +1968,7 @@ msgstr " --noclean - نگهداری rpm استÙاده نشده در حاÙ
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - Ùقط بسته‌های با ساختار یکسان ارتقاء داده شوند.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - انتخاب همه مطابقت‌ها بر خط Ùرمان.\n"
@@ -1973,9 +1984,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - جستجو در عرضه‌ها برای یاÙتن بسته نشود.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - حالت ساکت.\n"
+msgstr " --quiet, -q - حالت ساکت.\n"
#: ../urpmi:157
#, c-format
@@ -2028,61 +2039,68 @@ msgstr ""
"خطا: %s بنظر میرسد بطور Ùقط-خوانش سوار شده است.\n"
"از --allow-force برای اجبار عملیات استÙاده گردد."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ارتقاء دادن)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ارتقاء دادن)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (نصب کردن)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (نصب کردن)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "انتخاب شما چه است؟ (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"بسته‌های بدنبال آمده نمی‌توانند نصب گردند برای اینکه آنها بر بسته‌های دیگر "
+"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
+msgstr ""
"بسته‌های بدنبال آمده نمی‌توانند نصب گردند برای اینکه آنها بر بسته‌های دیگر "
"بستگی داشته که کهنه تر از بسته‌های نصب شده هستند:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "در هر حال ادامه می‌دهید؟"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -2092,46 +2110,65 @@ msgstr " (Y/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
+"%s"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] ""
+msgstr ""
"بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"نصب نمی‌تواند ادامه یابد چرا که بسته‌های بدنبال آمده \n"
+"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
+msgstr ""
"نصب نمی‌تواند ادامه یابد چرا که بسته‌های بدنبال آمده \n"
"باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند: \n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
+"%s"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] ""
+msgstr ""
"بسته‌های بدنبال آمده باید برداشته شوند تا بسته‌های دیگر بتوانند ارتقا یابند:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2140,102 +2177,115 @@ msgstr ""
"برای نصب وابستگی‌های بدنبال آمده شما باید مدیر سیستم باشید:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "وقتی آماده‌اید ورود را Ùشار دهید..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "لغو"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "بسته‌های بدنبال آمده امضاهای بد دارند"
+msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "بسته‌های بدنبال آمده امضاهای بد دارند"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "آیا می‌خواهید نصب را ادامه دهید؟"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "نصب شکست خورد"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "انتشار دادن %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "نصب %s از %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "نصب %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "نصب شکست خورد"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "تلاش برای نصب بدون بررسی وابستگی‌ها؟ (y/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "تلاش برای نصب حتی قویتر (--force)؟ (y/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d معامله‌های نصب شکست خورد"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d معامله‌های نصب شکست خورد"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "نصب ممکن می‌باشد"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "همه چیز قبلاً نصب شده است"
+msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "همه چیز قبلاً نصب شده است"
+msgstr "همه چیز قبلاً نصب شده است"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "همه چیز قبلاً نصب شده است"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "راه‌اندازی دوباره‌ی urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2247,14 +2297,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"طرز استÙاده: urpmi.addmedia [گزینه‌ها] <name> <url> [with <relative_path>]\n"
+"طرز استÙاده: urpmi.addmedia [گزینه‌ها] <name> <url>\n"
"که <url> یکی از\n"
-" [file:/]/<path> with <relative filename of hdlist>\n"
-" ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-" ftp://<host>/<path> with <relative filename of hdlist>\n"
-" http://<host>/<path> with <relative filename of hdlist>\n"
-" removable://<path> with <relative filename of hdlist>\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
+" removable://<path>\n"
"\n"
"و [گزینه‌ها] هستند از\n"
@@ -2337,17 +2386,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - سرآیندهای شاخه حاÙظه پنهان را پاک می‌کند.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - حالت ساکت.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - حالت لغتی.\n"
@@ -2405,7 +2454,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "نمی‌توان رسانه \"%s\" را ایجاد کرد\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2414,8 +2463,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpme version %s\n"
-"Copyright © 1999-2005 Mandriva.\n"
+"urpmi.recover version %s\n"
+"Copyright © 2006 Mandriva.\n"
"این نرم‌اÙزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
"\n"
"طرز استÙاده:\n"
@@ -2479,9 +2528,10 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr ""
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "- %s برداشته شده است\n"
#: ../urpmi.recover:82
#, c-format
@@ -2539,12 +2589,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"طرز استÙاده: urpmi.removemedia [-a] <name> ...\n"
+"طرز استÙاده: urpmi.removemedia (-a | <name> ...)\n"
"که <name> نام رسانه‌ی برای برداشتن می باشد.\n"
#: ../urpmi.removemedia:41
@@ -2610,27 +2660,35 @@ msgstr ""
"گردد.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - تلاش برای یاÙتن هیچ پرونده‌ی ترکیب یا\n"
+" hdlist نشود.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - انتخاب همه رسانه‌های غیر قابل انتقال.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - اجبار تولید پرونده‌های hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Ùقط کاربر مدیر برای بروزسازی رسانه مجاز است"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"هیچ چیز برای بروزسازی (استÙاده از urpmi.addmedia برای اضاÙÙ‡ کردن یک رسانه)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2639,23 +2697,23 @@ msgstr ""
"ورودی برای بروزسازی وجود ندارد\n"
"(یکی از %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "نادیده‌گیری رسانه‌ی %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "بکار انداختن رسانه‌ی %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2665,7 +2723,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq version %s\n"
-"Copyright © 2000-2005 Mandriva.\n"
+"Copyright © 2000-2006 Mandriva.\n"
"این نرم‌اÙزار آزاد است ممکن است تحت شرایط GNU GPL پخش مجدد گردد.\n"
"\n"
"طرز استÙاده:\n"
@@ -2751,64 +2809,68 @@ msgstr " --changelog - چاپ ثبت تغییرات.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - برچسب خلاصه‌ی چاپ: خلاصه.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p -درعرضه‌ها برای یاÙتن بسته جستجو شود\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - تکمیل بیرون‌ریز با بسته‌ای که برداشته می‌شود.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - پرسش گسترده برای وابستگی‌های بسته.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - چاپ گروه‌ها با نام.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - اطلاعات Ù…Ùید را به زبان آدمیزاد چاپ می‌کند.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - پرونده‌های در بسته را Ùهرست می‌کند\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P -در عرضه‌ها برای یاÙتن بسته جستجو نشود (پیش‌Ùرض).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p -درعرضه‌ها برای یاÙتن بسته جستجو شود\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - حالت ساکت.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - چاپ نسخه و انتشار با نام.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - بسته‌ی بعدی یک بسته‌ی منبع (مانند --src) می‌باشد.\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2816,49 +2878,71 @@ msgid ""
msgstr ""
" -u - برداشتن بسته اگر یک نسخه‌ی جدیدتر قبلاً نصب شده است.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - تحمیل جستجوی Ùازی (همانند --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - مانند -y, ولی اجبار تطابق کازه اعمال می‌شود.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "نام‌ها یا پرونده‌های داده شده بر خط Ùرمان مورد تردید می‌باشند.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes Ùقط می‌توانند با --parallel استÙاده شود"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"توجه: چون هیچ رسانه‌ای با استÙاده از hdlists جستجو نگردید، urpmf قادر نبود "
+"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "هیچ لیست پرونده‌ای یاÙت نشد\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"توجه: چون هیچ رسانه‌ای با استÙاده از hdlists جستجو نگردید، urpmf قادر نبود "
+"نتیجه‌ای را بازگرداند\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "هیچ ثبت تغییری یاÙت نشد\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "هیچ لیست پرونده‌ای یاÙت نشد\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "برای ارضای وابستگی‌ها، %dبسته‌های بدنبال آمده برداشته خواهند شد (%d مگابایت)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P -در عرضه‌ها برای یاÙتن بسته جستجو نشود (پیش‌Ùرض).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - جستجوی معکوس برای آنچه بسته را لازم دارد.\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
@@ -2867,34 +2951,6 @@ msgstr "هیچ ثبت تغییری یاÙت نشد\n"
#~ "برای ارضای وابستگیها, %d بسته بدنبال آمده نصب خواهند شد:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid "skipping media %s: no hdlist"
-#~ msgstr "نادیده گیری رسانه‌ی %s: هیچ hdlist\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "نصب شکست خورد"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "نصب بسته `%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "آزمایش پرونده ترکیب [%s]"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "انتشار دادن %s"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "نصب بسته..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "نصب بسته..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - تلاش برای یاÙتن Ùˆ استÙاده از پرونده ترکیب.\n"
@@ -2961,10 +3017,6 @@ msgstr "هیچ ثبت تغییری یاÙت نشد\n"
#~ " --norebuild - تلاشی برای بازخوانی hdlist اگر قابل خواندن نیست "
#~ "نگردد.\n"
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "بسته‌های بدنبال آمده حاوی %s: %s"
-
#~ msgid "copying hdlists file..."
#~ msgstr "در حال کپی کردن پرونده hdlists..."
@@ -3142,15 +3194,6 @@ msgstr "هیچ ثبت تغییری یاÙت نشد\n"
#~ "بعضی از بسته‌های خواسته شده نمی‌توانند نصب شوند:\n"
#~ "%s"
-#, fuzzy
-#~ msgid ""
-#~ " --keep - keep existing packages if possible, reject requested\n"
-#~ " packages that leads to remove.\n"
-#~ msgstr ""
-#~ " --keep - نگهداشتن بسته‌های موجود در صورت ممکن، عدم پذیرش "
-#~ "بسته‌هایی\n"
-#~ " که به برداشتن ختم می‌شود.\n"
-
#~ msgid "unable to write file [%s]"
#~ msgstr "نمی‌توان پرونده‌ی [%s] را نوشت"
diff --git a/po/fi.po b/po/fi.po
index bd62411f..8d108f17 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13,7 +13,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fi - Mandriva 2006 Release\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-09-13 20:47+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Finnish <fi@li.org>\n"
@@ -23,7 +23,7 @@ msgstr ""
"X-Generator: KBabel 1.10.2\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM asennus"
@@ -33,7 +33,7 @@ msgstr "RPM asennus"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -99,7 +99,7 @@ msgstr "_Asenna"
msgid "_Save"
msgstr "_Tallenna"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Peruuta"
@@ -109,29 +109,29 @@ msgstr "_Peruuta"
msgid "Choose location to save file"
msgstr "Valitse hakemisto johon tiedosto tallennetaan"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"tuntemattomat valitsimet '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Komentoa ei annettu"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Odota hetki..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Pitää olla pääkäyttäjä"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"%s\n"
"Jatketaanko?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Varoitus"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (päivitettävä)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (asennettava)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Pakettivalinta"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Yksi seuraavista paketeista tarvitaan:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Hylkää"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -188,41 +188,48 @@ msgstr ""
"%s\n"
"Jatketaanko?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan (%d Mt)"
-msgstr[1] "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan (%d Mt)"
+msgstr "Riippuvuuksien täyttämiseksi seuraava paketti asennetaan (%d Mt)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Riippuvuuksien täyttämiseksi seuraavat %d pakettia asennetaan :\n"
+"%s\n"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d pakettia"
+msgstr[1] "%d pakettia"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Pakettien asennus..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "lähteen paketteja ei saada, toiminto keskeytetään"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Aseta media nimeltään \"%s\" laitteeseen [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Ladataan pakettia `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -235,7 +242,7 @@ msgstr ""
"\n"
"Haluatko jatkaa asennusta?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,37 +253,37 @@ msgstr ""
"%s\n"
"Sinun kannattaisi päivittää urpmi-tietokanta"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "poistetaan %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Valmistellaan..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Asennetaan pakettia `%s' (%s / %s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Valmis"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Asennus epäonnistui"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Kaikki on jo asennettu"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Asennus on valmis"
@@ -325,63 +332,63 @@ msgstr "Vain pääkäyttäjä saa asentaa paketteja"
msgid "Running urpmi in restricted mode..."
msgstr "Suorita urpmi rajoitetussa tilassa..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpm-tietokantaa ei voitu avata"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "virheellinen rpm-tiedoston nimi [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "noudetaan rpm-tiedostoa [%s]..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...noudettu"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...nouto epäonnistui: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm-tiedostoa [%s] ei voitu käsitellä"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" ei voitu tulkita tiedostossa [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "rpm-tiedoston rekisteröinti ei onnistunut"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "virhe rekisteröitäessä paikallisia paketteja"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Tämä toiminto on kielletty kon ohjelma käytetään rajoitetussa tilassa"
@@ -401,27 +408,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Tarvitset pääkäyttäjän oikeudet tämän komennon käyttämiseen ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm-tiedostoa \"%s\" ei voida lukea\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "rakennetaan median \"%s\" hdlist synthesis -tiedosto"
@@ -446,7 +453,7 @@ msgstr "asetustiedostoon [%s] ei voitu kirjoittaa"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "asetustiedostoon [%s] ei voitu kirjoittaa"
@@ -454,17 +461,17 @@ msgstr "asetustiedostoon [%s] ei voitu kirjoittaa"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Syötä tunnistetietojasi välityspalvelimen käyttämiseen\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Käyttäjänimi:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Salasana:"
#: ../urpm/download.pm:185
#, c-format
@@ -576,7 +583,7 @@ msgstr "löytyy useita paketteja joilla on sama rpm-tiedostonimi \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "kohtaa [%s] arvolla \"%s\" ei voitu tulkita"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "median \"%s\" list-tiedostoa ei voida käyttää, media ohitettu"
@@ -688,9 +695,9 @@ msgid "No base defined"
msgstr "Komentoa ei annettu"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Palvelimeen ei saatu yhteyttä"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -713,7 +720,7 @@ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr ""
"lasketaan md5sum olemassa olevalle lähde-hdlist- tai -synthesis-tiedostolle"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -722,105 +729,105 @@ msgstr ""
"virtuaalisella medialla \"%s\" ei pitäisi olla määriteltynä hdlist- tai list-"
"tiedostoa, media ohitettu"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"virtuaalisella medialla \"%s\" pitäisi olla kunnollinen url, media ohitettu"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "virheellinen rpm-tiedoston nimi [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "kohteelle \"%s\" ei löytynyt list-tiedostoa, media ohitettu"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "yritettiin valita media \"%s\" jota ei ole olemassa"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "rakennetaan median \"%s\" hdlist synthesis -tiedosto"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "median \"%s\" hdlist-tiedostoa ei voida käyttää, media ohitettu"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "hdlist-tiedostoa \"%s\" ei voitu tulkata"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"media \"%s\" yrittää käyttää jo käytettyä hdlist-tiedostoa, media ohitettu"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"media \"%s\" yrittää käyttää jo käytettyä list-tiedostoa, media ohitettu"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "yritetään ohittaa olemassa olevaa mediaa \"%s\", vältetään"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "liian monta liitospistettä siirrettävälle medialle \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "käytetään siirrettävää laitetta kohteena \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Media \"%s\" on ISO kuvatiedosto, liitetään automaattisesti"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "käytetään toista siirrettävää laitetta [%s] kohteelle \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "siirrettävän median \"%s\" polkua ei voitu noutaa"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "kirjoitetaan asetustiedosto [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "rinnakkaistilaa ei voi käyttää use-distrib-tilan kanssa"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "merkittyjä medioita käytetään rinnakkaistilassa: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -829,145 +836,145 @@ msgstr ""
"--synthesis ei voi käyttää yhdessä --media, --excludemedia, --sortmedia, --"
"update tai --parallel kanssa"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
"voinut palauttaa yhtään tulosta.\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Haun alku: %s loppu: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "suoritetaan toinen kierros riippuvuuksien laskemiseksi\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "ohitetaan paketti %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "paketti %s asennettaisiin päivittämisen sijaan"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" on jo olemassa"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuaalisen median on oltava paikallinen"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "luetaan otsikkotietoja medialta \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "poistetaan media \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ensimmäistä asennusmediaa ei voitu käyttää"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "noudetaan hdlists-tiedostoa..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpm-tietokantaa ei voitu avata"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ensimmäistä asennusmediaa ei voitu käyttää (hdlists-tiedostoa ei löytynyt)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "yritettiin valita media \"%s\" jota ei ole olemassa"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "valitaan useampi media: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "poistetaan media \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "uudelleenasetetaan urpmi medialle \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...uudelleenasetus epäonnistui"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "uudelleenasetus tehty"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediaa \"%s\" ei ole valittu"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "tutkitaan hdlist-tiedostoa [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "tutkitaan synthesis-tiedostoa [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "rakennetaan hdlist-tiedostoa [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -976,78 +983,78 @@ msgstr ""
"Synthesis tiedoston luonti medialle \"%s\" ei onnistu. Hdlist tiedostosi voi "
"olla virheellinen."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "ongelmia luettaessa hdlist- tai synthesis-tiedostoa medialta \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiointi epäonnistui"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopioidaan \"%s\" kuvaustiedostoa..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiointi valmis"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "kirjoitetaan median \"%s\" list-tiedostoa"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopiointi epäonnistui (tiedosto on epäilyttävän pieni)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"lasketaan md5sum lähteestä kopioidulle hdlist- tai synthesis-tiedostolle"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopiointi epäonnistui (md5sum ei täsmää)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "lasketaan md5sum haetulle lähde-hdlist- tai -synthesis-tiedostolle"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...nouto epäonnistui: md5sum ei täsmää"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "rpm-tiedostoja ei löytynyt kohteesta [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "luetaan rpm-tiedostoja kohteesta [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "rpm-tiedostoja ei voitu lukea medialta [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "ei luettuja rpm"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1057,78 +1064,78 @@ msgstr ""
"mediaa \"%s\" ei voitu käyttää,\n"
"tämä voi johtua siitä että liitit hakemiston manuaalisesti kun loit median."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "hdlist-tiedostoa ei löytynyt medialta \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "haetaan lähteen hdlist (tai synthesis) kohteesta \"%s\""
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "löydettiin hdlist- tai synthesis-tiedosto nimellä %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "hdlist-tiedostoa ei löytynyt medialta \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "tarkistetaan median \"%s\" pubkey-tiedostoa..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...tuotu avain %s median \"%s\" pubkey-tiedostosta"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "median \"%s\" pubkey-tiedostoa ei voitu tuoda"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "kirjoitetaan median \"%s\" list-tiedostoa"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "media %s lisätty"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "hdlist-tiedostoa \"%s\" ei voitu tulkata"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "ongelmia luettaessa median \"%s\" synthesis-tiedostoa"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "luetaan otsikkotietoja medialta \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "EeNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "KkYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Valitan, virheellinen valinta, yritä uudelleen\n"
@@ -1164,8 +1171,8 @@ msgid "unmounting %s"
msgstr "irrotetaan %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "mediaa \"%s\" ei ole valittu"
#: ../urpm/removable.pm:143
@@ -1184,47 +1191,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "mediaa \"%s\" ei voitu käyttää"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ei pakettia nimeltä %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Seuraavat paketit sisältävät %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "puuttuvan %s takia"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "täyttämättömän %s takia"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "yritetään pakottaa %s valinta"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s säilyttämiseksi"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s asentamiseksi"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "johtuen ristiriidasta %s kanssa"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "ei pyydetty"
@@ -1330,9 +1337,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - yritä löytää ja käyttää hdlist-tiedostoa\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - yksityiskohtainen tyyli\n"
+msgstr " --verbose, -v - yksityiskohtainen tyyli\n"
#: ../urpme:58
#, c-format
@@ -1369,23 +1376,34 @@ msgstr "Ei mitään poistettavissa"
msgid "Checking to remove the following packages"
msgstr "Suoritetaan tarkistusta seuraavien pakettien poistamiseksi"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
+msgstr[1] ""
+"Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
+msgid " (%d MB)"
+msgstr " (%d Mt)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "poistetaan paketti %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "poistetaan paketti %s"
+msgstr[1] "poistetaan paketti %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (k/E) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Poisto epäonnistui"
@@ -1647,7 +1665,7 @@ msgstr " --verbose - yksityiskohtainen tyyli\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - listaa paketissa olevat tiedostot\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1659,12 +1677,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "käytetään määrättyä ympäristöä kohteelle %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1673,7 +1691,7 @@ msgstr ""
"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
"voinut palauttaa yhtään tulosta.\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Saatat haluta käyttää --name etsiäksesi pakettien nimistä.\n"
@@ -1721,14 +1739,14 @@ msgid " --auto-update - update media then upgrade the system.\n"
msgstr " --auto-select - valitse automaattisesti päivitettävät paketit\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
+msgstr " --no-md5sum - poista tiedostojen MD5SUM-tarkistus käytöstä\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - pakota gpg-avaimen päivitys\n"
+msgstr " --force-key - pakota gpg-avaimen päivitys\n"
#: ../urpmi:96
#, c-format
@@ -1979,7 +1997,7 @@ msgstr ""
" --strict-arch - päivitä ainoastaan saman arkitehtuuriin kuuluvia "
"paketteja.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - valitse kaikki komentoriviin täsmäävät\n"
@@ -1996,9 +2014,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - älä etsi tarjoaa-tiedoista paketin löytämiseksi\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - hiljainen tyyli\n"
+msgstr " --quiet, -q - hiljainen tyyli\n"
#: ../urpmi:157
#, c-format
@@ -2051,65 +2069,68 @@ msgstr ""
"Virhe: %s näyttää olevean liitettynä ainoastan lukuoikeuksilla.\n"
"Käytä --allow-force pakottaaksesi toiminnon."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (päivitettävä)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (päivitettävä)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (asennettava)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (asennettava)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Mikä on valintasi? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Seuraavat paketit ei voida asentaa koska ne riippuvat paketeista\n"
"joita ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"Seuraavat paketit ei voida asentaa koska ne riippuvat paketeista\n"
"joita ovat vanhempia kuin nykyhetkellä asennetut paketit:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Jatka joka tapauksessa?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (K/e) "
@@ -2119,56 +2140,65 @@ msgstr " (K/e) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Joitakin haluttuja paketteja ei voida asentaa:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Joitakin haluttuja paketteja ei voida asentaa:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Asennusta ei voida jatkaa koska seuraavat paketit on poistettava\n"
"jotta toiset voidaan päivittää:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Asennusta ei voida jatkaa koska seuraavat paketit on poistettava\n"
"jotta toiset voidaan päivittää:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Seuraavat paketit on poistettava jotta toiset voidaan päivittää:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2177,106 +2207,117 @@ msgstr ""
"Sinun pitää olla pääkäyttäjänä asentaaksesi seuraavat riippuvuudet:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Paina Enter kun olet valmis..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Peruuta"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Seuraavissa paketeissa on virheelliset allekirjoitukset"
-msgstr[1] "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Seuraavissa paketeissa on virheelliset allekirjoitukset"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Haluatko jatkaa asennusta?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Asennus epäonnistui"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "levitetään %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "asennetaan %s kohteesta %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "asennetaan %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Asennus epäonnistui"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Yritetään asentaa ilman riippuvuuksia? (k/E) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Yritetään asentaa pakolla (--force)? (k/E) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d asennustoimintoa epäonnistui"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d asennustoimintoa epäonnistui"
+msgstr[1] "%d asennustoimintoa epäonnistui"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Asennus on mahdollinen"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Kaikki on jo asennettu"
-msgstr[1] "Kaikki on jo asennettu"
+msgstr "Kaikki on jo asennettu"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Kaikki on jo asennettu"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Kaikki on jo asennettu"
-msgstr[1] "Kaikki on jo asennettu"
+msgstr "Kaikki on jo asennettu"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Kaikki on jo asennettu"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "uudelleenkäynnistetään urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2288,15 +2329,13 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"käyttö: urpmi.addmedia [valitsimet] <nimi> <url> [with "
-"<suhteellinen_polku>]\n"
+"käyttö: urpmi.addmedia [valitsimet] <nimi> <url>\n"
"missä <url> on jokin seuraavista:\n"
-" [file:/]/<polku> with <hdlist-tiedoston suhteellinen polku>\n"
-" ftp://<käyttäjätunnus>:<salasana>@<kone>/<polku> with <hdlist-"
-"tiedoston suhteellinen polku>\n"
-" ftp://<kone>/<polku> with <hdlist-tiedoston suhteellinen polku>\n"
-" http://<kone>/<polku> with <hdlist-tiedoston suhteellinen polku>\n"
-" removable://<polku> with <hdlist-tiedoston suhteellinen polku>\n"
+" [file:/]/<polku>\n"
+" ftp://<käyttäjätunnus>:<salasana>@<kone>/<polku>\n"
+" ftp://<kone>/<polku>\n"
+" http://<kone>/<polku>\n"
+" removable://<polku>\n"
"\n"
"ja [valitsimet] ovat\n"
@@ -2378,17 +2417,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - lisää mediaa asetuksissa, mutta älä päivitä sitä.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - puhdista otsikkotietojen välimuistihakemisto\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - hiljainen tyyli\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - yksityiskohtainen tyyli\n"
@@ -2524,9 +2563,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr ""
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr ""
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "- %s poistettiin\n"
+msgstr[1] "- %s poistettiin\n"
#: ../urpmi.recover:82
#, c-format
@@ -2584,12 +2625,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"käyttö: urpmi.removemedia [-a] <nimi> ...\n"
+"käyttö: urpmi.removemedia (-a | <nimi> ...)\n"
"jossa <nimi> on poistettavan median nimi.\n"
#: ../urpmi.removemedia:41
@@ -2651,26 +2692,32 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - älä päivitä, merkitse media käyttössä.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr " --no-probe - älä yritä etsiä synthesis- tai hdlist-tiedostoa\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - valitse kaikki ei-siirrettävät mediat\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - pakota hdlist-tiedostojen luominen\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Vain pääkäyttäjä saa päivittää mediat"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ei mitään päivitettävää (käytä urpmi.addmedia lisätäksesi median)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2679,17 +2726,17 @@ msgstr ""
"Päivitettävä kohta puuttuu\n"
"(jokin seuraavista: %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "Hylätään media %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "otetaan käyttöön media %s"
@@ -2796,76 +2843,77 @@ msgstr " --changelog - tulosta muutosloki\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - tulosta yhteenveto.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+" --whatrequires - käänteinen etsiminen vaatii-tiedoista paketeissa\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - laajenna käänteinen etsiminen (sisällytä "
+"virituaalipaketit)\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - sallii etsimisen tarjoaa-tiedoista paketin "
+"löytämiseksi\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - täydellinen tuloste poistettavasta paketista\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - laajenna haku sisältämään pakettien riippuvuudet\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - tulosta ryhmät nimen lisäksi\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - tulosta hyödyllistä tietoa ihmisen luettavassa "
"muodossa\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - listaa paketissa olevat tiedostot\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - älä etsi tarjoaa-tiedoista paketin löytämiseksi "
-"(oletus)\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - sallii etsimisen tarjoaa-tiedoista paketin "
-"löytämiseksi\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - hiljainen tyyli\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - tulosta versio ja julkaisu nimen lisäksi\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-" -R - käänteinen etsiminen vaatii-tiedoista paketeissa\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - laajenna käänteinen etsiminen (sisällytä "
-"virituaalipaketit)\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - seuraava paketti on lähdekoodi-paketti (sama kuin --"
"src)\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2873,51 +2921,74 @@ msgid ""
msgstr ""
" -u - poista paketti jos uudempi versio on jo asennettu\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - käytä epätarkkaa hakua (sama kuin --fuzzy)\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - kuten -y mutta ei käytä kirjainkokoriippuvuutta\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " komentorivillä syötetyt nimet tai rpm-tiedostot etsitään.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes voi ainoastaan käyttää --parallel kanssa"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
+"voinut palauttaa yhtään tulosta.\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "tiedostolistaa ei löytynyt\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Huomio: koska yksikään etsitty media ei käytä hdlist-tiedostoja, urpmf ei "
+"voinut palauttaa yhtään tulosta.\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "muutoslokia ei löytynyt\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "tiedostolistaa ei löytynyt\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Riippuvuuksien täyttämiseksi seuraavat %d paketit poistetaan (%d Mt)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - älä etsi tarjoaa-tiedoista paketin löytämiseksi "
+#~ "(oletus)\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - käänteinen etsiminen vaatii-tiedoista paketeissa\n"
+
#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
diff --git a/po/fr.po b/po/fr.po
index 0ae1f9b1..b4f3567b 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -24,8 +24,8 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
-"PO-Revision-Date: 2007-02-06 22:27+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
+"PO-Revision-Date: 2007-03-19 16:28+0100\n"
"Last-Translator: Christophe Berthelé <cpjc@free.fr>\n"
"Language-Team: Français <cooker-i18n@mandrivalinux.org>\n"
"MIME-Version: 1.0\n"
@@ -34,7 +34,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2;plural=(n>1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "Installation du RPM"
@@ -44,7 +44,7 @@ msgstr "Installation du RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erreur : fichier %s introuvable, annulation de l'opération"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -113,7 +113,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Sauver"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Annuler"
@@ -123,27 +123,27 @@ msgstr "_Annuler"
msgid "Choose location to save file"
msgstr "Choisissez un emplacement pour enregistrer le fichier."
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Option « %s » inconnue"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Pas de paquetage spécifié"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Veuillez patienter ..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Vous devez être administrateur"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -154,42 +154,42 @@ msgstr ""
"%s\n"
"Continuer quand même l'installation ?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Attention"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (à mettre à jour)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (à installer)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Choix d'un paquetage"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Un des paquetages suivants est nécessaire :"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Abandonner"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -201,44 +201,48 @@ msgstr ""
"%s\n"
"Continuer quand même l'installation ?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
+msgstr ""
"Pour satisfaire les dépendances, le paquetage suivant va être installé :"
-msgstr[1] ""
-"Pour satisfaire les dépendances, les paquetages suivants vont être "
-"installés :"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Pour satisfaire les dépendances, les paquetages suivants vont être installés"
+
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d paquetages, %d Mo)"
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d paquetage, %d Mo)"
+msgstr[1] "(%d paquetages, %d Mo)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Installation du paquetage ..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "impossible de récupérer les paquetages de sources, abandon"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Veuillez insérer le média nommé « %s » dans le périphérique [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Téléchargement du paquetage %s ..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -251,7 +255,7 @@ msgstr ""
"\n"
"Voulez-vous continuer l'installation ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -262,37 +266,37 @@ msgstr ""
"%s\n"
"Vous devriez mettre à jour votre base de données urpmi."
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "désinstallation de %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Préparation ..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installation du paquetage « %s » (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Fini"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "L'installation a échoué"
+msgid "Installation failed:"
+msgstr "L'installation a échoué :"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Tous les paquetages sont déjà installés"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "L'installation est terminée"
@@ -343,65 +347,65 @@ msgstr "Seul l'administrateur système (root) peut installer des paquetages"
msgid "Running urpmi in restricted mode..."
msgstr "Exécution d'urpmi en mode restreint..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "impossible d'ouvrir la base de donnée rpm"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"il y a %d entêtes de paquetages dans le cache, suppression de %d entêtes "
"obsolètes"
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "le nom du fichier rpm est invalide [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "récupération des fichiers rpm [%s]..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "... récupération effectuée"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "... échec de la récupération : %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "impossible d'accéder au fichier rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "impossible d'analyser le fichier spec %s [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "impossible de référencer le fichier rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Architecture incompatible pour le paquetage [%s]"
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "erreur lors de l'inscription des paquetages locaux"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Cette opération est interdite en mode restreint"
@@ -421,27 +425,27 @@ msgstr "le répertoire chroot n'existe pas"
msgid "You need to be root to use --use-distrib"
msgstr "Vous devez être root pour utiliser l'option --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq : impossible de lire le fichier rpm « %s »\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr "Impossible d'utiliser %s sans %s"
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr "Impossible d'utiliser %s avec %s"
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr "Trop d'arguments\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "fichier de synthèse créé pour le média « %s »"
@@ -466,7 +470,7 @@ msgstr "impossible de lire le fichier de configuration [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "le média « %s » est défini deux fois, interruption"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "impossible d'écrire le fichier de configuration [%s]"
@@ -596,7 +600,7 @@ msgstr "il y a plusieurs paquetages avec le même nom de fichier « %s »"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "impossible d'analyser correctement [%s] pour la valeur « %s »"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "impossible d'accéder au fichier de liste de « %s », média ignoré"
@@ -682,7 +686,7 @@ msgstr "impossible d'installer le paquetage %s"
#: ../urpm/install.pm:180
#, c-format
msgid "removing installed rpms (%s) from %s"
-msgstr "désinstallation du paquetage installés (%s) de %s"
+msgstr "désinstallation des paquetages installés (%s) de %s"
#: ../urpm/install.pm:186
#, c-format
@@ -711,7 +715,7 @@ msgstr "Pas de base spécifiée"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr "Impossible de se connecter à l'uri ldap :"
#: ../urpm/lock.pm:50
@@ -734,7 +738,7 @@ msgstr "attention : le MD5 pour %s est indisponible dans le fichier MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "calcul de la somme MD5 de la source hdlist (ou synthesis) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -743,104 +747,104 @@ msgstr ""
"le média virtuel « %s » ne devrait pas avoir de liste de fichier ou de "
"hdlist, média ignoré"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "le média virtuel « %s » devrait avoir une url en clair, média ignoré"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "nom de fichier hdlist invalide"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "impossible de trouver le fichier liste de « %s », média ignoré"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "\"synthesis\" ne devrait pas être défini (média « %s »)"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" devrait être défini (média « %s »)"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "impossible d'accéder au fichier hdlist de « %s », média ignoré"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "impossible d'accéder au fichier liste de « %s »"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "le média « %s » essaye d'utiliser un hdlist déjà utilisé, média ignoré"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"le média « %s » essaye d'utiliser une liste déjà utilisée, média ignoré"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "tentative d'outrepasser un média existant « %s », non pris en compte"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "trop de points de montage pour le média amovible « %s »"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "périphérique amovible pris en tant que « %s »"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Le média « %s » est une image ISO, elle va être montée à la volée"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "utilisation de différents périphériques amovibles [%s] pour « %s »"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "impossible d'accéder au chemin du média amovible « %s »"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "écrit %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "le fichier de configuration [%s] a été écrit"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
"Le mode distribué ne peut pas être utilisé avec le mode « use-distrib »"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "utilisation du média associé pour le mode distribué : %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -849,148 +853,148 @@ msgstr ""
"--synthesis ne peut être utilisé avec --media, --excludemedia, --sortmedia, "
"--update, --use-distrib ou --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Note : aucun hdlist pour le média « %s » : impossible de retourner un "
"résultat"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Recherche début : %s fin : %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "seconde exécution pour calculer les dépendances\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "paquetage %s ignoré"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "effectuerait une installation plutôt qu'une mise à jour de %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "le média « %s » existe déjà"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "les médias virtuels doivent être locaux"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(ignoré par défaut)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ajout du média « %s » avant le média distant « %s »"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "ajout du médium « %s »"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "impossible de monter le média de distribution"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "cet emplacement ne semble pas contenir de distribution"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "récupération du fichier media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "impossible d'analyser media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"impossible d'accéder au média de distribution (pas de fichier media.cfg "
"trouvé)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "essai de sélection du média inexistant « %s »"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "sélection de plusieurs médias : %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "enlever le média « %s »"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfiguration de urpmi pour le média « %s »..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "... la reconfiguration a échoué"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguration effectuée"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erreur de génération de nom de fichiers : dépendance %d non trouvée"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Erreur de génération de nom de fichiers : impossible d'écrire dans le "
"fichier (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le média « %s » est à jour"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examen du fichier hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examen de la liste de synthèse [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "création du fichier hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -999,81 +1003,81 @@ msgstr ""
"Impossible de créer le fichier de synthèse pour le média « %s ». Votre "
"fichier hdlist est peut-être corrompu."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problème de lecture du fichier hdlist ou de synthèse du média « %s »"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "... copie impossible"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copie du fichier description de « %s »..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "... copie effectuée"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copie en cours [%s] pour le média « %s »..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "La copie de [%s] a échoué (le fichier est étrangement petit)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"calcul de la somme de contrôle MD5 du fichier hdlist copié (ou de synthèse)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "la copie de [%s] a échoué (sommes de contrôle MD5 différentes)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"calcul de la somme de contrôle MD5 du fichier hdlist (ou de synthèse) "
"téléchargé"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr ""
"... échec de la récupération : la somme de contrôle MD5 ne correspond pas"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "pas de fichier rpm trouvé pour [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lecture des fichiers rpm à partir de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "impossible de lire les fichiers rpm à partir de [%s] : %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "aucun rpms lu"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1084,78 +1088,78 @@ msgstr ""
"cela peut arriver si vous avez effectué un montage manuel lors de la "
"création du média."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fichier hdlist %s invalide pour le média « %s »"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "récupération du hdlist source (ou de synthèse) de « %s »..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist source (ou de synthèse) potentiel trouvé en tant que %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "pas de fichier hdlist trouvé pour le média « %s »"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examen du fichier de la clé publique de « %s »..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... clé %s importée à partir du fichier de la clé publique de « %s »"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "impossible d'importer le fichier de la clé publique de « %s »"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "écriture de la liste des fichiers pour le média « %s »"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "médium « %s » mis à jour"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "impossible d'analyser le fichier hdlist de « %s »"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problème de lecture du fichier de synthèse du média « %s »"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "lecture des en-têtes du média « %s »"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "OoYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Désolé, mauvais choix, veuillez réessayer\n"
@@ -1192,8 +1196,8 @@ msgstr "démontage de %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "le média « %s » n'est pas sélectionné"
+msgid "medium \"%s\" is not available"
+msgstr "le média « %s » n'est pas disponible"
#: ../urpm/removable.pm:143
#, c-format
@@ -1210,47 +1214,47 @@ msgstr "média incohérent « %s », marqué amovible mais sans l'être réell
msgid "unable to access medium \"%s\""
msgstr "impossible d'accéder au média « %s »"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Pas de paquetage nommé %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les paquetages suivants contiennent %s : %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "en raison du manque de %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "car %s est non satisfait"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "Tentative de promouvoir %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "afin de garder %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "pour installer le paquetage %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "en raison de conflit avec %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "non demandé"
@@ -1409,25 +1413,35 @@ msgstr "Rien à désinstaller"
msgid "Checking to remove the following packages"
msgstr "Vérification pour la désinstallation des paquetages suivants"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Pour satisfaire les dépendances, le paquetages suivant va être désinstallé"
+msgstr[1] ""
"Pour satisfaire les dépendances, les %d paquetages suivants vont être "
-"désinstallés (%d Mo)"
+"désinstallés"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d Mo)"
-#: ../urpme:134
+#: ../urpme:137
#, c-format
-msgid "Remove %d packages?"
-msgstr "Supprimer %d paquetages ?"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Supprimer %d paquetage ?"
+msgstr[1] "Supprimer %d paquetages ?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Échec de la désinstallation"
@@ -1695,7 +1709,7 @@ msgid " -m - the media in which the package was found\n"
msgstr ""
" -m - chercher dans le média où le paquetage a été trouvé\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1708,12 +1722,12 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Format incorrect : vous ne pouvez utiliser qu'une seule option multi-valeur"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "avec environnement spécifique sur %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1722,7 +1736,7 @@ msgstr ""
"Note : comme aucun des médias spécifiés n'utilise de hdlist, urpmf n'a pu "
"retourner de résultat\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Vous pouvez utiliser --name pour rechercher le nom d'un paquetage.\n"
@@ -2047,7 +2061,7 @@ msgstr ""
" --strict-arch - mettre à jour uniquement les paquetages avec la même\n"
" architecture.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2128,58 +2142,61 @@ msgstr ""
"Erreur : %s semble être monté en lecture seule.\n"
"Utilisez --allow-force afin de forcer l'opération."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Mise à jour des médias...\n"
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s : %s (à mettre à jour)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (à mettre à jour)"
-#: ../urpmi:443
+#: ../urpmi:441
#, c-format
msgid "%s: %s (to install)"
msgstr "%s :%s (à installer)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, c-format
msgid "%s (to install)"
msgstr "%s (à installer)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Que choisissez-vous ? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Le paquetage suivant ne peut pas être installé, car il dépend\n"
+"de paquetage qui sont plus anciens que la version installée :\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-"Le paquetage suivant ne peut pas être installé, car il dépent\n"
-"de paquetage qui sont plus ancien que la version installée :\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"Les paquetages suivants ne peuvent pas être installés, car ils dépendent\n"
"de paquetages qui sont plus anciens que les versions installées :\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2188,7 +2205,7 @@ msgstr ""
"\n"
"Désirez-vous tout de même continuer ?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (O/n) "
@@ -2198,58 +2215,67 @@ msgstr " (O/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Le paquetage demandé ne peut pas être installé :\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Certains paquetages demandés ne peuvent pas être installés :\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"La mise à jour ne peut pas continuer car le paquetage suivant\n"
"doit être désinstallé :\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"La mise à jour ne peut pas continuer car les paquetages suivants\n"
"doivent être désinstallés :\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Afin de poursuivre la mise à jour, le paquetage suivant doit être "
"désinstallé :\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Afin de poursuivre la mise à jour, les paquetages suivants doivent être "
"désinstallés :\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(test uniquement, la suppression ne sera pas effectuée)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2258,100 +2284,111 @@ msgstr ""
"Vous devez être root pour installer les dépendances suivantes :\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(test uniquement, l'installation ne sera pas effectuée)"
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Procéder à l'installation d'un paquetage ? (%2$d Mo)"
-msgstr[1] "Procéder à l'installation des %d paquetages ? (%d Mo)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Procéder à l'installation d'un paquetage ?"
+msgstr[1] "Procéder à l'installation des %d paquetages ?"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Appuyez sur la touche Entrée quand vous êtes prêt..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Annuler"
-#: ../urpmi:666
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Le paquetage suivant a une signature invalide"
-msgstr[1] "Les paquetages suivants ont des signatures non valides"
+msgstr "Le paquetage suivant a une signature invalide"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Les paquetages suivants ont des signatures non valides"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voulez-vous continuer l'installation ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "L'installation a échoué"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribution de %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "installation de %s depuis %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "installation de %s"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "L'installation a échoué :"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Essayer d'installer sans vérifier les dépendances ? (o/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Essayer de forcer l'installation (--force) ? (o/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transactions d'installation ont échoué"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transaction d'installation a échoué"
+msgstr[1] "%d transactions d'installation ont échoué"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "L'installation est possible"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Les paquetages sont à jour"
-#: ../urpmi:840
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Le paquetage %s est déjà installé"
-msgstr[1] "Les paquetages %s sont déjà installés"
+msgstr "Le paquetage %s est déjà installé"
-#: ../urpmi:843
+#: ../urpmi:839
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "Les paquetages %s sont déjà installés"
+
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Le paquetage %s ne peut être installé"
-msgstr[1] "Les paquetages %s ne peuvent être installés"
+msgstr "Le paquetage %s ne peut être installé"
+
+#: ../urpmi:843
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "Les paquetages %s ne peuvent être installés"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "Redémarrage de urpmi"
@@ -2466,17 +2503,17 @@ msgstr ""
" --raw - ajoute le média dans la configuration, mais sans le "
"mettre à jour.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - purger le répertoire cache des en-têtes.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mode silencieux.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - mode verbeux.\n"
@@ -2622,8 +2659,10 @@ msgstr "Vidage du répertoire cache des paquetages [%s]...\n"
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr "%d fichiers effacés\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d fichier effacé\n"
+msgstr[1] "%d fichiers effacés\n"
#: ../urpmi.recover:82
#, c-format
@@ -2751,25 +2790,34 @@ msgstr ""
#: ../urpmi.update:47
#, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --probe-rpms - ne pas utiliser hdlist/synthèse, mais les fichiers rpm "
+"directemment\n"
+
+#: ../urpmi.update:48
+#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - sélectionner tous les médias non amovibles\n"
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, c-format
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -f - forcer la génération des fichiers hdlist.\n"
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr ""
+" -f - forcer la mise à jour des fichiers hdlist/synthèse.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Seul l'administrateur système (root) peut mettre à jour un média"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "rien à mettre à jour (utiliser urpmi.addmedia pour ajouter un média)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2778,17 +2826,17 @@ msgstr ""
"l'entrée à mettre à jour est manquante\n"
"(un parmi %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "« %s »"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "média %s ignoré"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "activation du média %s"
@@ -2900,76 +2948,78 @@ msgstr " --changelog - afficher le changelog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - afficher le résumé.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+" --whatrequires - recherche inversée des items nécessitant ce paquetage.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - recherche inversée étendue (paquetages virtuels "
+"compris).\n"
+
+#: ../urpmq:90
+#, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" --whatprovides, -p\n"
+" - chercher dans les apports pour trouver le paquetage.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - sortie sur la ligne de commande avec les\n"
" noms des paquetages à désinstaller.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - étendre la requête aux dépendances du paquetage.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - afficher les groupes ainsi que les noms.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - afficher les informations utiles de manière plus "
"lisible.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lister les fichiers d'un paquetage.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - ne pas chercher dans les apports pour trouver un\n"
-" paquetage (par défaut).\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - chercher dans les apports pour trouver le paquetage.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -m - équivalent à -du.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - afficher la version détaillée ainsi que le nom.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-" -R - recherche inversée des items nécessitant ce paquetage.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - recherche inversée étendue (paquetages virtuels "
-"compris).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - le prochain paquetage est un paquetage de sources\n"
" (identique à --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2979,57 +3029,58 @@ msgstr ""
"déjà\n"
" installée.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - imposer la recherche floue (identique à --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - comme -y mais n'est pas sensible à la casse\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" les noms ou fichiers rpm indiqués sur la ligne de commande sont "
"interrogés.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes peut seulement être utilisé avec --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
+msgstr ""
"pas de hdlist pour le média « %s », uniquement un résultat partiel pour le "
"paquetage %s"
-msgstr[1] ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
"pas de hdlist pour le média « %s », uniquement un résultat partiel pour les "
"paquetages %s"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
+msgstr ""
"pas de hdlist pour le média « %s », impossible de retourner un résultat pour "
"le paquetage %s"
-msgstr[1] ""
-"pas de hdlist pour le média « %s », impossible de retourner un résultat pour "
-"les paquetages %s"
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "Aucune liste de fichiers n'a pu être trouvée\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"pas de hdlist pour le média « %s », impossible de retourner un résultat pour "
+"les paquetages %s"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Aucun Changelog trouvé\n"
diff --git a/po/fur.po b/po/fur.po
index 7f14a12a..8d5f44af 100644
--- a/po/fur.po
+++ b/po/fur.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-fur\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-05-21 14:55+0200\n"
"Last-Translator: Andrea Gracco <graccoandrea@tin.it>\n"
"Language-Team: Furlan <gft@freelists.org>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.3\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Instalazion dal pachet..."
@@ -29,7 +29,7 @@ msgstr "Instalazion dal pachet..."
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -95,7 +95,7 @@ msgstr "Instale"
msgid "_Save"
msgstr "Salve"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Scancele"
@@ -105,29 +105,29 @@ msgstr "_Scancele"
msgid "Choose location to save file"
msgstr "Sielç un puest dulà salvâ il file"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"opzions no cogniossudis '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nissun comant specificât"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Par plasè spiete."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -137,42 +137,42 @@ msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Avertence"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalazion Automatiche"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Al covente un di chiscj pachets:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, fuzzy, c-format
msgid "_Abort"
msgstr "Informazions"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,43 +182,48 @@ msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
+msgstr ""
"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-msgstr[1] ""
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
"Par sodisfâ les dipindincis, %d pachets e stan par sedi instalâts (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
+msgstr[1] ""
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Instalazion dal pachet..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "no rivi a recuperâ i pachets sorzint, o fermi"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Par plasè insede le font clamade \"%s\" te periferiche [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "O stoi scjariant il pachet '%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -232,7 +237,7 @@ msgstr ""
"\n"
"Vuelistu continuâ le instalazion?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -243,37 +248,37 @@ msgstr ""
"%s\n"
"Tu podaressis ve voe di atualizâ il to database urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "rimozion di %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "In preparazion..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalazion dal pachet `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "Fat"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalazion falade"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Al è dut dizà instalât"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalazion finide"
@@ -323,63 +328,63 @@ msgstr "Dome il superutent al po instalâ pachets"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "no rivi a vierzi il database rpm"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "non dal file rpm no valevul [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "o recuperi il file rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...copie finide"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...copie falade: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no rivi a acedi al file rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no rivi a analizâ \"%s\" tal file [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "no rivi a regjstrâ il file rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "fal te regjistrazion dai pachets locâi"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -399,27 +404,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Tu âs bisugne di sedi aministratôr par doprâ chest comant ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: no rivi a lei il file rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "o ai creât il file synthesis pe font \"%s\""
@@ -444,7 +449,7 @@ msgstr "no rivi a scrivi tal file di configurazion [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "no rivi a scrivi tal file di configurazion [%s]"
@@ -462,7 +467,7 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Password:"
#: ../urpm/download.pm:185
#, c-format
@@ -574,7 +579,7 @@ msgstr "a son plui pachets rpm cun il stes non di file \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "no rivi a analizâ coretementri [%s] par il valôr \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "no rivi a acedi al file de liste di \"%s\", font ignorade"
@@ -688,7 +693,7 @@ msgstr "Nissun comant specificât"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -711,7 +716,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "o calcoli md5sum dai file hdlist (o synthesis) esistints"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -720,102 +725,102 @@ msgstr ""
"le font virtuâl \"%s\" no a di ve un file hdlist o list, le font e vignarâ "
"ignorâde"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "le font virtuâl \"%s\" e a di vê un url clâr, font ignorade"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "non dal file rpm no valevul [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "no rivi a cjatâ il file de liste par \"%s\", font ignorade"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "o cîr di selezionâ une font che no esist \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "o ai creât il file synthesis pe font \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no rivi a acedi al file hdlist di \"%s\", font ignorade"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "no rivi a analizâ il file hdllist di \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "le font \"%s\" e cîr di doprâ une hdlist dizà in vore, font ignorade"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "le font \"%s\" e cîr di doprâ une liste dizà doprade, le ignori"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "o cîr di lassâ fûr le font esistint \"%s\", o eviti"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "e son masse ponts di mount pe font rimovibil \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "o consideri le font rimovibil sicu \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "o stoi doprant un diferent dispositîf rimovibil [%s] par \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "no rivi a recuperâ il percôrs pe font rimovibil \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "scrîf il file di configurazion [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "No rivi a doprâ le maniere paralêle insieme cun che user-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "o dopri les fonts pariadis pe maniere paralêle: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -824,223 +829,223 @@ msgstr ""
" synthesis a nol po sedi doprât cun --media, --excludemedia, --sortmedia, --"
"update o --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "o passi a le seconde fase par valutâ les dipindincis\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "o salti il pachet %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "e instalares il pachet invezit di atualizalu %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "le font \"%s\" e esist dizà"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "le font virtuâl e a di sedi locâl"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "o stoi leint les intestaduris de font \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "o rimôf le font \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "no rivi a acedi a le prime font di instalazion"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "o recuperi il file hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "no rivi a vierzi il database rpm"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"no rivi a acedi a le prime font di instalazion (no ai cjatât nissun file "
"hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "o cîr di selezionâ une font che no esist \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "o stoi selezionant plui fonts: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "o rimôf le font \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "o recuperi il file rpm de font \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Configurazion dal menu salvade"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Configurazion Server"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "le font \"%s\" no je selezionade"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "o esamini il file hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "o esamini il file synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "creant hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "probleme leint il file hdlist/synthesis del font \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...copie falade"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "o copii il file di descrizion di \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...copie finide"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "o scrîf le liste pe font \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "copie di [%s] falade (il file al è piçul in maniere suspiete)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "control md5sum dal file hdlist (o synthesis) copiât"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copie di [%s] falade (md5sum no valevul)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "o calcoli md5sum dal file hdlist (o synthesis) scjariât"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...copie falade: md5sum no corispondent"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nissun file rpm cjatât di [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "o stoi leint i file rpm di [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no rivi a lei i file rpm di [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1051,78 +1056,78 @@ msgstr ""
"chest al po intravignî se tu âs montât manualmentri le cartele dilunc de "
"creazion de font."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "o recuperi il file hdlist (o synthesis) di \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "o ai cjatât le hdlist (o synthesis) analizade sicu %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nissun file hdlist cjatât pe font \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "o controli il file pubkey di \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...impuartade le clâf %s dal file pubkey di \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no rivi a impuartâ il file pubkey di \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "o scrîf le liste pe font \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "font zontade %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no rivi a analizâ il file hdllist di \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "probleme leint il file synthesis o le font \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "o stoi leint les intestaduris de font \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Sielte falade, torne a provâ\n"
@@ -1158,8 +1163,8 @@ msgid "unmounting %s"
msgstr "o stoi dismontant %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "le font \"%s\" no je selezionade"
#: ../urpm/removable.pm:143
@@ -1177,47 +1182,47 @@ msgstr "font \"%s\" no coerente segnade come rimovibil ma no tâl"
msgid "unable to access medium \"%s\""
msgstr "no rivi a acedi a le font \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nissun pachet clamât %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "I pachets seguints e contegnin %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "cause cal mancje %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "cause che %s no l'è sodisfat"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "ricercje dal miôr pachet %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "par tignî %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "par instalâ %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "cause di conflits cun %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "no domandât"
@@ -1238,7 +1243,7 @@ msgid "Missing signature (%s)"
msgstr "Firme mancjant (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1247,8 +1252,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2000, 2004 Mandriva.\n"
+"urpme version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
"Chest software al è software libar e al po sedi redistribuît sot i termins "
"de GNU GPL.\n"
"\n"
@@ -1326,9 +1331,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - prove a cirî e doprâ un file hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - modalitât fetôse.\n"
+msgstr " --verbose, -v - modalitât fetôse.\n"
#: ../urpme:58
#, c-format
@@ -1365,23 +1370,34 @@ msgstr "Nuie di rimovi"
msgid "Checking to remove the following packages"
msgstr "O controli le rimozion dai pachets seguints"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
+msgstr[1] ""
+"Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "rimozion dal pachet %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "rimozion dal pachet %s"
+msgstr[1] "rimozion dal pachet %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Rimozion falade"
@@ -1397,7 +1413,7 @@ msgid ""
"usage: urpmf [options] pattern-expression\n"
msgstr ""
"urpmf version %s\n"
-"Copyright (C) 2002, 2004 Mandriva.\n"
+"Copyright (C) 2002-2006 Mandriva.\n"
"Chest software al è software libar e al po sedi redistribuît sot i termins "
"de GNU GPL.\n"
"\n"
@@ -1650,7 +1666,7 @@ msgstr " --verbose - modalitât fetôse.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - liste i file presints int'un pachet.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - stampe version, release e architeture cun non.\n"
@@ -1660,12 +1676,12 @@ msgstr " -f - stampe version, release e architeture cun non.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "o dopri les variabilis di ambient su %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1674,13 +1690,13 @@ msgstr ""
"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
"nissun risultât\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1689,8 +1705,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2000, 2004 Mandriva.\n"
+"urpmi version %s\n"
+"Copyright (C) 1999-2006 Mandriva.\n"
"Chest software al è software libar e al po sedi redistribuît sot i termins "
"de GNU GPL.\n"
"\n"
@@ -1726,14 +1742,14 @@ msgstr ""
"sisteme.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - disabilite il control MD5SUM.\n"
+msgstr " --no-md5sum - disabilite il control MD5SUM.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - sfuarçe le atualizazion de clâf gpg.\n"
+msgstr " --force-key - sfuarçe le atualizazion de clâf gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1979,7 +1995,7 @@ msgstr " --noclean - ten i rpm no doprâs te cache.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -1996,9 +2012,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - no sta a cirî tai provides par cjatâ il pachet.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - maniere cidine.\n"
+msgstr " --quiet, -q - maniere cidine.\n"
#: ../urpmi:157
#, c-format
@@ -2050,59 +2066,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Instalazion Automatiche"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Instalazion Automatiche"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Cuale ise le to sielte? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Continue distès?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (s/N) "
@@ -2112,56 +2131,65 @@ msgstr " (s/N) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Cualchidun dai pachets domandâts no puedin sedi instalât:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Le instalazion no po continuâ parce che i pachets seguints\n"
"e an di sedi rimovûts par atualizâ altris:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Le instalazion no po continuâ parce che i pachets seguints\n"
"e an di sedi rimovûts par atualizâ altris:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"I pachets listâts e an di sedi rimovûts par podê atualizâ altris:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2170,108 +2198,119 @@ msgstr ""
"Tu âs di sedi root par podê instalâ chestis dipendencis: \n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Frache Enter cuant che tu sês pront..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Scancele"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Chiscj pachets e an firmis no valevulis"
-msgstr[1] "Chiscj pachets e an firmis no valevulis"
+msgstr "Chiscj pachets e an firmis no valevulis"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Chiscj pachets e an firmis no valevulis"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Âstu voie di continuâ le instalazion?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalazion falade"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuzion di %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalazion di %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalazion di %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalazion falade"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provjo a instalâ cence controlâ les dipendencis? (s/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
"Ajo di provâ le instalazion in maniere ancjimò plui sfuarçâde (--force)? (s/"
"N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d stramudis de instalazion faladis"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d stramudis de instalazion faladis"
+msgstr[1] "%d stramudis de instalazion faladis"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Le instalazion e je pussibil"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Al è dut dizà instalât"
-msgstr[1] "Al è dut dizà instalât"
+msgstr "Al è dut dizà instalât"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Al è dut dizà instalât"
-msgstr[1] "Al è dut dizà instalât"
+msgstr "Al è dut dizà instalât"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Al è dut dizà instalât"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "rinviament di urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2283,13 +2322,12 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"ûs: urpmi.addmedia [opzions] <non> <url> [with <percors>]\n"
+"ûs: urpmi.addmedia [opzions] <non> <url>\n"
"la che <url> al è un tra\n"
-" [file:/]/<percors> with <non relatîf di hdlist>\n"
-" ftp://<login>:<password>@<host>/<percors> with <non relatîf di "
-"hdlist>\n"
-" http://<host>/<percors> with <non relatîf di hdlist>\n"
-" removable://<percors> with <non relatîf di hdlist>\n"
+" [file:/]/<percors>\n"
+" ftp://<login>:<password>@<host>/<percors>\n"
+" http://<host>/<percors>\n"
+" removable://<percors>\n"
"\n"
"e [opzions] e son di\n"
@@ -2372,17 +2410,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - nete les intestaduris de cartele in cache.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - maniere cidine.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - maniere fetôse.\n"
@@ -2440,7 +2478,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "no rivi a creâ le font \"%s\"\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2449,8 +2487,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2000, 2004 Mandriva.\n"
+"urpmi.recover version %s\n"
+"Copyright (C) 2006 Mandriva.\n"
"Chest software al è software libar e al po sedi redistribuît sot i termins "
"de GNU GPL.\n"
"\n"
@@ -2516,8 +2554,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2575,12 +2615,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"ûs: urpmi.removemedia [-a] <non> ...\n"
+"ûs: urpmi.removemedia (-a | <non> ...)\n"
"la che <non> al è il non de font di rimovi.\n"
#: ../urpmi.removemedia:41
@@ -2643,26 +2683,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - nol cîr nissun file synthesis o\n"
+" hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - selezione une font no rimovibil.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - sfuarçe gjenerazion di file hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Dome il superutent al po instalâ pachets"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nuie di atualizâ (dopre urpmi.addmedia par zontâ une font)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2671,23 +2719,23 @@ msgstr ""
"le vôs di atualizâ e mancje\n"
"(une di %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Modifiche de font \"%s\":"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "o rimôf le font \"%s\""
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2696,8 +2744,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"urpmf version %s\n"
-"Copyright (C) 2000, 2004 Mandriva.\n"
+"urpmq version %s\n"
+"Copyright (C) 2000-2006 Mandriva.\n"
"Chest software al è software libar e al po sedi redistribuît sot i termins "
"de GNU GPL.\n"
"\n"
@@ -2788,66 +2836,68 @@ msgstr " --changelog - stampe le liste des modifichis.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - stampe il tag summary: sumari dal pachet.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whaterquires - ricercje ledrôse sui recuisîts dal pachet.\n"
+
#: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " --whaterquires - ricercje ledrôse sui recuisîts dal pachet.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - consint le ricercje tra i provides dal pachet.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - risultâts complets cui pachets di rimovi.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - slargje le ricercje a lis dipendencis dal pachet.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - stampe grops ancje cul non\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - stampe informazions utilis in forme leibile.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - liste i file presints int'un pachet.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - no sta a cirî tai provides par cjatâ il pachet.\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - consint le ricercje tra i provides dal pachet.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -q - maniere cidine.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - stampe le version e le release ancje cui nons.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - ricercje ledrôse sui recuisîts dal pachet.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - ricercje ledrôse sui recuisîts dal pachet.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - il prossim pachet al è un pachet sorzint (compagn di --"
"src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2856,52 +2906,75 @@ msgstr ""
" -u - rimôf il pachet se une version plui atualizade e je dizà "
"instalade.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impon une ricercje fuzzy (sicu --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -a - selezione dutis les corispondencis te rie di comant.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " i nons o file rpm scrits te rie di comant e vegnin interogâs.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes al po sedi doprât dome cun --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
+"nissun risultât\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nissune liste di file cjatade\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Note: fin che nissune font cirude e dopre hdlists, urpmf nol podarà dâ "
+"nissun risultât\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nissun changelog cjatât\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Nissune liste di file cjatade\n"
+
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Par sodisfâ les dipendencis, e saran rimovûts chescj pachets (%d MB)"
+
+#, fuzzy
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - no sta a cirî tai provides par cjatâ il pachet.\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - ricercje ledrôse sui recuisîts dal pachet.\n"
+
#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
diff --git a/po/ga.po b/po/ga.po
index 8d8706e0..764994d7 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 1.5\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2000-04-06 10:25+0100\n"
"Last-Translator: Proinnsias Breathnach <breatpro@dublin.ml.com>\n"
"Language-Team: Gaeilge <ga@li.org>\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Ag Ullmhaigh feistiú"
@@ -27,7 +27,7 @@ msgstr "Ag Ullmhaigh feistiú"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, fuzzy, c-format
msgid "_Ok"
msgstr "Ceart go Leor"
@@ -75,7 +75,7 @@ msgstr "Ag Feistiú:"
msgid "_Save"
msgstr "_Sábháil"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Cealaigh"
@@ -85,27 +85,27 @@ msgstr "_Cealaigh"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr "Cód earraidh gan aithne %d\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "pacáiste ar bith den ainm %s"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Fan go fóill, le do thoil..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, fuzzy, c-format
msgid "Must be root"
msgstr "Gaireas luchóige"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -113,42 +113,42 @@ msgid ""
"Continue installation anyway?"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Rabhadh"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ceart go Leor"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Eirigh as Feistiú"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, fuzzy, c-format
msgid "_Abort"
msgstr "Tobscoir"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -156,41 +156,46 @@ msgid ""
"Continue installation anyway?"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
-msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d pacáistí"
+msgstr[1] "%d pacáistí"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, fuzzy, c-format
msgid "Package installation..."
msgstr "Ag Ullmhaigh feistiú"
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr ""
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Ag feistiál pacáiste %s"
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -199,7 +204,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -207,39 +212,39 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "ag feistiú %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "à Ullmhú..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, fuzzy, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr ""
"Ag feisteáil pacáiste %s\n"
"%d%%"
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "Críochnithe"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Theip ag feistiú"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "tá gach rud ann cheana féin"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Theip ag feistiú"
@@ -286,63 +291,63 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -362,27 +367,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr ""
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "Teip ag leámh comhad chlár: %s"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
@@ -407,7 +412,7 @@ msgstr "Téip ag oscailt comhad: %s\n"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, fuzzy, c-format
msgid "unable to write config file [%s]"
msgstr "Téip ag oscailt comhad: %s\n"
@@ -420,12 +425,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Ainm úsáideora:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Focal Faire:"
#: ../urpm/download.pm:185
#, c-format
@@ -537,7 +542,7 @@ msgstr ""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, fuzzy, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "léamh depslist comhad [%s]"
@@ -647,7 +652,7 @@ msgstr "pacáiste ar bith den ainm %s"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -670,328 +675,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, fuzzy, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, fuzzy, c-format
msgid "taking removable device as \"%s\""
msgstr "Gaireais inscortha"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, fuzzy, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "Gaireais inscortha"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, fuzzy, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, fuzzy, c-format
msgid "wrote config file [%s]"
msgstr "Theip ar rannú: %s"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "Ag feistiál pacáiste %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, fuzzy, c-format
msgid "medium \"%s\" already exists"
msgstr "Tá an próifíl \"%s\" ann cheana!"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr ""
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr ""
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Cumraigh 'fetchmail'"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Cumraíocht Xorg"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, fuzzy, c-format
msgid "building hdlist [%s]"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, fuzzy, c-format
msgid "...copying failed"
msgstr "Theip ar feistiú"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, fuzzy, c-format
msgid "...copying done"
msgstr "Theip ar feistiú"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Téip cóip do [%s]"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Téip cóip do [%s]"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "Theip ar uathathmhéadú FAT: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -999,78 +1004,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "Tá droch ainmchomad rpm [%s]"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "léamh depslist comhad [%s]"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "TtYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Droch-rogha, athtrialaigh!\n"
@@ -1107,7 +1112,7 @@ msgstr "ag feistiú %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
+msgid "medium \"%s\" is not available"
msgstr "Tá an próifíl \"%s\" ann cheana!"
#: ../urpm/removable.pm:143
@@ -1125,47 +1130,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "Téip ag oscailt comhad: %s\n"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Pacáiste ar bith den ainm %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "téama le haighaidh taobh an fuinneog"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "kdesu ar iarraidh"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "Konquest"
@@ -1301,23 +1306,32 @@ msgstr ""
msgid "Checking to remove the following packages"
msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Tá ceann de na pacáistí seo de dhíth:"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "Ag feistiál pacáiste %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Ag feistiál pacáiste %s"
+msgstr[1] "Ag feistiál pacáiste %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (T/n) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Scríos modúil"
@@ -1560,7 +1574,7 @@ msgstr ""
msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1570,19 +1584,19 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1844,7 +1858,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -1910,59 +1924,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Eirigh as Feistiú"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Eirigh as Feistiú"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Céard é do rogha? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Lean ar aghaidh ar aon nós?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
@@ -1972,142 +1989,162 @@ msgstr " (T/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] "tá gach rud ann cheana féin"
-msgstr[1] "tá gach rud ann cheana féin"
+msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] "Tá %s ins na pacáistí a leanas: %s \n"
-msgstr[1] "Tá %s ins na pacáistí a leanas: %s \n"
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] "Tá %s ins na pacáistí a leanas: %s \n"
-msgstr[1] "Tá %s ins na pacáistí a leanas: %s \n"
+msgstr "Tá %s ins na pacáistí a leanas: %s \n"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "Brú Enter nuair atá sin déanta agat..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Cealaigh"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Tá ceann de na pacáistí seo de dhíth:"
-msgstr[1] "Tá ceann de na pacáistí seo de dhíth:"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
-#: ../urpmi:668
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Tá ceann de na pacáistí seo de dhíth:"
+
+#: ../urpmi:673
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "An bhfuil tú ag iarraidh an cumraíocht a thrial?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Theip ag feistiú"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "ag feistiú %s\n"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ag feistiú %s\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "ag feistiú %s\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Theip ag feistiú"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Theip ag feistiú"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Theip ag feistiú"
+msgstr[1] "Theip ag feistiú"
-#: ../urpmi:828
+#: ../urpmi:825
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Theip ag feistiú"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "tá gach rud ann cheana féin"
-msgstr[1] "tá gach rud ann cheana féin"
+msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "tá gach rud ann cheana féin"
-msgstr[1] "tá gach rud ann cheana féin"
+msgstr "tá gach rud ann cheana féin"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "tá gach rud ann cheana féin"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2197,17 +2234,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr ""
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr ""
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr ""
@@ -2335,8 +2372,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2398,7 +2437,7 @@ msgstr ""
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
-msgstr "Úsáid: urpmi.removemedia [-a] <ainm>..."
+msgstr "Úsáid: urpmi.removemedia (-a | <ainm>...)\n"
#: ../urpmi.removemedia:41
#, c-format
@@ -2456,42 +2495,48 @@ msgstr ""
#: ../urpmi.update:47
#, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
+#, c-format
msgid " -a - select all non-removable media.\n"
msgstr ""
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, c-format
-msgid " -f - force generation of hdlist files.\n"
+msgid " -f - force updating synthesis/hdlist\n"
msgstr ""
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "léamh depslist comhad [%s]"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "léamh depslist comhad [%s]"
@@ -2583,111 +2628,114 @@ msgstr ""
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:88
+#: ../urpmq:87
#, c-format
-msgid " -c - complete output with package to be removed.\n"
+msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:89
-#, c-format
-msgid " -d - extend query to package dependencies.\n"
-msgstr ""
-
-#: ../urpmq:91
+#: ../urpmq:88
#, c-format
-msgid " -g - print groups with name also.\n"
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:92
+#: ../urpmq:90
#, c-format
-msgid " -i - print useful information in human readable form.\n"
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
msgstr ""
#: ../urpmq:93
#, c-format
-msgid " -l - list files in package.\n"
+msgid " -c - complete output with package to be removed.\n"
msgstr ""
#: ../urpmq:94
#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
#: ../urpmq:96
#, c-format
-msgid " -r - print version and release with name also.\n"
+msgid " -g - print groups with name also.\n"
msgstr ""
#: ../urpmq:97
#, c-format
-msgid " -R - reverse search to what requires package.\n"
+msgid " -i - print useful information in human readable form.\n"
msgstr ""
#: ../urpmq:98
#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
+msgid " -l - list files in package.\n"
msgstr ""
#: ../urpmq:99
#, c-format
-msgid " -s - next package is a source package (same as --src).\n"
+msgid " -m - equivalent to -du\n"
msgstr ""
#: ../urpmq:100
#, c-format
+msgid " -r - print version and release with name also.\n"
+msgstr ""
+
+#: ../urpmq:101
+#, c-format
+msgid " -s - next package is a source package (same as --src).\n"
+msgstr ""
+
+#: ../urpmq:102
+#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr ""
diff --git a/po/gl.po b/po/gl.po
index 81856ca2..d1c5f0e7 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -11,7 +11,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-gl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-09-10 00:34+0100\n"
"Last-Translator: Leandro Regueiro <leandro.regueiro@gmail.com>\n"
"Language-Team: Galician <<gpul-traduccion@ceu.fi.udc.es>>\n"
@@ -21,7 +21,7 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: KBabel 1.9.1\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "Instalación de RPMs"
@@ -31,7 +31,7 @@ msgstr "Instalación de RPMs"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Erro: non foi posible atopar o ficheiro %s, cancelarase a operación"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Aceptar"
@@ -98,7 +98,7 @@ msgstr "_Instalar"
msgid "_Save"
msgstr "_Gardar"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Cancelar"
@@ -108,27 +108,27 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolla a localización onde se gardará o ficheiro"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Opción descoñecida %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Non especificou ningún paquete"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Agarde..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Debe ser root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Desexa continua-la instalación de tódolos xeitos?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Advertencia"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Aceptar"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr "(para actualizar)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr "(para instalar)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, fuzzy, c-format
msgid "Package choice"
msgstr "Selección de paquetes"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Necesítase un dos seguintes paquetes:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Abortar"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,41 +185,46 @@ msgstr ""
"%s\n"
"Desexa continuar a instalación de tódolos xeitos?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
-msgstr[1] "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
+msgstr "Para satisface-las dependencias, vanse instala-los seguintes paquetes"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d paquetes, %d MB)"
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d paquete, %d MB)"
+msgstr[1] "(%d paquetes, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Instalación de paquetes..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "Non foi posible consegui-los paquetes fonte, abortando"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Insira o soporte que se chama \"%s\" no dispositivo [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Descargando o paquete `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -232,7 +237,7 @@ msgstr ""
"\n"
"Desexa continuar ca instalación?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -243,37 +248,37 @@ msgstr ""
"%s\n"
"Pode ser que desexe actualizar a base de datos do seu urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "eliminando %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Preparando..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalando o paquete `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Feito"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "A instalación fallou"
+msgid "Installation failed:"
+msgstr "A instalación fallou:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Xa está todo instalado"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalación rematada"
@@ -322,63 +327,63 @@ msgstr "Só o superusuario pode instalar paquetes"
msgid "Running urpmi in restricted mode..."
msgstr "Executando urpmi en modo restrinxido..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "non foi posible abrir rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome de ficheiro rpm incorrecto [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "recuperando o ficheiro rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...recuperación rematada"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...fallo ó recuperar: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "non foi posible acceder ó ficheiro rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "non foi posible analisar o ficheiro spec %s [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "non foi posible rexistrar o ficheiro rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "erro ó rexistra-los paquetes locais"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operación está prohibida mentres se executa en modo restrinxido"
@@ -398,27 +403,27 @@ msgstr "O directorio de ambiente %s non existe"
msgid "You need to be root to use --use-distrib"
msgstr "Necesita ser root para usar --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: non se puido ler o ficheiro rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "problema ó ler o ficheiro hdlist ou synthesis do soporte \"%s\""
@@ -443,7 +448,7 @@ msgstr "non foi posible escribir o ficheiro de configuración [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "non foi posible escribir o ficheiro de configuración [%s]"
@@ -451,17 +456,17 @@ msgstr "non foi posible escribir o ficheiro de configuración [%s]"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Introduza as súas credenciais para acceder ó proxy\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Nome de usuario:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Contrasinal:"
#: ../urpm/download.pm:185
#, c-format
@@ -573,7 +578,7 @@ msgstr "hai varios paquetes co mesmo nome de ficheiro rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "non foi posible analisar correctamente [%s] no valor \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -689,9 +694,9 @@ msgid "No base defined"
msgstr "Non especificou ningún paquete"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Non se poden asignar as entradas do mapa de cores"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -709,11 +714,11 @@ msgid "warning: md5sum for %s unavailable in MD5SUM file"
msgstr "advertencia: o md5sum para %s non está dispoñible no ficheiro MD5SUM"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "calculando md5sum do hdlist fonte existente (ou synthesis)"
+msgstr "calculando md5sum do hdlist fonte existente (ou synthesis) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -722,107 +727,107 @@ msgstr ""
"o soporte virtual \"%s\" non debería ter definido o hdlist ou ficheiro de "
"lista, ignorase o soporte"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "o soporte virtual \"%s\" non é local, soporte ignorado"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nome de ficheiro rpm incorrecto [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
"non foi posible atopar a lista de ficheiros para \"%s\", soporte ignorado"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "intentando seleccionar o soporte inexistente \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "non foi posible acceder ó ficheiro hdlist de \"%s\", soporte ignorado"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "non foi posible analisar o ficheiro hdlist de \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"o soporte \"%s\" está intentando usar un hdlist que xa se está usando, "
"soporte ignorado"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"o soporte \"%s\" está intentando usar unha lista que xa se está usando, "
"soporte ignorado"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "intentando seleccionar o soporte inexistente \"%s\""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "demasiados puntos de montaxe para o soporte extraíble \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "tomando o dispositivo extraíble coma \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "O soporte \"%s\" é unha imaxe ISO, montarase ó vo (on-the-fly)"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "usando un dispositivo extraíble diferente [%s] para \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "non foi posible recuperar a ruta do soporte extraíble \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "escribiuse o ficheiro de configuración [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Non se pode usar o modo parallel co modo use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -831,147 +836,147 @@ msgstr ""
"--synthesis non pode usarse con --media, --excludemedia, --sortmedia, --"
"update ou --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
"puido devolver ningún resultado\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Comezo da busca: %s final: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "levando a cabo unha segunda pasada para calcular as dependencias\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "omitindo o paquete %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "instalaría no canto de actualizar o paquete %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "o soporte \"%s\" xa existe"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "os soportes virtuais deben ser locais"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "lendo as cabeceiras do soporte \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "eliminando o soporte \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "non foi posible acceder ó primeiro soporte de instalación"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "recuperando o ficheiro hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "non foi posible analizar media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"non foi posible acceder ó primeiro soporte de instalación (non se atopou o "
"ficheiro hdlist)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "intentando seleccionar o soporte inexistente \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionando varios soportes: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "eliminando o soporte \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando urpmi para o soporte \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...fallo ó reconfigurar"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "...fallo ó reconfigurar"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro ó xerar o ficheiro de nomes: non se atopou a dependencia %d"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Erro ó xerar o ficheiro de nomes: Non se puido escribir no ficheiro (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "o soporte \"%s\" non está seleccionado"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinando o ficheiro hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando o ficheiro synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "construindo hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -980,77 +985,77 @@ msgstr ""
"Non foi posible construir o ficheiro synthesis para o soporte \"%s\". O "
"ficheiro hdlist podería estar corrompido."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema ó ler o ficheiro hdlist ou synthesis do soporte \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...fallo ó copiar"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiando o ficheiro de descrición de \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...copiado"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "escribindo a lista de ficheiros do soporte \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "fallo ó copiar [%s] (o ficheiro é sospeitosamente pequeno)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "calculando o md5sum do hdlist fonte (ou synthesis) copiado"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "fallo ó copiar [%s] (os md5sum non coinciden)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "calculando o md5sum do hdlist (ou synthesis) fonte recuperado"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...fallo ó recuperar: o md5sum non coincide"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "lendo ficheiros rpm dende [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lendo ficheiros rpm dende [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "non foi posible ler os ficheiros rpm dende [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "non se leron rpms"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1060,78 +1065,78 @@ msgstr ""
"non foi posible acceder ó soporte \"%s\",\n"
"isto pode ocorrer se montou a man o directorio cando creou o soporte."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "non se atopou o ficheiro hdlist para o soporte \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "recuperando o hdlist (ou synthesis) fonte de \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "copiando o hdlist (ou synthesis) fonte de \"%s\"..."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "non se atopou o ficheiro hdlist para o soporte \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando o ficheiro pubkey de \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importouse a clave %s dende o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "non foi posible importar o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "escribindo a lista de ficheiros do soporte \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "engadiuse o soporte %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "non foi posible analisar o ficheiro hdlist de \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ó ler o ficheiro synthesis do soporte \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "lendo as cabeceiras do soporte \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Mala elección, probe de novo\n"
@@ -1167,8 +1172,8 @@ msgid "unmounting %s"
msgstr "desmontando %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "o soporte \"%s\" non está seleccionado"
#: ../urpm/removable.pm:143
@@ -1186,47 +1191,47 @@ msgstr "soporte inconsistente \"%s\" marcado coma extraíble pero non o é"
msgid "unable to access medium \"%s\""
msgstr "non foi posible acceder ó soporte \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Non hai ningún paquete que se chame %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes paquetes conteñen %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "debido a que falta %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "debido a %s non satisfeitas"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Non hai nada que eliminar"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "para manter %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "debido a conflictos con %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "non solicitado"
@@ -1322,19 +1327,19 @@ msgid ""
msgstr ""
#: ../urpme:55 ../urpmi:119 ../urpmq:74
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr " --probe-synthesis - intentar buscar e usar o ficheiro synthesis.\n"
+msgstr " --probe-synthesis - usar o ficheiro synthesis.\n"
#: ../urpme:56 ../urpmi:120 ../urpmq:75
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr " --probe-hdlist - intentar buscar e usar o ficheiro hdlist.\n"
+msgstr " --probe-hdlist - usar o ficheiro hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - modo detallado.\n"
+msgstr " --verbose, -v - modo detallado.\n"
#: ../urpme:58
#, c-format
@@ -1372,25 +1377,36 @@ msgstr "Non hai nada que eliminar"
msgid "Checking to remove the following packages"
msgstr "Comprobando para eliminar os seguintes paquetes"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Para satisfacer as dependencias, vanse eliminar os seguintes %d paquetes (%d "
+"MB)"
+msgstr[1] ""
"Para satisfacer as dependencias, vanse eliminar os seguintes %d paquetes (%d "
"MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "Remove %d packages?"
-msgstr "Desexa eliminar %d paquetes?"
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Desexa eliminar %d paquete?"
+msgstr[1] "Desexa eliminar %d paquetes?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Fallo ó eliminar"
@@ -1647,7 +1663,7 @@ msgstr " --vendor - vendedor\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - o soporte no que se atopou o paquete\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1657,12 +1673,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando ambiente específico en %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1671,7 +1687,7 @@ msgstr ""
"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
"puido devolver ningún resultado\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Podería querer usar --name para buscar polo nome do paquete.\n"
@@ -1725,14 +1741,15 @@ msgstr ""
"sistema.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - deshabilitar a comprobación de ficheiros MD5SUM.\n"
+msgstr ""
+" --no-md5sum - deshabilitar a comprobación de ficheiros MD5SUM.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - forzar a actualización da clave gpg.\n"
+msgstr " --force-key - forzar a actualización da clave gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1838,9 +1855,9 @@ msgid " --curl - use curl to retrieve distant files.\n"
msgstr " --curl - usar curl para descargar ficheiros distantes.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --curl - usar curl para descargar ficheiros distantes.\n"
+msgstr " --prozilla - usar prozilla para descargar ficheiros distantes.\n"
#: ../urpmi:124
#, c-format
@@ -1858,9 +1875,9 @@ msgid " --wget-options - additional options to pass to wget\n"
msgstr " --wget-options - opcións adicionais para pasarlle a wget\n"
#: ../urpmi:127
-#, fuzzy, c-format
+#, c-format
msgid " --prozilla-options - additional options to pass to prozilla\n"
-msgstr " --curl-options - opcións adicionais para pasarlle a curl\n"
+msgstr " --prozilla-options - opcións adicionais para pasarlle a prozilla\n"
#: ../urpmi:128 ../urpmi.addmedia:49 ../urpmi.update:36
#, c-format
@@ -1976,7 +1993,7 @@ msgstr " --nolock - non bloquear a base de datos rpm.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - actualizar só paquetes ca mesma arquitectura.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2047,58 +2064,61 @@ msgstr ""
"Erro: semella que %s se montou coma de só lectura.\n"
"Use --allow-force para forzar a operación."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Actualizando soporte...\n"
-#: ../urpmi:439
-#, fuzzy, c-format
+#: ../urpmi:437
+#, c-format
msgid "%s: %s (to upgrade)"
-msgstr "(para actualizar)"
+msgstr "%s: %s (para actualizar)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
-#, fuzzy, c-format
+#: ../urpmi:439
+#, c-format
msgid "%s (to upgrade)"
-msgstr "(para actualizar)"
+msgstr "%s (para actualizar)"
-#: ../urpmi:443
-#, fuzzy, c-format
+#: ../urpmi:441
+#, c-format
msgid "%s: %s (to install)"
-msgstr "(para instalar)"
+msgstr "%s: %s (para instalar)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
-#, fuzzy, c-format
+#: ../urpmi:443
+#, c-format
msgid "%s (to install)"
-msgstr "(para instalar)"
+msgstr "%s (para instalar)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "¿Cal é a súa elección? (1-%d) "
-#: ../urpmi:482
-#, fuzzy, c-format
+#: ../urpmi:481
+#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Non se pode instalar o seguinte paquete porque depende de paquetes\n"
+"que son máis antigos cós instalados:\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-"Non se poden instalar os seguintes paquetes porque dependen de paquetes\n"
-"que son máis antigos cós instalados:\n"
-"%s"
-msgstr[1] ""
+msgstr ""
"Non se poden instalar os seguintes paquetes porque dependen de paquetes\n"
"que son máis antigos cós instalados:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2107,7 +2127,7 @@ msgstr ""
"\n"
"¿Continuar a instalación de tódolos xeitos?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (S/n) "
@@ -2117,56 +2137,65 @@ msgstr " (S/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Algún dos paquetes solicitados non se puido instalar:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Algún dos paquetes solicitados non se puido instalar:\n"
"%s"
-#: ../urpmi:534
-#, fuzzy, c-format
+#: ../urpmi:535
+#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"A instalación non pode continuar porque cómpre eliminar o seguinte\n"
+"paquete para para poder actualizar outros:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"A instalación non pode continuar porque cómpre eliminar os seguintes\n"
-"paquetes para para poder actualizar outros:\n"
-"%s\n"
-msgstr[1] ""
+msgstr ""
"A instalación non pode continuar porque cómpre eliminar os seguintes\n"
"paquetes para para poder actualizar outros:\n"
"%s\n"
-#: ../urpmi:541
-#, fuzzy, c-format
+#: ../urpmi:544
+#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
+msgstr ""
+"Teñe que eliminarse o seguinte paquete para poder actualizar outros:\n"
"%s"
-msgstr[0] ""
-"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[1] ""
+msgstr ""
"Teñen que eliminarse os seguintes paquetes para poder actualizar outros:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(só probar, a eliminación non se fará agora mesmo)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2175,100 +2204,111 @@ msgstr ""
"Necesita ser root para instalar as seguintes dependencias:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(só probar, a instalación non se fará agora mesmo)"
-#: ../urpmi:594
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Continuar ca instalación dos %d paquetes? (%d MB)"
msgstr[1] "Continuar ca instalación dos %d paquetes? (%d MB)"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Prema Enter cando estea preparado..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Os seguintes paquetes teñen sinaturas incorrectas"
-msgstr[1] "Os seguintes paquetes teñen sinaturas incorrectas"
+msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Os seguintes paquetes teñen sinaturas incorrectas"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "¿Desexa continuar ca instalación?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "A instalación fallou"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuíndo %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s dende %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalando %s"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "A instalación fallou:"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "¿Probar a instalación sen comprobar as dependencias? (s/N) "
-#: ../urpmi:780
-#, fuzzy, c-format
+#: ../urpmi:776
+#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "¿Probar a instalación con menos comprobacións (--force)? (s/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "fallaron %d transaccións de instalación"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "fallaron %d transaccións de instalación"
+msgstr[1] "fallaron %d transaccións de instalación"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "A instalación é viable"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Xa está todo instalado"
-msgstr[1] "Xa está todo instalado"
+msgstr "Xa está todo instalado"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Xa está todo instalado"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Xa está todo instalado"
-msgstr[1] "Xa está todo instalado"
+msgstr "Xa está todo instalado"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Xa está todo instalado"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -2368,17 +2408,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - engadir o soporte á configuración, pero non actualizalo.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, fuzzy, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - limpar o directorio de caché de cabeceiras.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -v - modo abreviado.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - modo detallado.\n"
@@ -2514,9 +2554,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Limpando (ou baleirando) o directorio de reempacamento [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "elimináronse %d ficheiros\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "elimináronse %d ficheiros\n"
+msgstr[1] "elimináronse %d ficheiros\n"
#: ../urpmi.recover:82
#, c-format
@@ -2574,12 +2616,12 @@ msgid "Disabling repackaging\n"
msgstr "Deshabilitando o reempacamento\n"
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"uso: urpmi.removemedia [-a] <nome> ...\n"
+"uso: urpmi.removemedia (-a | <nome> ...)\n"
"onde <nome> é o nome do soporte que se desexa eliminar.\n"
#: ../urpmi.removemedia:41
@@ -2642,27 +2684,35 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - non actualizar, marcar o soporte coma activado.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - non intentar buscar ningún ficheiro\n"
+" synthesis ou hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - selecciona tódolos soportes non extraíbles.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - forzar a xeración de ficheiros hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Só o superusuario pode actualizar soportes"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"non hai nada que actualizar (use urpmi.addmedia para engadir un soporte)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2671,17 +2721,17 @@ msgstr ""
"falta a entrada a actualizar\n"
"(unha de %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "ignorando o soporte %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "habilitando o soporte %s"
@@ -2784,68 +2834,68 @@ msgstr " --changelog - amosa o changelog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - amosar o resumo.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - buscar en proporciona para atopar o paquete.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - saída completa co paquete que se vai eliminar.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extender a solicitude ás dependencias do paquete.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - amosa información útil en forma lexible.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista os ficheiros do paquete.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - non buscar en proporciona para atopar o paquete "
-"(predeterminado).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - buscar en proporciona para atopar o paquete.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -v - modo abreviado.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - o seguinte paquete é un paquete de fontes (igual ca --"
"src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2854,60 +2904,72 @@ msgstr ""
" -u - elimina o paquete se xa está instalada unha versión máis "
"nova.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes só se pode usar con --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
+"puido devolver ningún resultado\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Non se atopou a lista de ficheiros\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Nota: xa que ningún dos soportes nos que se buscou usa hdlists, urpmf non "
+"puido devolver ningún resultado\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Non se atopou o changelog\n"
-#, fuzzy
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Continuar ca instalación de %d paquete? (%d MB)"
+#~ msgstr[1] "Continuar ca instalación dos %d paquetes? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Non se atopou a lista de ficheiros\n"
+
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d paquetes, %d MB)"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
-#~ msgstr[1] ""
-#~ "Para satisface-las dependencias, vaise instala-lo seguinte paquete"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - non buscar en proporciona para atopar o paquete "
+#~ "(predeterminado).\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
diff --git a/po/he.po b/po/he.po
index 1b6a099e..dc20bc93 100644
--- a/po/he.po
+++ b/po/he.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: he\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-07-09 23:33+0300\n"
"Last-Translator: dovix <dovix2003@yahoo.com>\n"
"Language-Team: Hebrew <mdk-hebrew@iglu.org.il>\n"
@@ -27,7 +27,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "התקנת חבילות תוכנה"
@@ -37,7 +37,7 @@ msgstr "התקנת חבילות תוכנה"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_המשך"
@@ -103,7 +103,7 @@ msgstr "_התקנה"
msgid "_Save"
msgstr "_שמירה"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_ביטול"
@@ -113,29 +113,29 @@ msgstr "_ביטול"
msgid "Choose location to save file"
msgstr "עליך לבחור ×ž×§×•× ×œ×©×ž×™×¨×ª הקובץ"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"unknown options '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "×œ× × ×ž×¦××” חבילה ×‘×©× %s"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "× × ×œ×”×ž×ª×™×Ÿ..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "עליך להיות בעל הרש×ות מנהל מערכת"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -146,42 +146,42 @@ msgstr ""
"%s\n"
"×”×× ×‘×¨×¦×•× ×š להמשיך?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "×זהרה"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "×ישור"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (לשדרג)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (להתקין)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "בחירת חבילות"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "×חת החבילות הב×ות נדרשת:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_בטל"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -192,41 +192,48 @@ msgstr ""
"%s\n"
"×”×× ×‘×¨×¦×•× ×š להמשיך?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "בכדי לספק ×ת התלויות, החבילות הב×ות יותקנו (%d MB)"
-msgstr[1] "בכדי לספק ×ת התלויות, החבילות הב×ות יותקנו (%d MB)"
+msgstr "בכדי לספק ×ת התלויות, החבילות הב×ות יותקנו (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"בכדי לספק ×ת התלויות, %d החבילות הב×ות יותקנו:\n"
+"%s\n"
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d חבילות"
+msgstr[1] "%d חבילות"
+
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "התקנת חבילה..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "×ין ×פשרות ×œ×§×¨×•× ×—×‘×™×œ×•×ª מהמ×גר, הפעולה מתבטלת"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "× × ×œ×”×›× ×™×¡ ×ת המדיה הנקר×ת \"%s\" להתקן [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "מוריד חבילה `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -239,7 +246,7 @@ msgstr ""
"\n"
"×”×× ×œ×”×ž×©×™×š ×ת ההתקנה?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -250,37 +257,37 @@ msgstr ""
"%s\n"
"יתכן ועליך לעדכן ×ת מ×גר ×”× ×ª×•× ×™× ×©×œ urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "מסיר %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "×”×›× ×”..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "מתקין חבילה `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_סיו×"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ההתקנה נכשלה"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "הכל כבר מותקן"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "ההתקנה הסתיימה"
@@ -329,63 +336,63 @@ msgstr "רק מנהל מערכת מורשה להתקין חבילות"
msgid "Running urpmi in restricted mode..."
msgstr "הפעלת urpmi ב×ופן עבודה מוגבל..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "×ין ×פשרות לפתוח ×ת בסיס ×”× ×ª×•× ×™× ×©×œ החבילות rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "×©× ×”×—×‘×™×œ×” [%s] ×ינו תקין"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "מ×חזר קובץ RPM [%s]..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...×”×חזור הסתיי×"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...×”×יחזור נכשל: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "הגישה לחבילה [%s] נכשלה"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "×ין ×פשרות לפענח ×ת \"%s\" בקובץ [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "×ין ×פשרות לבצע ×¨×™×©×•× ×©×œ החבילה"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "חלה שגי××” בעת ×¨×™×©×•× ×—×‘×™×œ×•×ª מקומיות"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "פעולה זו ××™× ×” מותרת ב×ופן עבודה מוגבל"
@@ -405,27 +412,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "עליך להיות משתמש-על כדי להפעיל פקודה זו!\n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ×œ× ×™×›×•×œ קובץ RPM \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "קובץ hdlist synthesis עבור המקור \"%s\" נבנה"
@@ -450,7 +457,7 @@ msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
@@ -458,17 +465,17 @@ msgstr "כתיבת קובץ ההגדרות [%s] נכשלה"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "עליך להגדיר ×ת פרטי ההתחברות לשרת המתווך\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "×©× ×ž×©×ª×ž×©:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "ססמה:"
#: ../urpm/download.pm:185
#, c-format
@@ -580,7 +587,7 @@ msgstr "ישנן הרבה חבילות RPM ×¢× ×ותו ×©× ×§×•×‘×¥ \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "פענוח [%s] נכשל בערך \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "×ין ×פשרות גישה לקובץ הרשימה של \"%s\", מדיה זו ×œ× ×ª×”×™×” בשימוש"
@@ -691,9 +698,9 @@ msgid "No base defined"
msgstr "×œ× × ×ž×¦××” חבילה ×‘×©× %s"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "×œ× × ×™×ª×Ÿ ליצור קשר ×¢× ×”×©×¨×ª"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -715,109 +722,109 @@ msgstr "×זהרה: חתימת md5sum עבור %s ×œ× ×–×ž×™× ×” בקובץ MD5
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "מחשב MD5SUM של hdlist (×ו synthesis) של המקור"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "מ×גר וירטו×לי \"%s\" ×œ× ×”×’×“×™×¨ hdlist ×ו רשימת קבצי×, התעלמות מ×גר"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "מ×גר וירטו×לי \"%s\" צריך שיהיה לו כתובת ברורה, התעלמות מ×גר"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "×©× ×”×—×‘×™×œ×” [%s] ×ינו תקין"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "×ין ×פשרות ×œ×ž×¦×•× ×§×•×‘×¥ רשימה עבור \"%s\", התעלמות מ×גר"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "ניסיון לבחור במ×גר ש×ינו ×§×™×™× \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "קובץ hdlist synthesis עבור המקור \"%s\" נבנה"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "×ין ×פשרות לגשת לקובץ hdlist של \"%s\", מדיה זו ×œ× ×ª×”×™×” בשימוש"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "×ין ×פשרות לפענח ×ת קובץ ×”-hdlist של \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "מ×גר \"%s\" מנסה להשתמש ב-hdlist שכבר בשימוש, התעלמות מ×גר"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "המ×גר \"%s\" מנסה להשתמש ברשימה שכבר בשימוש, ×ž×ª×¢×œ× ×ž×ž×גר"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "מנסה לדלג על המקור הנוכחי \"%s\", מתחמק"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "יותר מדי נקודות חיבור עבור מ×גר נייד \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "לוקח התקן נייד כ - \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "המקור \"%s\" ×”×•× ×§×•×‘×¥ תמונת תקליטור, ×”×•× ×™×™×¢×•×’×Ÿ לכשידרש"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "משתמש בהתקן נייד ×חר [%s] עבור \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "×ין ×פשרות ×œ×™×™×‘× ×ת המסלול עבור מ×גר הניתנת להסרה \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "כתיבת קובץ הגדרות [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "×ין ×פשרות להפעיל ×ופן מקבילי ביחד ×¢× ×ופן פעולה use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "משתמש במדיה מקושרת עבור מצב מקבילי: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -826,144 +833,144 @@ msgstr ""
"--synthesis ×œ× ×™×›×•×œ לשמש ביחד ×¢× --media, --excludemedia, --sortmedia, --"
"update ×ו --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Note: מ×חר ו××£ ×חד מהמקורות ×”×–×ž×™× ×™× ×œ× ×ž×©×ª×ž×© ב-hdlists, urpmf ×œ× ×”×¦×œ×™×— ×œ×ž×¦×•× "
"××£ תוצ××” רלונטית\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "תחילת חיפוש: %s סיו×: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "מבצע מעבר שני בכדי לחשב תלויות\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "מדלג על חבילה %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "×”×× ×œ×”×ª×§×™×Ÿ ×‘×ž×§×•× ×œ×©×“×¨×’ ×ת החבילה %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "המ×גר \"%s\" כבר קיי×"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "מ×גר וירטו×לי צריך להיות מקומי"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "×§×•×¨× ×›×•×ª×¨×•×ª מתוך מ×גר \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "מסיר מ×גר \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "×ין ×פשרות גישה למ×גר ההתקנה הר×שון"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "מ×חזר ×ת הקובץ hdlists ..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "×ין ×פשרות לפתוח ×ת בסיס ×”× ×ª×•× ×™× ×©×œ החבילות rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "גישה להתקנה הר×שונה של המ×גר בלתי ×פשרות (הקובץ hdlists ×œ× × ×ž×¦×)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ניסיון לבחור במ×גר ש×ינו ×§×™×™× \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "בוחר הרבה מדיה:%s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "מסיר מ×גר \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "מגדיר מחדש ×ת urpmi למקור \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...ההגדרה מחדש נכשלה"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "ההגדרה מחדש הושלמה"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "מ×גר \"%s\" ×œ× × ×‘×—×¨"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "בודק ×ת הקובץ hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "בודק ×ת קובץ ×”synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "בונה hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -971,77 +978,77 @@ msgid ""
msgstr ""
"יצירת קובץ synthesis עבור המקור \"%s\" נכשלה. קובץ hdlist עלול להיות פגו×."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "בעיה בקרי×ת hdlist ×ו קובץ מיזוג של המ×גר \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...ההעתקה נכשלה"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "מעתיק תי×ור קובץ של \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...ההעתקה הסתיימה"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "כותב קובץ רשימה עבור מ×גר \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "העתקת [%s] נכשלה (הקובץ קטן מהמצופה)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "חישוב md5sum של מקור hdlist (×ו synthesis) מועתקי×"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "העתקת [%s] נכשלה (חתימת md5sum ××™× ×” תו×מת)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "מחשב חתימות md5sum של קובץ hdlist (×ו synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...×”×יחזור נכשל: ××™ הת×מה של md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "×œ× × ×ž×¦×ו חבילות מ [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "×ž×™×™×‘× ×—×‘×™×œ×•×ª מ [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "×ין ×פשרות ×œ×§×¨×•× ×ת קובצי ×”-RPM מ [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "×œ× × ×§×¨×ו חבילות תוכנה"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1051,78 +1058,78 @@ msgstr ""
"×ין ×פשרות לגשת למ×גר \"%s\",\n"
"×–×” יכול לקרות ×× ×”×™×™×ª מחובר ידנית לספרייה בזמן יצירת המ×גר."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "×œ× × ×ž×¦×ו קובצי hdlist עבור מ×גר \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "מוריד ×ת קובץ המקור hdlist (×ו synthesis) של \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "× ×ž×¦× hdlist (×ו מיזוג) בחון ×›-%s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "×œ× × ×ž×¦×ו קובצי hdlist עבור מ×גר \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "בודק קובץ מפתחות ציבורי של \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ".. מפתח %s ×ž×™×•×‘× ×ž×ª×•×š קובץ ציבורי של \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "×œ× ×™×›×•×œ ×œ×™×™×‘×•× ×§×•×‘×¥ של מפתח ציבורי של \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "כותב קובץ רשימה עבור מ×גר \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "מ×גר %s הוסף"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "×ין ×פשרות לפענח ×ת קובץ ×”-hdlist של \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "בעיה בקרי×ת קובץ מיזוג של מ×גר \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "×§×•×¨× ×›×•×ª×¨×•×ª מתוך מ×גר \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "לkKמnN"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "כfFטyY"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "מצטער ,בחירה רעה, יש לנסות שנית\n"
@@ -1158,8 +1165,8 @@ msgid "unmounting %s"
msgstr "מנתק ×ת %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "מ×גר \"%s\" ×œ× × ×‘×—×¨"
#: ../urpm/removable.pm:143
@@ -1177,47 +1184,47 @@ msgstr "מ×גר ×œ× ×¨×¦×™×£ \"%s\" מסומן כניתן למחיקה ×בל
msgid "unable to access medium \"%s\""
msgstr "הגישה למדיה \"%s\" נכשלה"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "×œ× × ×ž×¦××” חבילה ×‘×©× %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "The following packages contain %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "עקב %s חסר"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "עקב תלות %s ×©×œ× ×ž×•×œ××”"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "מנסה ×œ×§×“× %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "בכדי לשמור %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "בכדי להתקין %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "עקב התנגשות ×¢× %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "×œ× ×”×ª×‘×§×©"
@@ -1238,7 +1245,7 @@ msgid "Missing signature (%s)"
msgstr "חתימה חסרה (%s)"
#: ../urpme:39
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpme version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1248,7 +1255,7 @@ msgid ""
"usage:\n"
msgstr ""
"גרסת urpme %s\n"
-"כל הזכויות שמורות (C) 1999-2005 Mandriva.\n"
+"כל הזכויות שמורות (C) 1999-2006 Mandriva.\n"
"זוהי תוכנה חופשית וניתן להפיצה בהת×× ×œ×ª× ××™ הרישיון GNU GPL.\n"
"\n"
"\n"
@@ -1322,9 +1329,9 @@ msgid " --probe-hdlist - use hdlist file.\n"
msgstr " --probe-hdlist - נסה ×œ×ž×¦×•× ×•×œ×”×©×ª×ž×© בקובץ hdlist.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - verbose mode.\n"
+msgstr " --verbose, -v - verbose mode.\n"
#: ../urpme:58
#, c-format
@@ -1361,23 +1368,32 @@ msgstr "שו×-דבר למחיקה"
msgid "Checking to remove the following packages"
msgstr "בדיקה להסרה של החבילות הב×ות"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "בכדי לענות על התלויות, %d החבילות הב×ות יימחקו (%d MB)"
+msgstr[1] "בכדי לענות על התלויות, %d החבילות הב×ות יימחקו (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "בכדי לענות על התלויות, %d החבילות הב×ות יימחקו (%d MB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "מסיר חבילה %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "מסיר חבילה %s"
+msgstr[1] "מסיר חבילה %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (כן/*ל×) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "ההסרה נכשלה"
@@ -1630,7 +1646,7 @@ msgstr " --verbose - verbose mode.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - הצגת רשימת ×”×§×‘×¦×™× ×‘×—×‘×™×œ×”.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - הדפסת גרסה, שחרור ו×רכיון ×¢× ×©×.\n"
@@ -1640,12 +1656,12 @@ msgstr " -f - הדפסת גרסה, שחרור ו×רכיון ×¢× ×
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "שימוש בסביבה מסוימת על %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1654,13 +1670,13 @@ msgstr ""
"Note: מ×חר ו××£ ×חד מהמקורות ×”×–×ž×™× ×™× ×œ× ×ž×©×ª×ž×© ב-hdlists, urpmf ×œ× ×”×¦×œ×™×— ×œ×ž×¦×•× "
"××£ תוצ××” רלונטית\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "ב×פשרותך להשתמש ב --name לחפש ×חר שמות חבילות.\n"
#: ../urpmi:79
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi version %s\n"
"Copyright (C) 1999-2006 Mandriva.\n"
@@ -1670,7 +1686,7 @@ msgid ""
"usage:\n"
msgstr ""
"גרסת urpmi %s\n"
-"כל הזכויות שמורות (C) 1999-2005 Mandriva.\n"
+"כל הזכויות שמורות (C) 1999-2006 Mandriva.\n"
"זוהי תוכנה חופשית וניתן להפיצה בהת×× ×œ×ª× ××™ הרישיון GNU GPL.\n"
"\n"
"\n"
@@ -1705,14 +1721,14 @@ msgstr ""
" --auto-select - automatically select packages to upgrade the system.\n"
#: ../urpmi:94
-#, fuzzy, c-format
+#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr " --no-md5sum - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
+msgstr " --no-md5sum - נטרל בדיקת חתימת MD5SUM של הקובץ.\n"
#: ../urpmi:95
-#, fuzzy, c-format
+#, c-format
msgid " --force-key - force update of gpg key.\n"
-msgstr " --force-key - ×לץ עדכון מפתח gpg.\n"
+msgstr " --force-key - ×לץ עדכון מפתח gpg.\n"
#: ../urpmi:96
#, c-format
@@ -1753,14 +1769,14 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr " --split-length - ×ורך טרנזקציה קצרה, ברירת המחדל ×”×™× %d.\n"
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " --fuzzy - מפעיל חיפוש מקורב (זהה ל -y).\n"
+msgstr " --fuzzy, -y - מפעיל חיפוש מקורב.\n"
#: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
msgid " --src, -s - next package is a source package.\n"
-msgstr " --src - החבילה הב××” ×”×™× ×—×‘×™×œ×ª מקור (×ותו הדבר כמו -s).\n"
+msgstr " --src, -s - החבילה הב××” ×”×™× ×—×‘×™×œ×ª מקור.\n"
#: ../urpmi:106
#, c-format
@@ -1951,7 +1967,7 @@ msgstr " --noclean - ×ל תמחק חבילות מהמטמון.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - עדכן רק חבילות בעלות ×ותה ×רכיטקטורה.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - select all matches on command line.\n"
@@ -1967,9 +1983,9 @@ msgid " -P - do not search in provides to find package.\n"
msgstr " -P - do not search in provides to find package.\n"
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - מצב שקט.\n"
+msgstr " --quiet, -q - מצב שקט.\n"
#: ../urpmi:157
#, c-format
@@ -2020,65 +2036,68 @@ msgstr ""
"שגי××”: נר××” ו-%s עוגן לקרי××” בלבד.\n"
"עליך להשתמש ב --allow-force ל×לץ פעולה זו."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (לשדרג)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (לשדרג)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (להתקין)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (להתקין)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "מה ×”×™× ×‘×—×™×¨×ª×š? (1-%d)"
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"החבילות הב×ות ×œ× × ×™×ª× ×•×ª להתקנה מ×חר והן תלויות בחבילות\n"
"מגרס×ות קודמות מ×לו המותקנות במחשבך:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"החבילות הב×ות ×œ× × ×™×ª× ×•×ª להתקנה מ×חר והן תלויות בחבילות\n"
"מגרס×ות קודמות מ×לו המותקנות במחשבך:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "×”×× ×œ×”×ž×©×™×š בכל ×–×ת?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr "×ישור/ביטול (*×›/ל) "
@@ -2088,56 +2107,65 @@ msgstr "×ישור/ביטול (*×›/ל) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"×œ× ×™×›×•×œ להתקין כמה חבילות מבוקשות:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"×œ× ×™×›×•×œ להתקין כמה חבילות מבוקשות:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"ההתקנה ×œ× ×™×›×•×œ×” להמשיך בגלל החבילות הב×ות\n"
"יש צורך להסיר ×ותן, בכדי לשדרג ×ת ×”×חרות:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"ההתקנה ×œ× ×™×›×•×œ×” להמשיך בגלל החבילות הב×ות\n"
"יש צורך להסיר ×ותן, בכדי לשדרג ×ת ×”×חרות:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"החבילות הב×ות עומדות להימחק בכדי שניתן ×™×”×™×” לשדרג חבילות ×חרות: \n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"החבילות הב×ות עומדות להימחק בכדי שניתן ×™×”×™×” לשדרג חבילות ×חרות: \n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2146,106 +2174,117 @@ msgstr ""
"יש צורך בהרש×ות מנהל מערכת בכדי להתקין ×ת התלויות הב×ות: \n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
-#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] ""
-msgstr[1] ""
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "נכשלה התקנת החבילות (%s)!"
+msgstr[1] "נכשלה התקנת החבילות (%s)!"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "× × ×œ×”×§×™×© Enter"
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "ביטול"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "לחבילות הב×ות יש בעיה בחתימות"
-msgstr[1] "לחבילות הב×ות יש בעיה בחתימות"
+msgstr "לחבילות הב×ות יש בעיה בחתימות"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "לחבילות הב×ות יש בעיה בחתימות"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "×”×× ×œ×”×ž×©×™×š בתהליך ההתקנה?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ההתקנה נכשלה"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "מפיץ %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "מתקין ×ת %s מתוך %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "מתקין %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ההתקנה נכשלה"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "×”×× ×œ× ×¡×•×ª להתקין ×œ×œ× ×‘×“×™×§×ª תלויות? (כן/*ל×)"
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "×”×× ×œ× ×¡×•×ª להתקין תוך ×ילוץ תלויות (--force)? (כן/ל×) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d עסקת התקנה נכשלה"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d עסקת התקנה נכשלה"
+msgstr[1] "%d עסקת התקנה נכשלה"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Installation is possible"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "הכל כבר מותקן"
-msgstr[1] "הכל כבר מותקן"
+msgstr "הכל כבר מותקן"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "הכל כבר מותקן"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "הכל כבר מותקן"
-msgstr[1] "הכל כבר מותקן"
+msgstr "הכל כבר מותקן"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "הכל כבר מותקן"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "מפעיל מחדש ×ת urpmi"
#: ../urpmi.addmedia:36
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
@@ -2257,13 +2296,12 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
-"usage: urpmi.addmedia [options] <name> <url> [with <relative_path>]\n"
+"usage: urpmi.addmedia [options] <name> <url>\n"
"where <url> is one of\n"
-" [file:/]/<path> with <relative filename of hdlist>\n"
-" ftp://<login>:<password>@<host>/<path> with <relative filename of "
-"hdlist>\n"
-" ftp://<host>/<path> with <relative filename of hdlist>\n"
-" http://<host>/<path> with <relative filename of hdlist>\n"
+" [file:/]/<path>\n"
+" ftp://<login>:<password>@<host>/<path>\n"
+" ftp://<host>/<path>\n"
+" http://<host>/<path>\n"
" removable://<path>\n"
"\n"
"and [options] are from\n"
@@ -2346,17 +2384,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - הוסף ×ת המקור לרשימה, ×בל ×ל תעדכן ×ת רשימת הקבצי×.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - ניקוי ספריית מטמון כותרי×.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - מצב שקט.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - verbose mode.\n"
@@ -2414,7 +2452,7 @@ msgid "unable to create medium \"%s\"\n"
msgstr "הוספת המ×גר \"%s\" נכשל\n"
#: ../urpmi.recover:28
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmi.recover version %s\n"
"Copyright (C) 2006 Mandriva.\n"
@@ -2423,8 +2461,8 @@ msgid ""
"\n"
"usage:\n"
msgstr ""
-"גרסת urpme %s\n"
-"כל הזכויות שמורות (C) 1999-2005 Mandriva.\n"
+"גרסת urpmi.recover %s\n"
+"כל הזכויות שמורות (C) 2006 Mandriva.\n"
"זוהי תוכנה חופשית וניתן להפיצה בהת×× ×œ×ª× ××™ הרישיון GNU GPL.\n"
"\n"
"\n"
@@ -2490,8 +2528,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2549,12 +2589,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"usage: urpmi.removemedia [-a] <name> ...\n"
+"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
#: ../urpmi.removemedia:41
@@ -2616,26 +2656,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - ×ל תעדכן, סמן מקור ×–×” כמ×ופשר.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - do not try to find any synthesis or\n"
+" hdlist file.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - בחירת כל המדיות ש×ינן ניתנות להסרה.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - ×לץ חילול קבצי hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "רק מנהל מערכת מורשה לעדכן מקור תוכנה"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "×ין מה לעדכן (יש להשתמש ב urpmi.addmedia לצורך הוספת מ×גר)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2644,23 +2692,23 @@ msgstr ""
"×œ× ×—×¡×¨×” ×©×•× ×›× ×™×¡×” המיועדת לעדכון\n"
"(×חד מ %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "×ž×ª×¢×œ× ×ž×ž×§×•×¨ \"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "מ×פשר ×ת המקור %s"
#: ../urpmq:43
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmq version %s\n"
"Copyright (C) 2000-2006 Mandriva.\n"
@@ -2670,7 +2718,7 @@ msgid ""
"usage:\n"
msgstr ""
"urpmq גרסה %s\n"
-"כל הזכויות שמורות (C) 2000-2005 Mandriva.\n"
+"כל הזכויות שמורות (C) 2000-2006 Mandriva.\n"
"זוהי תוכנה חופשית וניתן להפיצה בהת×× ×œ×ª× ××™ הרישיון GNU GPL.\n"
"\n"
"שימוש:\n"
@@ -2755,124 +2803,136 @@ msgstr " --changelog - הדפס דו\"×— שינויי×.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - הצג מידע תמציתי.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+" --whaterquires - בצע חיפוש הפוך ×חר חבילות הדורשות ×ת החבילה המוגדרת.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - חיפוש הפוך מורחב (כולל חבילות וירטו×ליות).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - search in provides to find package.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -a - בחירת כל החבילות ×¢× ×‘×™×˜×•×™ מת××™×.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - הרחב ×ת הש×ילתה לתלויות החבילות.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - הצג ×’× ×§×‘×•×¦×•×ª ×¢× ×©× ×–×”.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - הדפס מידע שימושי ב×ופן המובן לבני-×נוש.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - הצגת רשימת ×”×§×‘×¦×™× ×‘×—×‘×™×œ×”.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - do not search in provides to find package (default).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - search in provides to find package.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - מצב שקט.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - print version and release with name also.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-" -R - בצע חיפוש הפוך ×חר חבילות הדורשות ×ת החבילה המוגדרת.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -RR - חיפוש הפוך מורחב (כולל חבילות וירטו×ליות).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - החבילה הב××” ×”×™× ×—×‘×™×œ×ª מקור (×ותו הדבר כמו --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - הסרת חבילה ×× ×’×¨×¡×” מ×וחרת יותר כבר מותקנת.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impose fuzzy search (same as --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - כמו -y, ×בל מ×לץ בדיקה תלויית רישיות.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " שמות ×ו קובצי RPM שניתנו בשורת הפקודה נמצ××™× ×‘×¡×™×ž×Ÿ ש×לה.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ניתן לשימוש רק ביחד ×¢× --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Note: מ×חר ו××£ ×חד מהמקורות ×”×–×ž×™× ×™× ×œ× ×ž×©×ª×ž×© ב-hdlists, urpmf ×œ× ×”×¦×œ×™×— ×œ×ž×¦×•× "
+"××£ תוצ××” רלונטית\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "×œ× × ×ž×¦××” רשימת קבצי×\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Note: מ×חר ו××£ ×חד מהמקורות ×”×–×ž×™× ×™× ×œ× ×ž×©×ª×ž×© ב-hdlists, urpmf ×œ× ×”×¦×œ×™×— ×œ×ž×¦×•× "
+"××£ תוצ××” רלונטית\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "×œ× × ×ž×¦××” רשימת שינויי×\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "×œ× × ×ž×¦××” רשימת קבצי×\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] "בכדי לספק ×ת התלויות, החבילות הב×ות יותקנו (%d MB)"
-#~ msgstr[1] "בכדי לספק ×ת התלויות, החבילות הב×ות יותקנו (%d MB)"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - do not search in provides to find package (default).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - בצע חיפוש הפוך ×חר חבילות הדורשות ×ת החבילה המוגדרת.\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2882,45 +2942,9 @@ msgstr "×œ× × ×ž×¦××” רשימת שינויי×\n"
#~ "בכדי לספק ×ת התלויות, %d החבילות הב×ות יותקנו:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "בכדי לספק ×ת התלויות, %d החבילות הב×ות יותקנו:\n"
-#~ "%s\n"
-#~ msgstr[1] ""
-#~ "בכדי לספק ×ת התלויות, %d החבילות הב×ות יותקנו:\n"
-#~ "%s\n"
-
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "מדלג על המקור %s: ×œ× ×§×™×™× ×§×•×‘×¥ hdlist"
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "ההתקנה נכשלה"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "מתקין חבילה `%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "בודק ×ת קובץ ×”synthesis [%s]"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "מפיץ %s"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "התקנת חבילה..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "התקנת חבילה..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - נסה לחפש ולהשתמש בקובץ synthesis.\n"
@@ -3170,14 +3194,6 @@ msgstr "×œ× × ×ž×¦××” רשימת שינויי×\n"
#~ "×œ× ×™×›×•×œ להתקין כמה חבילות מבוקשות:\n"
#~ "%s"
-#, fuzzy
-#~ msgid ""
-#~ " --keep - keep existing packages if possible, reject requested\n"
-#~ " packages that leads to remove.\n"
-#~ msgstr ""
-#~ " --keep - keep existing packages if possible, reject requested\n"
-#~ " packages that lead to removals.\n"
-
#~ msgid "unable to write file [%s]"
#~ msgstr "נכשלה הכתיבה לקובץ [%s]"
diff --git a/po/hi.po b/po/hi.po
index 100908cf..7129fad4 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-hi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-08-23 20:11+0530\n"
"Last-Translator: धनञà¥à¤œà¤¯ शरà¥à¤®à¤¾ (Dhananjaya Sharma)\n"
"Language-Team: Hindi, India\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: KBabel 1.10\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "आरपीà¤à¤® संसाधन"
@@ -28,7 +28,7 @@ msgstr "आरपीà¤à¤® संसाधन"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "ठीक (_O)"
@@ -94,7 +94,7 @@ msgstr "संसाधन (_I)"
msgid "_Save"
msgstr "सà¥à¤°à¤•à¥à¤·à¤¿à¤¤ (_S)"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "खतà¥à¤® करें (_C)"
@@ -104,29 +104,29 @@ msgstr "खतà¥à¤® करें (_C)"
msgid "Choose location to save file"
msgstr "संचिका को सà¥à¤°à¤•à¥à¤·à¤¿à¤¤ करने के सà¥à¤¥à¤¾à¤¨ का चयन करें"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"अजà¥à¤žà¤¾à¤¤ विकलà¥à¤ª '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "%s नाम का कोई पैकेज नहीं है"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "कृपया पà¥à¤°à¤¤à¥€à¤•à¥à¤·à¤¾ करें..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "रूट होना चाहिà¤"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"निवेदित किये हà¥à¤ कà¥à¤› पैकेज संसाधित नहीं किये जा सके:\n"
"%sजारी रहा जाà¤à¤?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "चेतावनी"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "ओ०के०"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr "(अपगà¥à¤°à¥‡à¤¡ के लिà¤)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr "(संसाधन के लिà¤)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "पैकेज चयन"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों में से à¤à¤• की आवशà¥à¤¯à¤•à¤¤à¤¾ है:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "निषà¥à¥žà¤² (_A)"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -181,43 +181,49 @@ msgstr ""
"अनà¥à¤¯ पैकजों को उनà¥à¤¨à¤¯à¤¨ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों हटाना होगा:\n"
"%sजारी रहा जाà¤à¤?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"आधीनताओं को सनà¥à¤¤à¥à¤·à¥à¤Ÿ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेज का संसाधन होने जा रहा है(%d à¤à¤®à¤¬à¥€)"
-msgstr[1] ""
+msgstr ""
"आधीनताओं को सनà¥à¤¤à¥à¤·à¥à¤Ÿ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेज का संसाधन होने जा रहा है(%d à¤à¤®à¤¬à¥€)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"अधीनताओं को सनà¥à¤¤à¥à¤·à¥à¤Ÿ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित %d पैकेजों का संसाधन होने जा रहा है:\n"
+"%s\n"
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d पैकेज"
+msgstr[1] "%d पैकेज"
+
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "पैकेज संसाधित हो रहा है..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "सà¥à¤°à¥‹à¤¤à¥à¤° पैकेजों को पाने में असमरà¥à¤¥, कारà¥à¤¯à¤•à¥à¤°à¤® विफ़ल किया जा रहा है"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "कृपया \"%s\" नामक माधà¥à¤¯à¤® को [%s] साधन पर पà¥à¤°à¤µà¥‡à¤¶ करें"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' पैकेज को डॉउनलोड किया जा रहा है..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -230,7 +236,7 @@ msgstr ""
"\n"
"कà¥à¤¯à¤¾ आप संसाधन जारी रखना चाहते है?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -241,37 +247,37 @@ msgstr ""
"%s\n"
"आपको अपना यू०आर०पी०à¤à¤®à¥¦à¤†à¤ˆà¥¦ डाटाबेस को अपडेट करना चाहिà¤"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s को हटाया जा रहा है"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "तैयारी की जा रही है..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) पैकेज को संसाधित किया जा रहा है..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "किया गया(_D)"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "संसाधन असफ़ल"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "सभी कà¥à¤› पहिले से ही संसाधित है"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "संसाधन समापà¥à¤¤"
@@ -320,63 +326,63 @@ msgstr "सिरà¥à¥ž महाउपयोगकरà¥à¤¤à¤¾ को ही à¤
msgid "Running urpmi in restricted mode..."
msgstr "यूआरपीà¤à¤®à¤†à¤ˆ सीमित विधा में चल रही है..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "आर०पी०à¤à¤®à¥¦à¤¡à¥€à¥¦à¤¬à¥€à¥¦ को खोलने में असमरà¥à¤¥"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "अवैध आर०पी०à¤à¤®à¥¦ संचिका नाम [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "आर०पी०à¤à¤®à¥¦ संचिका [%s] को पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ किया जा रहा है..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ करने की कà¥à¤°à¤¿à¤¯à¤¾ संपनà¥à¤¨"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ करने में असफ़लता: %s "
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "आर०पी०à¤à¤®à¥¦ संचिका [%s] को पाने में असमरà¥à¤¥"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" का पदभंजन [%s] संचिका में करने में असमरà¥à¤¥"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "आर०पी०à¤à¤®à¥¦ संचिका का पंजीकरण में असमरà¥à¤¥"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "सà¥à¤¥à¤¾à¤¨à¥€à¤¯ पैकेजों का पंजीकरण करने में तà¥à¤°à¥à¤Ÿà¤¿"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "सीमित विधा में चलते समय, इस संकà¥à¤°à¤¿à¤¯à¤¾ को मनाही है"
@@ -396,27 +402,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "इस निरà¥à¤¦à¥‡à¤¶ को उपयोग करने के लिठआपको महा-उपयोगकरà¥à¤¤à¤¾ होना चाहिठ!\n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: आर०पी०à¤à¤®à¥¦ संचिका \"%s\" को नहीं पॠसकता है\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® के लिठहारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤•-सूची की कृतà¥à¤°à¤¿à¤® संचिका बनायें"
@@ -441,7 +447,7 @@ msgstr "संरचना-संचिका [%s] को लिखने मे
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "संरचना-संचिका [%s] को लिखने में असमरà¥à¤¥"
@@ -449,17 +455,17 @@ msgstr "संरचना-संचिका [%s] को लिखने मे
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "कृपया पà¥à¤°à¥‹à¤•à¥à¤¸à¥€ पर पहà¥à¤à¤š पाने के लिठअपने अधिकार-पतà¥à¤° बताà¤à¤\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "उपयोकà¥à¤¤à¤¾ नामः"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "पासवरà¥à¤¡: "
#: ../urpm/download.pm:185
#, c-format
@@ -571,7 +577,7 @@ msgstr "यहाठबहà¥à¤¤ सारे पैकेज \"%s\" संचà
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "भली-भांति से [%s] का पदभंजन \"%s\" मान पर करने में असमरà¥à¤¥"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "\"%s\" की संचिका-सूची को पाने में असमरà¥à¤¥, माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
@@ -685,9 +691,9 @@ msgid "No base defined"
msgstr "%s नाम का कोई पैकेज नहीं है"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "रंगमैप पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿà¤¿à¤¯à¤¾à¤‚ आवंटित नहीं की जा सकती है"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -711,7 +717,7 @@ msgstr ""
"विदà¥à¤¯à¤®à¤¾à¤¨ हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची (या कृतà¥à¤°à¤¿à¤® रचनाओं) की पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿à¤¯à¥‹à¤‚ के à¤à¤®à¥¦à¤¡à¥€à¥¦à¥«à¤¸à¤® (md5sum) की "
"गणना की जा रही है"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -720,107 +726,107 @@ msgstr ""
"कालà¥à¤ªà¤¨à¤¿à¤• माधà¥à¤¯à¤® \"%s\" को हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची या सूची संचिका को परिभाषित नहीं करना चाहिà¤,"
"माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"कालà¥à¤ªà¤¨à¤¿à¤• माधà¥à¤¯à¤® \"%s\" के पास à¤à¤• सà¥à¤ªà¤·à¥à¤Ÿ यू०आर०à¤à¤²à¥¦ होना चाहिà¤, माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "अवैध आर०पी०à¤à¤®à¥¦ संचिका नाम [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "\"%s\" के लिठसंचिका-सूची को खोजने में असमरà¥à¤¥, माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "अविदà¥à¤¯à¤®à¤¾à¤¨ माधà¥à¤¯à¤® \"%s\" को चयन का पà¥à¤°à¤¯à¤¾à¤¸ किया जा रहा है"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" माधà¥à¤¯à¤® के लिठहारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤•-सूची की कृतà¥à¤°à¤¿à¤® संचिका बनायें"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" की हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• संचिका-सूची को पाने में असमरà¥à¤¥, माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "\"%s\" की हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• संचिका का पदभंजन करने में असमरà¥à¤¥"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"\"%s\" माधà¥à¤¯à¤®, à¤à¤• पहिले से उपयोग की जा रही हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची को उपयोग करने की चेषà¥à¤Ÿà¤¾ कर "
"रहा है, माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"\"%s\" माधà¥à¤¯à¤®, à¤à¤• पहिले से उपयोग की जा रही सूची को उपयोग करने की चेषà¥à¤Ÿà¤¾ कर रहा है, "
"माधà¥à¤¯à¤® सà¥à¤µà¥€à¤•à¤¾à¤° नहीं है"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "विदà¥à¤¯à¤®à¤¾à¤¨ माधà¥à¤¯à¤® \"%s\" से अलग हट कर निकलने की चेषà¥à¤Ÿà¤¾, बच निकला जा रहा है"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "हटाने-योगà¥à¤¯ माधà¥à¤¯à¤® \"%s\" के लिठबहà¥à¤¤ सारे आरोह बिंदà¥"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "हटाने-योगà¥à¤¯ साधनों को \"%s\" की भांति लिया जा रहा है"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "\"%s\" माधà¥à¤¯à¤® à¤à¤• आईसो इमेज है, और देखते-देखते माउनà¥à¤Ÿ कर दिया जायेगा"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "विभिनà¥à¤¨ हटाने-योगà¥à¤¯ साधनों [%s] का उपयोग \"%s\" के लिठहो रहा है"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "हटाने-योगà¥à¤¯ माधà¥à¤¯à¤® \"%s\" के लिठपथ-नाम को पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ करने में असमरà¥à¤¥"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "संरचना-संचिका [%s] लिखें"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "use-distrib विधा के साथ सामानà¥à¤¤à¤° विधा का उपयोग नहीं किया जा सकता है"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "समानà¥à¤¤à¤° मोड: %s के लिठसंयà¥à¤•à¥à¤¤ माधà¥à¤¯à¤® का उपयोग हो रहा है"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -829,144 +835,144 @@ msgstr ""
"--synthesis का उपयोग --media, --excludemedia, --sortmedia, --update या --"
"parallel के साथ नहीं किया जा सकता है"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"सूचना: कà¥à¤¯à¥‹à¤‚कि खोज किये गये माधà¥à¤¯à¤® ने à¤à¤šà¤¡à¥€à¤¸à¥‚चियों का उपयोग किया, अतैव यूआरपीà¤à¤®à¤à¥ž किसी "
"परिणाम को बताने में असमरà¥à¤¥ रहा था\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "खोज आरमà¥à¤­: %s समापà¥à¤¤: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "आधीनताओं की गणना का दà¥à¤µà¤¿à¤¤à¥€à¤¯ चरण पूरा किया जा रहा है\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s पैकेज को तà¥à¤¯à¤¾à¤—ा जा रहा है"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s को उनà¥à¤¨à¤¯à¤¨ करने की बजाय संसाधित किया जायेगा"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" माधà¥à¤¯à¤® पहिले से विदà¥à¤¯à¤®à¤¾à¤¨ है"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "कालà¥à¤ªà¤¨à¤¿à¤• माधà¥à¤¯à¤® को सà¥à¤¥à¤¾à¤¨à¥€à¤¯ होने की आवशà¥à¤¯à¤•à¤¤à¤¾ है"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® से शीरà¥à¤·à¤• पà¥à¥‡ जा रहे है"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® को हटाया जा रहा है"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "पà¥à¤°à¤¥à¤® संसाधन माधà¥à¤¯à¤® को पाने में असमरà¥à¤¥"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिका को पà¥à¤¨à¤ƒà¤ªà¥à¤°à¤¾à¤ªà¥à¤¤ किया जा रहा है..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "आर०पी०à¤à¤®à¥¦à¤¡à¥€à¥¦à¤¬à¥€à¥¦ को खोलने में असमरà¥à¤¥"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "पà¥à¤°à¤¥à¤® संसाधन माधà¥à¤¯à¤® को पाने में असमरà¥à¤¥ (कोई हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिका नहीं मिली)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "अविदà¥à¤¯à¤®à¤¾à¤¨ माधà¥à¤¯à¤® \"%s\" को चयन का पà¥à¤°à¤¯à¤¾à¤¸ किया जा रहा है"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "बहà¥à¤¤ सारे माधà¥à¤¯à¤®à¥‹à¤‚ का चयन हो रहा है: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® को हटाया जा रहा है"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® हेतॠयू०आर०पी०à¤à¤®à¥¦à¤†à¤ˆà¥¦ को पà¥à¤¨à¤ƒ संरचित किया जा रहा है"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...पà¥à¤¨à¤ƒà¤¸à¤‚रचना पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ असफ़ल"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "पà¥à¤¨à¤ƒà¤¸à¤‚रचना पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ समà¥à¤ªà¤¨à¥à¤¨ हà¥à¤ˆ"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "माधà¥à¤¯à¤® \"%s\" का चयन नहीं किया गया है"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤•-सूची संचिका [%s] का निरीकà¥à¤·à¤£ किया जा रहा है"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "कृतà¥à¤°à¤¿à¤® संचिका [%s] का निरीकà¥à¤·à¤£ किया जा रहा है"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤•-सूची [%s] का निरà¥à¤®à¤¾à¤£ किया जा रहा है"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -975,81 +981,81 @@ msgstr ""
"\"%s\" माधà¥à¤¯à¤® के लिठकृतà¥à¤°à¤¿à¤® संचिका का निरà¥à¤®à¤¾à¤£ करने में असमरà¥à¤¥ । समà¥à¤­à¤µà¤¤à¤¾ आपकी हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤•-"
"सूची भà¥à¤°à¤·à¥à¤Ÿ हो गयी है ।"
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® की हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिका या कृतà¥à¤°à¤¿à¤® संचिका को पà¥à¤¨à¥‡ में सामसà¥à¤¯à¤¾"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ बनना असफ़ल"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" संचिका के विवरण की पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ बनायी जा रहीं है..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ बनना समà¥à¤ªà¤¨à¥à¤¨ हà¥à¤†"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" माधà¥à¤¯à¤® के लिठसंचिका-सूची लिखी जा रही है"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] की पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ असफ़ल रही (संचिका सनà¥à¤¦à¥‡à¤¹à¤¾à¤¤à¥à¤®à¤• à¥à¤— से छोटी है)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"सà¥à¤°à¥‹à¤¤à¥à¤° हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची (या कृतà¥à¤°à¤¿à¤® रचनाओं) की पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿à¤¯à¥‹à¤‚ की à¤à¤®à¥¦à¤¡à¥€à¥¦à¥«à¤¸à¤® (md5sum) की "
"गणना की जा रही है"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] की पà¥à¤°à¤¤à¤¿à¤²à¤¿à¤ªà¤¿ अयोगà¥à¤¯ है (à¤à¤®à¤¡à¥€à¥«à¤¸à¤® बेमेल है)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ की हà¥à¤ˆ सà¥à¤°à¥‹à¤¤à¥à¤° हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची (या कृतà¥à¤°à¤¿à¤® रचना) के à¤à¤®à¥¦à¤¡à¥€à¥¦à¥«à¤¸à¤® (md5sum) की "
"गणना की जा रही है"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ करने में असफ़लता: à¤à¤®à¥¦à¤¡à¥€à¥¦à¥«à¤¸à¤® (md5sum) बेमेल "
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] कि लिठकोई आर०पी०à¤à¤®à¥¦ संचिकाà¤à¤‚ नहीं मिली"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] से आर०पी०à¤à¤®à¥¦ संचिकाओं को पà¥à¤¾ जा रहा है"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "आर०पी०à¤à¤®à¥¦ संचिकाओं को [%s] से पà¥à¤¨à¥‡ में असमरà¥à¤¥: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "कोई आरपीà¤à¤®à¤à¤¸ नहीं पà¥à¤¾ गया"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1059,78 +1065,78 @@ msgstr ""
"\"%s\" माधà¥à¤¯à¤® की पहà¥à¤à¤š में असमरà¥à¤¥,\n"
"यह समà¥à¤­à¤µ है जब आपने माधà¥à¤¯à¤® का निरà¥à¤®à¤¾à¤£ करते समय, निरà¥à¤¦à¥‡à¤¶à¤¿à¤•à¤¾ कोसà¥à¤µà¤‚म ही आरोहित किया हो।"
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® के लिठकोई हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिका नहीं मिली"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" की मूल (या कृतà¥à¤°à¤¿à¤®) हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची पà¥à¤¨à¤ƒ पà¥à¤°à¤¾à¤ªà¥à¤¤ की जा रही है..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "खोजी हà¥à¤ˆ हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची (या कृतà¥à¤°à¤¿à¤® रचना)%s के रूप में मिली"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® के लिठकोई हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिका नहीं मिली"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" की सामानà¥à¤¯à¤œà¤¨ कूंजी संचिका का निरीकà¥à¤·à¤£ किया जा रहा है..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\" की पबà¥à¤²à¤¿à¤•à¤•à¥à¤‚जी संचिका से %s कà¥à¤‚जी आयातित कर ली गई है"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" की सामानà¥à¤¯à¤œà¤¨à¤•à¥à¤‚जी संचिका को आयात करने में असमरà¥à¤¥"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® के लिठसंचिका-सूची लिखी जा रही है"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s माधà¥à¤¯à¤® को जोड़ा गया"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" की हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• संचिका का पदभंजन करने में असमरà¥à¤¥"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® की कृतà¥à¤°à¤¿à¤® संचिका को पà¥à¤¨à¥‡ में समसà¥à¤¯à¤¾"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® से शीरà¥à¤·à¤• पà¥à¥‡ जा रहे है"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "कà¥à¤·à¤®à¤¾ करें, खराब पसनà¥à¤¦, पà¥à¤¨à¤ƒ पà¥à¤°à¤¯à¤¾à¤¸ करें\n"
@@ -1166,8 +1172,8 @@ msgid "unmounting %s"
msgstr "%s को अवरोह (अनमाउनà¥à¤Ÿ) किया जा रहा है"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "माधà¥à¤¯à¤® \"%s\" का चयन नहीं किया गया है"
#: ../urpm/removable.pm:143
@@ -1185,47 +1191,47 @@ msgstr "बेमेल माधà¥à¤¯à¤® \"%s\" को हटानेयोà¤
msgid "unable to access medium \"%s\""
msgstr "\"%s\" माधà¥à¤¯à¤® को पाने में असमरà¥à¤¥"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "%s नाम का कोई पैकेज नहीं है"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेज %s को समाहित करते है: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s के ना मिलने के कारण"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "असनà¥à¤¤à¥à¤·à¥à¤Ÿ %s के कारण"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "%s को पà¥à¤°à¥‹à¤¤à¥à¤¸à¤¾à¤¹à¤¿à¤¤ करने का पà¥à¤°à¤¯à¤¾à¤¸ किया जा रहा है"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s को रखने के लिà¤"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s को संसाधित के लिà¤"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s के साथ विरोधाभास के कारण"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "बिना निवेदन किया हà¥à¤†"
@@ -1373,23 +1379,34 @@ msgstr "हटाने को कà¥à¤› भी नहीं"
msgid "Checking to remove the following packages"
msgstr "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों को हटाने जाने के लिठजाà¤à¤š हो रही है"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"अधिनताओं को सनà¥à¤¤à¥à¤·à¥à¤Ÿ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों %d को हटाया जायेगा (%d à¤à¤®à¤¬à¥€)"
+msgstr[1] ""
+"अधिनताओं को सनà¥à¤¤à¥à¤·à¥à¤Ÿ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों %d को हटाया जायेगा (%d à¤à¤®à¤¬à¥€)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "अधिनताओं को सनà¥à¤¤à¥à¤·à¥à¤Ÿ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों %d को हटाया जायेगा (%d à¤à¤®à¤¬à¥€)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "%s पैकेज को हटाया जा रहा है"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s पैकेज को हटाया जा रहा है"
+msgstr[1] "%s पैकेज को हटाया जा रहा है"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr "(हाà¤/ना:y/N)"
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "हटाना असफ़ल"
@@ -1647,7 +1664,7 @@ msgstr " --verbose - शबà¥à¤¦à¥‹à¤‚ का वॄथा पà¥à¤°à¤¯à¥
msgid " -m - the media in which the package was found\n"
msgstr " -l - पैकेज में सà¥à¤¥à¤¿à¤¤ संचिकाओं की सूची।\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - \tमà¥à¤¦à¥à¤°à¤¿à¤¤ संसà¥à¤®à¤°à¤£, विमोचन और आरà¥à¤š नाम के साथ\n"
@@ -1657,12 +1674,12 @@ msgstr " -f - \tमà¥à¤¦à¥à¤°à¤¿à¤¤ संसà¥à¤®à¤°à¤£, वि
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s पर विशिषà¥à¤Ÿ वातावरण का उपयोग करते हà¥à¤\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1671,7 +1688,7 @@ msgstr ""
"सूचना: कà¥à¤¯à¥‹à¤‚कि खोज किये गये माधà¥à¤¯à¤® ने à¤à¤šà¤¡à¥€à¤¸à¥‚चियों का उपयोग किया, अतैव यूआरपीà¤à¤®à¤à¥ž किसी "
"परिणाम को बताने में असमरà¥à¤¥ रहा था\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "पैकेज के नामों की खोज हेतॠआप --name का उपयोग करना चाहेगें।\n"
@@ -1970,7 +1987,7 @@ msgstr " --noclean - कैश में से आरपीà¤à¤®à¥‹à¤‚ à
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - समान संरचना वाले पैकेजों को ही अपगà¥à¤°à¥‡à¤¡ करें।\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - निरà¥à¤¦à¥‡à¤¶ वाकà¥à¤¯ पर सभी मिलानों को चयन करें\n"
@@ -2043,65 +2060,68 @@ msgstr ""
"तà¥à¤°à¥à¤Ÿà¤¿: समà¥à¤­à¤µà¤¤à¤¾ %s को सिरà¥à¥ž-पà¥à¤¨à¥‡-के लिठमाउनà¥à¤Ÿ किया गया लगता है ।\n"
"इस पà¥à¤°à¤•à¥à¤°à¤¿à¤¯à¤¾ को बल-पूरà¥à¤µà¤• करने के लिठ--allow-force विकलà¥à¤ª का उपयोग करें ।"
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "(अपगà¥à¤°à¥‡à¤¡ के लिà¤)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "(अपगà¥à¤°à¥‡à¤¡ के लिà¤)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "(संसाधन के लिà¤)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "(संसाधन के लिà¤)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "आपकी कà¥à¤¯à¤¾ इचà¥à¤›à¤¾ है? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"निमà¥à¤®à¤²à¤¿à¤–ित पैकेजो को संसाधित नहीं किया जा सका कà¥à¤¯à¥‹à¤‚कि ये उन पैकेजो पर आशà¥à¤°à¤¿à¤¤ है जो कि\n"
"संसाधित किये जा चà¥à¤•à¥‡ पैकेजो से पहिले के है:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"निमà¥à¤®à¤²à¤¿à¤–ित पैकेजो को संसाधित नहीं किया जा सका कà¥à¤¯à¥‹à¤‚कि ये उन पैकेजो पर आशà¥à¤°à¤¿à¤¤ है जो कि\n"
"संसाधित किये जा चà¥à¤•à¥‡ पैकेजो से पहिले के है:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "कà¥à¤› भी हो जारी रहा जायें?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr "(हाà¤/ना:Y/n)"
@@ -2111,56 +2131,65 @@ msgstr "(हाà¤/ना:Y/n)"
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"निवेदन किये हà¥à¤ कà¥à¤› पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"निवेदन किये हà¥à¤ कà¥à¤› पैकेज संसाधित नहीं किये जा सके:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"संसाधन जारी नहीं रकà¥à¤–ा जा सकता है कà¥à¤¯à¥‹à¤‚कि अनà¥à¤¯ पैकेजों को उनà¥à¤¨à¥à¤¤ बनाने के लिà¤\n"
"निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों को हटाना पड़ेगा:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"संसाधन जारी नहीं रकà¥à¤–ा जा सकता है कà¥à¤¯à¥‹à¤‚कि अनà¥à¤¯ पैकेजों को उनà¥à¤¨à¥à¤¤ बनाने के लिà¤\n"
"निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों को हटाना पड़ेगा:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"अनà¥à¤¯ पैकजों को उनà¥à¤¨à¤¯à¤¨ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों हटाना होगा:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"अनà¥à¤¯ पैकजों को उनà¥à¤¨à¤¯à¤¨ करने के लिà¤, निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों हटाना होगा:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2169,100 +2198,111 @@ msgstr ""
"निमà¥à¤¨à¤²à¤¿à¤–ित आधिनताओं को संसाधित करने लिà¤, आपको महाउपयोगकरà¥à¤¤à¤¾ होना चाहिà¤:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "तैयार होने पर इनà¥à¤Ÿà¤° (Enter) कà¥à¤‚जी को दबायें..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "निरसà¥à¤¤"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों पर खराब हसà¥à¤¤à¤¾à¤•à¥à¤·à¤¾à¤° है"
-msgstr[1] "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों पर खराब हसà¥à¤¤à¤¾à¤•à¥à¤·à¤¾à¤° है"
+msgstr "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों पर खराब हसà¥à¤¤à¤¾à¤•à¥à¤·à¤¾à¤° है"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "निमà¥à¤¨à¤²à¤¿à¤–ित पैकेजों पर खराब हसà¥à¤¤à¤¾à¤•à¥à¤·à¤¾à¤° है"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "कà¥à¤¯à¤¾ आप संसाधन जारी रखना चाहते है ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "संसाधन असफ़ल"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "%s वितिरण किया जा रहा है"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "%s को %s से संसाधित किया जा रहा है"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s का संसाधन किया जा रहा है"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "संसाधन असफ़ल"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "संसाधन का पà¥à¤°à¤¯à¤¾à¤¸ बिना आधिनताओं की जाà¤à¤š किये हà¥à¤ किया जाये? (हाà¤/ना)(y/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "संसाधन का पà¥à¤°à¤¯à¤¾à¤¸ और जोर से (बलपूरà¥à¤µà¤•) किया जाये (--force)? (हाà¤/ना)(y/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d संसाधन कà¥à¤°à¤¿à¤¯à¤¾-कलाप असफ़ल"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d संसाधन कà¥à¤°à¤¿à¤¯à¤¾-कलाप असफ़ल"
+msgstr[1] "%d संसाधन कà¥à¤°à¤¿à¤¯à¤¾-कलाप असफ़ल"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "संसाधन संभव है"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "सभी कà¥à¤› पहिले से ही संसाधित है"
-msgstr[1] "सभी कà¥à¤› पहिले से ही संसाधित है"
+msgstr "सभी कà¥à¤› पहिले से ही संसाधित है"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "सभी कà¥à¤› पहिले से ही संसाधित है"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "सभी कà¥à¤› पहिले से ही संसाधित है"
-msgstr[1] "सभी कà¥à¤› पहिले से ही संसाधित है"
+msgstr "सभी कà¥à¤› पहिले से ही संसाधित है"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "सभी कà¥à¤› पहिले से ही संसाधित है"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "यू०आर०पी०à¤à¤®à¥¦à¤†à¤ˆà¥¦ को पà¥à¤¨à¤ƒ आरमà¥à¤­ किया जा रहा है"
@@ -2371,17 +2411,17 @@ msgstr " --nopubkey - जोड़े गये माधà¥à¤¯à¤® की सà
msgid " --raw - add the media in config, but don't update it.\n"
msgstr " --raw - संरचना में माधà¥à¤¯à¤® को जोड़ना, परनà¥à¤¤à¥ इसे अपडेट ना करना । \n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - शीरà¥à¤· कैश निरà¥à¤¦à¥‡à¤¶à¤¿à¤•à¤¾ को सà¥à¤µà¤šà¥à¤› करें\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - शांत विधि\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - शबà¥à¤¦à¥‹à¤‚ का वॄथा पà¥à¤°à¤¯à¥‹à¤—िक विधि\n"
@@ -2515,8 +2555,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2574,12 +2616,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"उपयोग विधि: urpmi.removemedia [-a] <नाम> ...\n"
+"उपयोग विधि: urpmi.removemedia (-a | <नाम> ...)\n"
"जहाठ<नाम> à¤à¤• माधà¥à¤¯à¤® का नाम है जिसे हटाना है\n"
#: ../urpmi.removemedia:41
@@ -2643,28 +2685,36 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - अपडेट ना करना, माधà¥à¤¯à¤® को सकà¥à¤°à¤¿à¤¯ जैसा चिहà¥à¤¨à¤¨à¥à¤¤à¤¿ करना ।\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - किसी कृतà¥à¤°à¤¿à¤® या हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिका को खोजने का \n"
+" पà¥à¤°à¤¯à¤¾à¤¸ ना करें\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - सभी सà¥à¤¥à¤¿à¤° माधà¥à¤¯à¤®à¥‹à¤‚ का चयन करें\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - हारà¥à¤¡à¤¡à¤¿à¤¸à¥à¤• सूची संचिकाओं का बल-पूरà¥à¤µà¤• निरà¥à¤®à¤¾à¤£\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "सिरà¥à¥ž महाउपयोगकरà¥à¤¤à¤¾ को ही माधà¥à¤¯à¤® को अपडेट करने की अनà¥à¤®à¤¤à¤¿ है"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"अपडेट करने को कà¥à¤› भी नहीं (urpmi.addmedia निरà¥à¤¦à¥‡à¤¶ का उपयोग à¤à¤• माधà¥à¤¯à¤® को जोड़ने के लिठ"
"करें)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2673,17 +2723,17 @@ msgstr ""
"अपडेट की जाने वाली पà¥à¤°à¤µà¤¿à¤·à¥à¤Ÿà¤¿ लà¥à¤ªà¥à¤¤ है\n"
"(%s में से à¤à¤•)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "\"%s\" माधà¥à¤¯à¤® की ओर धà¥à¤¯à¤¾à¤¨ नहीं दिया जा रहा है"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "\"%s\" माधà¥à¤¯à¤® को सकà¥à¤°à¤¿à¤¯ किया जा रहा है"
@@ -2790,118 +2840,137 @@ msgstr " -changelog - परिवरà¥à¤¤à¤¨ लॉग का मà¥à¤¦à
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - सारांश को मà¥à¤¦à¥à¤°à¤¿à¤¤ करना।\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - पैकेजों की जो आवशà¥à¤¯à¤• है उससे विपरीत खोज करें\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - विपरीत खोज को विसà¥à¤¤à¥ƒà¤¤ करना (कालà¥à¤ªà¤¨à¤¿à¤• पैकेजों को शामिल करके)।\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤Ÿà¥‹à¤‚ में पैकेज पाने के लिठखोज ।\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - समà¥à¤ªà¥‚रà¥à¤£ आउटपà¥à¤Ÿ को पैकेज के साथ हटायें\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - जाà¤à¤š को पैकेज की अधिनताओं तक ले जायें\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - समूहों को नाम के साथ मà¥à¤¦à¥à¤°à¤¿à¤¤ करें\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - उपयोगी सूचनाओं का पठनीय रूप में मà¥à¤¦à¥à¤°à¤£\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - पैकेज में सà¥à¤¥à¤¿à¤¤ संचिकाओं की सूची।\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤Ÿà¥‹à¤‚ में पैकेज को पाने के लिठना खोजे (डिफ़ालà¥à¤Ÿ)।\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤Ÿà¥‹à¤‚ में पैकेज पाने के लिठखोज ।\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - शांत विधि\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - संसà¥à¤®à¤°à¤£ और विमोचन संखà¥à¤¯à¤¾ को नाम के साथ मà¥à¤¦à¥à¤°à¤¿à¤¤ करें\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - पैकेजों की जो आवशà¥à¤¯à¤• है उससे विपरीत खोज करें\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - विपरीत खोज को विसà¥à¤¤à¥ƒà¤¤ करना (कालà¥à¤ªà¤¨à¤¿à¤• पैकेजों को शामिल करके)।\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - अगला पैकेज à¤à¤• सà¥à¤°à¥‹à¤¤à¥à¤° पैकेज है (--src जैसा)\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr "-u - पैकेज को हटायें यदि à¤à¤• अतà¥à¤¯à¤§à¤¿à¤• नवीन संसà¥à¤®à¤°à¤£ पहिले सेसंसाधित है\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - असà¥à¤ªà¤·à¥à¤Ÿ खोज को लागू करें (--fuzzy जैसा)\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y जैसा, परनà¥à¤¤à¥ बिना छोटे-बड़े शबà¥à¤¦à¥‹à¤‚ के आधार पर मिलान करने को "
"बांधित करता है\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " निरà¥à¤¦à¥‡à¤¶ वाकà¥à¤¯ पर दिये हà¥à¤ नामों या आर०पी०à¤à¤®à¥¦ संचिकाओं की जाà¤à¤š की गई है\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes को सिरà¥à¥ž --parallel के साथ उपयोग किया जा सकता है"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"सूचना: कà¥à¤¯à¥‹à¤‚कि खोज किये गये माधà¥à¤¯à¤® ने à¤à¤šà¤¡à¥€à¤¸à¥‚चियों का उपयोग किया, अतैव यूआरपीà¤à¤®à¤à¥ž किसी "
+"परिणाम को बताने में असमरà¥à¤¥ रहा था\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "कोई संचिकासूची नहीं मिली\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"सूचना: कà¥à¤¯à¥‹à¤‚कि खोज किये गये माधà¥à¤¯à¤® ने à¤à¤šà¤¡à¥€à¤¸à¥‚चियों का उपयोग किया, अतैव यूआरपीà¤à¤®à¤à¥ž किसी "
+"परिणाम को बताने में असमरà¥à¤¥ रहा था\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "कोई परिवरà¥à¤¤à¤¨à¤²à¥‰à¤— नहीं मिला\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "कोई संचिकासूची नहीं मिली\n"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - पूरà¥à¤µà¤¨à¤¿à¤°à¥à¤¦à¤¿à¤·à¥à¤Ÿà¥‹à¤‚ में पैकेज को पाने के लिठना खोजे (डिफ़ालà¥à¤Ÿ)।\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - पैकेजों की जो आवशà¥à¤¯à¤• है उससे विपरीत खोज करें\n"
+
#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
diff --git a/po/hr.po b/po/hr.po
index 486b7404..228f402f 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-01-04 21:27+CET\n"
"Last-Translator: auto\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -16,7 +16,7 @@ msgstr ""
"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;;\n"
"X-Generator: TransDict server\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Pripremam instalaciju"
@@ -26,7 +26,7 @@ msgstr "Pripremam instalaciju"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_U redu"
@@ -76,7 +76,7 @@ msgstr "Instaliraj"
msgid "_Save"
msgstr "_Spremi"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Odustani"
@@ -86,29 +86,29 @@ msgstr "_Odustani"
msgid "Choose location to save file"
msgstr "Izaberite datoteku"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"nepoznata opcija '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Naredba nije specificirana"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Molim priÄekajte..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port miša"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -118,42 +118,42 @@ msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "U redu"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "Dogradnja"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Izlaz iz instalacije"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Jedan od slijedećih paketa je potreban:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Prekini"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -161,45 +161,49 @@ msgid ""
"Continue installation anyway?"
msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-msgstr[1] ""
-"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-msgstr[2] ""
+msgstr ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d paketa"
+msgstr[1] "%d paketa"
+msgstr[2] "%d paketa"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Pripremam se za instalaciju"
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ne mogu dohvatiti izvorne (source) pakete, prekidam"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim umetnite medij pod nazivom \"%s\" u uređaj [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instaliram pakete..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -208,7 +212,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "Slijedeći paketi će biti instalirani"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -218,37 +222,37 @@ msgstr ""
"Instalacija neuspješna, neke datoteke nedostaju.\n"
"Možda ćete poželjeti dograditi vašu urpmi bazu"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "Uklanjam %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Pripremam..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instaliram paket `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "Gotov"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalacija nije uspjela"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "sve je već instalirano"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalirano"
@@ -299,63 +303,63 @@ msgstr "Samo je administratoru dozvoljeno da instalira pakete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Ne mogu otvoriti datoteku %s\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nepravilno ime rpm datoteke [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dohvaćam hdlists datoteku..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...dohvat završen"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...dohvaćanje neuspješno: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ne mogu pristupiti rpm datoteci [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu registrirati rpm datoteku"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "greška prilikom registriranja lokalnih paketa"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -375,27 +379,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Trebate biti administrator (root) da koristite ovu komandu! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ne mogu proÄitati rpm datoteku \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
@@ -420,7 +424,7 @@ msgstr "ne mogu zapisati config datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu zapisati config datoteku [%s]"
@@ -433,12 +437,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Ime korisnika:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Lozinka:"
#: ../urpm/download.pm:185
#, c-format
@@ -550,7 +554,7 @@ msgstr "postoji više paketa sa istim rpm imenom datoteke \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ne mogu proÄitati rpm datoteku [%s] sa medija \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ne mogu pristupiti list datoteci od \"%s\", medij ignoriran"
@@ -664,9 +668,9 @@ msgid "No base defined"
msgstr "Naredba nije specificirana"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Ne mogu se spojiti na poslužitelj"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -688,328 +692,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "ne mogu pronaći hdlist datoteku za \"%s\", medij ignoriran"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nepravilno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ne mogu pronaći list datoteku za \"%s\", medij ignoriran"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "pokuÅ¡avam zaobiÄi postojeći medij \"%s\", izbjegavam"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne mogu pristupiti hdlist datoteci od \"%s\", medij ignoriran"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "medij \"%s\" pokušava koristiti već korišteni hdlist, medij ignoriran"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "pokuÅ¡avam zaobiÄi postojeći medij \"%s\", izbjegavam"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "previÅ¡e toÄaka montiranja za prenosivi medij \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "uzimam prenosivi uređaj kao \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "koristim razliÄite prenosive ureÄ‘aje [%s] za \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ne mogu dohvatiti putanju za prenosivi medij \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "zapisana config datoteka [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "koristim asocirani medij za paralelni naÄin: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Traži instalirane fontove"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "izvrÅ¡avam drugi prolaz da proraÄunam ovisnosti\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "Instaliram paket %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "Problem prilikom instaliranja paketa %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "medij \"%s\" pokušava koristiti već korišteni popis, medij ignoriran"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ne mogu pristupiti prvom instalacijskom mediju"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "dohvaćam hdlists datoteku..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Ne mogu otvoriti datoteku %s\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ne mogu pristupiti prvom instalacijskom mediju (nije pronađen hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokuÅ¡avam zaobiÄi postojeći medij \"%s\", izbjegavam"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam izabrati višestruki medij: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Proxy postavke za medij \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Postavke meni-a spremljene"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje poslužitelja"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ispitujem hdlist datoteku [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis datoteku [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "izgrađujem hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, fuzzy, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "ne mogu napraviti sinteznu(synthesis) datoteku za medij \"%s\""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiranje neuspješno"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspješno"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kopiram hdlist (ili synthesis) izvor od \"%s\"..."
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspješno"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "dohvaćanje hdlist (ili synthesis) izvora neuspješno"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...dohvaćanje neuspješno: md5sum nije u skladu"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nisu pronađene rpm datoteke u [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "nisu pronađene rpm datoteke u [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne mogu proÄitati rpm datoteku [%s] sa medija \"%s\""
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1019,78 +1023,78 @@ msgstr ""
"nije moguće pristupiti mediju\"%s\",\n"
"ovo se moglo desiti ako ste montirali ruÄno mapu kad ste kreirali medij."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "dohvaćam hdlist (ili synthesis) izvor od \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "pronašao sam ispitani hdlist (ili synthesis) kao %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kopiranje opisne datoteke od \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu zapisati list datoteku za \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodan medij %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu obraditi hdlist datoteku od \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "napravljen hdlist sintezna datoteka za medij \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyDd"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Žalim, loš odabir, pokušajte ponovo\n"
@@ -1126,8 +1130,8 @@ msgid "unmounting %s"
msgstr "odmontiravam %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "medij \"%s\" nije izabran"
#: ../urpm/removable.pm:143
@@ -1145,47 +1149,47 @@ msgstr "nepotpun medij \"%s\" oznaÄen kao prenosiv ali nije zapravo"
msgid "unable to access medium \"%s\""
msgstr "ne mogu pristupiti mediju \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ne postoji paket pod nazivom %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Slijedeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog nezadovoljavajućeg %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "odabirem %s izabiranjem datoteka"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "kako bi se zadržalo %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog sukoba sa %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nije bilo zatraženo"
@@ -1326,24 +1330,37 @@ msgstr "Nema oznake za uklanjanje"
msgid "Checking to remove the following packages"
msgstr "Jedan od slijedećih paketa je potreban:"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+msgstr[1] ""
+"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
+msgstr[2] ""
"Kako bi zadovoljili ovisnosti, slijedeći paketi će biti uklonjeni (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "Instaliram paket %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Instaliram paket %s"
+msgstr[1] "Instaliram paket %s"
+msgstr[2] "Instaliram paket %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Prijava nije uspjela"
@@ -1607,7 +1624,7 @@ msgid " -m - the media in which the package was found\n"
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
@@ -1617,19 +1634,19 @@ msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim posebno okružje na %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1927,7 +1944,7 @@ msgstr " --noclean - zadrži rpm koji nije korišten u međuspremniku.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
@@ -1997,60 +2014,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "Dogradnja"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "Dogradnja"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Izlaz iz instalacije"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Izlaz iz instalacije"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Izaberite jedan? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Da ipak nastavim?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
@@ -2060,57 +2079,59 @@ msgstr " (D/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-msgstr[1] ""
-"Naki traženi paketi ne mogu biti instalirani:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Naki traženi paketi ne mogu biti instalirani:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
+"uvijek nije podržano\n"
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
-"uvijek nije podržano\n"
-msgstr[1] ""
-"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
-"uvijek nije podržano\n"
-msgstr[2] ""
+msgstr ""
"neki paketi moraju biti uklonjeni da bi mogli biti nadograđeni, ovo još "
"uvijek nije podržano\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr "Slijedeći paketi će biti uklonjeni"
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] "Slijedeći paketi će biti uklonjeni"
-msgstr[1] "Slijedeći paketi će biti uklonjeni"
-msgstr[2] "Slijedeći paketi će biti uklonjeni"
+msgstr "Slijedeći paketi će biti uklonjeni"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2119,104 +2140,113 @@ msgstr ""
"Morate biti administrator(root) kako bi instalirali slijedeće ovisnosti:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter kada ste gotovi..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Slijedeći paketi će biti instalirani"
-msgstr[1] "Slijedeći paketi će biti instalirani"
-msgstr[2] "Slijedeći paketi će biti instalirani"
+msgstr "Slijedeći paketi će biti instalirani"
-#: ../urpmi:668
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Slijedeći paketi će biti instalirani"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Želite li nastaviti instalaciju?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspjela"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "instaliram %s\n"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instaliram %s\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "instaliram %s\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalacija nije uspjela"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pokušati instalaciju bez provjere ovisnosti (d/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pokušati instalaciju još snažnije (--force)? (d/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "instalacijske intrukcije"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "instalacijske intrukcije"
+msgstr[1] "instalacijske intrukcije"
+msgstr[2] "instalacijske intrukcije"
-#: ../urpmi:828
+#: ../urpmi:825
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Problem u instalaciji"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "sve je već instalirano"
-msgstr[1] "sve je već instalirano"
-msgstr[2] "sve je već instalirano"
+msgstr "sve je već instalirano"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "sve je već instalirano"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "sve je već instalirano"
-msgstr[1] "sve je već instalirano"
-msgstr[2] "sve je već instalirano"
+msgstr "sve je već instalirano"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "sve je već instalirano"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "restartam urpmi"
@@ -2322,17 +2352,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - oÄisti keÅ¡ direktorij zaglavlja.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - tihi mod.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - opširan mod.\n"
@@ -2465,8 +2495,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2524,12 +2557,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"uporaba: urpmi.removemedia [-a] <ime> ...\n"
+"uporaba: urpmi.removemedia (-a | <ime> ...)\n"
"gdje je <ime> ime medija za ukloniti.\n"
#: ../urpmi.removemedia:41
@@ -2592,27 +2625,33 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr " --probe-hdlist - pokušaj pronaći i upotrijebiti hdlist datoteku.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - odaberi sve neprenosive medije.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - prisili pravljenje hdlist datoteka.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Samo je administratoru dozvoljeno da instalira pakete"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"nema ništa za nadogradnju (koristite urpmi.addmedia za dodavanje medija)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2621,17 +2660,17 @@ msgstr ""
"nedostaje unos za nadogradnju\n"
"(jedan od %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Mijenjam medij \"%s\":"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "uklanjam medij \"%s\""
@@ -2734,70 +2773,71 @@ msgstr " --help - ispiši ovaj tekst s pomoći.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - ispisuje oznaku summary: sažeto."
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+
#: ../urpmq:88
#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+
+#: ../urpmq:93
+#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -d - proširi ispitivanje ovisnosti paketa.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - proširi ispitivanje ovisnosti paketa.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - prisili pravljenje hdlist datoteka.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr ""
" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - nemoj pretraživati u provides kako bi pronašli paket.\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -q - tihi mod.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -f - ispiši verziju, izdanje i arhitekturu sa imenom.\n"
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -p - dozvoli pretraživanje u provides kako bi pronašao paket.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - slijedeći paket je izvorišni paket (isto kao --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, fuzzy, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2805,54 +2845,69 @@ msgid ""
msgstr ""
" -s - slijedeći paket je izvorišni paket (isto kao --src).\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -v - ukljuÄi fuzzy pretraživanje (isto kao --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - odabire sve odgovarajuće na komandnoj liniji.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ili rpm datoteke dane na komandnoj liniji se ispituju.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --all - ispiši sve oznake."
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Nije pronađena ni jedna slika"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Nije pronađena ni jedna slika"
#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Nije pronađena ni jedna slika"
+
+#, fuzzy
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - nemoj pretraživati u provides kako bi pronašli paket.\n"
+
+#, fuzzy
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -p - dozvoli pretraživanje u provides kako bi pronašao "
+#~ "paket.\n"
+
+#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/id.po b/po/id.po
index 36f5f795..8f6702d1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -15,8 +15,8 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
-"PO-Revision-Date: 2007-02-25 13:19+0700\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
+"PO-Revision-Date: 2007-03-22 08:14+0700\n"
"Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
"Language-Team: Indonesia <mdk-id@yahoogroups.com>\n"
"MIME-Version: 1.0\n"
@@ -109,12 +109,12 @@ msgstr "_Batal"
msgid "Choose location to save file"
msgstr "Pilih lokasi penyimpanan file"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Opsi %s tidak diketahui"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Tidak ada paket yang ditentukan"
@@ -145,7 +145,7 @@ msgstr ""
msgid "Warning"
msgstr "Peringatan"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -238,7 +238,7 @@ msgstr ""
"\n"
"Apakah Anda mau melanjutkan instalasi ?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,7 +249,7 @@ msgstr ""
"%s\n"
"Anda mungkin perlu meng-update database urpmi Anda"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "menghapus %s"
@@ -269,10 +269,10 @@ msgstr "Menginstall paket `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Selesai"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Instalasi gagal"
+msgid "Installation failed:"
+msgstr "Instalasi gagal:"
#: ../gurpmi2:344
#, c-format
@@ -328,64 +328,64 @@ msgstr "Hanya superuser yang boleh meng-instal paket"
msgid "Running urpmi in restricted mode..."
msgstr "Menjalankan urpmi dalam mode terbatas..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "gagal membuka rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"menemukan header rpm %d pada cache, menghapus header %d yang kadaluarsa"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama file rpm [%s] tak valid"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil file rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...pengambilan selesai"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pengambilan gagal: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal mengakses file rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "gagal mem-parse file spec %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "gagal meregistrasi file rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arsitektur tidak kompatibel untuk rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "kesalahan meregistrasi paket lokal"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operasi ini dilarang ketika berjalan dalam mode terbatas"
@@ -425,7 +425,7 @@ msgstr "Tidak bisa menggunakan %s dengan %s"
msgid "Too many arguments\n"
msgstr "Terlalu banyak argumen\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "membangun file sintesa hdlist untuk media \"%s\""
@@ -450,7 +450,7 @@ msgstr "tidak dapat membaca file konfigurasi [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "media `%s' didefinisikan dua kali, membatalkan diri"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "gagal menulis ke file konfigurasi [%s]"
@@ -580,7 +580,7 @@ msgstr "banyak paket dengan nama file rpm sama \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "gagal memparse [%s] pada nilai \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "gagal mengakses file list \"%s\", media diabaikan"
@@ -716,7 +716,7 @@ msgstr "peringatn: md5sum untuk %s tidak tersedia pada file MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "menghitung md5sum dari sumber hdlist (atau sintesa) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -725,103 +725,103 @@ msgstr ""
"media virtual \"%s\" tidak seharusnya menentukan file list atau hdlist, "
"media diabaikan"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "media maya \"%s\" harus memiliki url yang jelas, media diabaikan"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "nama hdlist tidak valid"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "gagal mencari file daftar \"%s\", media diabaikan"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "\"sintesis\" seharusnya tidak ditentukan (media \"%s\")"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"sintesis\" seharusnya ditentukan (media \"%s\")"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "gagal mengakses file hdlist \"%s\", media diabaikan"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "tidak dapat mengakses daftar file \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"media \"%s\" mencoba memakai hdlist yang telah dipakai, media diabaikan"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "media \"%s\" mencoba memakai list yang telah dipakai, media diabaikan"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "mencoba menimpa media yang ada \"%s\", mengabaikan"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "terlalu banyak titik mount untuk media removable \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "menganggap divais removable sebagai \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Media \"%s\" adalah image ISO, akan dimount secara langsung"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "menggunakan divais removable lain [%s] untuk \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "gagal mengambil nama path untuk media removable \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "menulis %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "menulis ke file konfigurasi [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Tidak bisa menggunakan mode paralel dengan mode use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "menggunakan media terkait untuk mode paralel: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -830,148 +830,148 @@ msgstr ""
"--synthesis tidak dapat dipakai dengan --media, --excludemedia, --sortmedia, "
"--update, --use-distrib atau --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Catatan: tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan "
"hasil apapun"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Pencarian dimulai: %s akhir: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "melakukan pass kedua untuk menghitung ketergantungan\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "lewatkan paket %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "paket %s akan diinstal, bukan diupgrade"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" telah ada"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "media maya (virtual) harus lokal"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(diabaikan secara default)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "menambahkan media \"%s\" sebelum media remote \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "menambahkan media \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "tidak dapat me-mount media distribusi"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "lokasi ini tampaknya tidak mengandung sembarang distribusi"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "menerima file media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "tidak dapat mengolah media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"tidak dapat mengakses media distribusi (tidak ada file media.cfg yang "
"ditemukan)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "mencoba memilih media tak eksis \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "memilih banyak media: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "menghapus media \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "konfigurasi ulang urpmi untuk media \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...konfigurasi ulang gagal"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "konfigurasi ulang selesai"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
"Kesalahan dalam menghasilkan nama file : ketergantungan %d tidak ditemukan"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Kesalahan dalam menghasilkan nama file : Tidak bisa menulis ke file (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" sudah terbaru"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "memeriksa file hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "memeriksa file sintesa [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "membangun hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -980,77 +980,77 @@ msgstr ""
"Gagal membuat file synthesis untuk media \"%s\". File hdlist Anda mungkin "
"rusak."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "masalah dalam membaca file sintesa/hdlist media \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...penyalinan gagal"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "file deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...penyalinan selesai"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "menyalin [%s] untuk media \"%s\"..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "penyalinan [%s] gagal (file dicurigai terlalu kecil)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "sedang menghitung md5sum hdlist/sintesa source tersalin"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "penyalinan [%s] gagal (md5sum tidak cocok)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "menghitung md5sum hdlist source (atau sintesa) yang diambil"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pengambilan gagal: md5sum tidak cocok"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "tidak ada file rpm ditemukan dari [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "membaca file rpm dari [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "gagal membaca file rpm dari [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "tidak ada rpm terbaca"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1061,78 +1061,78 @@ msgstr ""
"ini bisa terjadi jika Anda me-mount direktori secara manual saat membuat "
"media."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "file hdlist %s untuk media \"%s\" tidak valid"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "mengambil hdlist source (atau sintesa) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "menemukan hdlist (atau sintesa) sebagai %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "file hdlist utk media \"%s\" tak ditemukan"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "memeriksa file pubkey dari \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...kunci %s terimport dari file pubkey \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "gagal mengimpor file pubkey dari \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "menulis ke file list untuk media \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "media \"%s\" sudah diupdate"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gagal memparse file hdlist \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca file sintesa hdlist untuk media \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "membaca header dari media \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "TtNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Maaf, pilihan buruk, coba lagi\n"
@@ -1187,47 +1187,47 @@ msgstr "media \"%s\" tidak konsisten bertanda removable, seharusnya tidak"
msgid "unable to access medium \"%s\""
msgstr "gagal mengakses media \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Tidak ada paket bernama %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Paket berikut berisi %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "karena %s hilang"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "karena %s tidak terpenuhi"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "mencoba mempromosikan %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "untuk menjaga %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "untuk menginstall %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "karena konflik dengan %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "tidak diminta"
@@ -1374,25 +1374,34 @@ msgstr "Tidak ada yang dihapus"
msgid "Checking to remove the following packages"
msgstr "Pengujian untuk menghapus paket berikut"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Untuk memenuhi ketergantungan, paket %d berikut akan dihapus (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Untuk memenuhi ketergantungan, paket berikut akan dihapus"
+msgstr[1] ""
+"Untuk memenuhi ketergantungan, paket-paket %d berikut akan dihapus"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
-#: ../urpme:134
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Hapus %d paket?"
msgstr[1] "Hapus %d paket?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Penghapusan gagal"
@@ -1656,7 +1665,7 @@ msgstr " --vendor - vendor\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - media dimana paket ditemukan\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - cetak versi, rilis dan arch dengan nama.\n"
@@ -1668,12 +1677,12 @@ msgstr ""
"Format tidak benar: Anda hanya boleh menggunakan satu tag yang bernilai "
"banyak"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "mengunakan lingkungan spesifik pada %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1682,7 +1691,7 @@ msgstr ""
"Catatan: karena tidak ada media dan menggunakan hdlist, urpmf tidak dapat "
"mengembalikan sembarang hasil\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Anda mungkin akan menggunakan --name untuk mencari nama paket.\n"
@@ -1985,7 +1994,7 @@ msgstr " --nolock - jangan kunci database rpm.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - hanya upgrade paket dengan arsitektur yang sama.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg cocok dengan perintah baris.\n"
@@ -2207,109 +2216,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(hanya pengujian, installasi tidak akan dilakukan)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Lanjutkan dengan installasi 1 paket? (%d MB)"
-
-#: ../urpmi:599
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Lanjutkan dengan installasi paket %d? (%d MB)"
-msgstr[1] "Lanjutkan dengan installasi paket %d? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Lanjutkan dengan installasi satu paket?"
+msgstr[1] "Lanjutkan dengan installasi paket-paket %d?"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Tekan [Enter] jika siap.."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "Paket berikut memiliki tandatangan yang cacat"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Paket berikut memiliki tandatangan yang cacat"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Apakah Anda hendak melanjutkan instalasi ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "sebarkan %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "menginstall %s dari %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "menginstall %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Instalasi gagal:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Mencoba installasi tanpa menguji ketergantungan? (y/T) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Mencoba installasi lebih keras (--force)? (y/T) "
-#: ../urpmi:825
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "transaksi installasi %d gagal"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "transaksi installasi %d gagal"
+msgstr[1] "transaksi installasi %d gagal"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Installasi dimungkinkan"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Paket-paket sudah update"
-#: ../urpmi:847
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "Paket %s telah terinstall"
-#: ../urpmi:848
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Paket-paket %s telah terinstal"
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "Paket %s tidak bisa diinstall"
-#: ../urpmi:852
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Paket-paket %s tidak bisa diinstall"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "jalankan ulang urpmi"
@@ -2569,8 +2575,10 @@ msgstr "Membersihkan direktori repackage [%s]...\n"
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr "%d file dihapus\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d file dihapus\n"
+msgstr[1] "%d file dihapus\n"
#: ../urpmi.recover:82
#, c-format
@@ -2703,8 +2711,7 @@ msgstr " --no-ignore - jangan update, tandai media sebagai enabled.\n"
#, c-format
msgid ""
" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr ""
-" --probe-rpms - jangan gunakan sintesa/hdlist, gunakan file rpm\n"
+msgstr " --probe-rpms - jangan gunakan sintesa/hdlist, gunakan file rpm\n"
#: ../urpmi.update:48
#, c-format
@@ -2869,53 +2876,56 @@ msgstr ""
" - pencarian terbalik yang diperluas (termasuk paket "
"virtual).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " --whatprovides, -p\n"
+" - cari di provides untuk mencari paket.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - keluaran lengkap dengan paket yang akan dihapus.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - perluas pencarian ke ketergantungan paket.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - cetak grup dengan nama.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - cetak informasi dalam format yang mudah dibaca.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - daftar file pada paket.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - ekuivalen dengan -du\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - cari di provides untuk mencari paket.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - cetak versi dan rrilis dengan nama.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - paket berikut adalah paket sumber (sama dengan --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2923,48 +2933,48 @@ msgid ""
msgstr ""
" -u - hapus paket jika versi yang lebih baru telah terinstal.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - seperti -y, tetapi memaksa untuk mencocokan case-"
"insensitif.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " nama atau file rpm yang diberikan pada perintah baris dikirimkan.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes hanya dapat dipakai dengan --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", hanya hasil parsial untuk paket %s"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", hanya hasil parsial untuk paket-paket %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan hasil untuk "
"paket %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2972,16 +2982,19 @@ msgstr ""
"tidak ada hdlist untuk media \"%s\", tidak dapat mengembalikan hasil untuk "
"paket-paket %s"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Tidak ada filelist yang ditemukan\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Changelog tidak ditemukan\n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Lanjutkan dengan installasi paket %d? (%d MB)"
+#~ msgstr[1] "Lanjutkan dengan installasi paket %d? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Tidak ada filelist yang ditemukan\n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d paket, %d MB)"
diff --git a/po/is.po b/po/is.po
index a2229c2e..ee9d292d 100644
--- a/po/is.po
+++ b/po/is.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-02-22 17:27+0000\n"
"Last-Translator: Pjetur G. Hjaltason <pjetur@pjetur.net>\n"
"Language-Team: Icelandic <kde-isl@molar.is>\n"
@@ -105,12 +105,12 @@ msgstr "Hætta _við"
msgid "Choose location to save file"
msgstr "Veldu stað til að vista skrá"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "óþekktur valkostur %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Engir pakkar tilgreindir"
@@ -141,7 +141,7 @@ msgstr ""
msgid "Warning"
msgstr "Aðvörun"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ã lagi"
@@ -183,11 +183,15 @@ msgstr ""
"Halda samt áfram með uppsetningu?"
#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
-msgid "To satisfy dependencies, the following package is going to be installed:"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Til að viðhalda samræmi, verður eftirfarandi pakki settur inn:"
#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+#, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Til að viðhalda samræmi, verða eftirtaldir pakkar settir inn"
#: ../gurpmi2:219 ../urpmi:583
@@ -230,7 +234,7 @@ msgstr ""
"\n"
"Viltu halda áfram innsetningu ?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -241,7 +245,7 @@ msgstr ""
"%s\n"
"Þú ættir sennilega að uppfæra urpmi gagnagrunninn"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "fjarlægi %s"
@@ -261,10 +265,10 @@ msgstr "Set inn pakka `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Lokið"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Innsetning brást"
+msgid "Installation failed:"
+msgstr "Innsetning brást:"
#: ../gurpmi2:344
#, c-format
@@ -320,63 +324,63 @@ msgstr "Aðeins kerfisstjóri hefur leyfi til að setja inn pakka"
msgid "Running urpmi in restricted mode..."
msgstr "Keyri urpmi í vernduðum ham..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "gat ekki opnað rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "fann %d rpm hausa á biðsvæði, fjarlægi %d útrunna hausa"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ógilt rpm skráarnafn [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "sæki rpm skrá [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...niðurhali lokið"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...mistókst að sækja: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "get ekki lesið rpm skrá [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "get ekki unnið úr spec skrá %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "gat ekki skráð rpm skrá"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "ósamhæfður vélbúnaður fyrir rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "villa við að skrá staðbundna pakka"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Þessi aðgerð er bönnuð þegar keyrt er í vernduðum ham"
@@ -416,7 +420,7 @@ msgstr "Get ekki notað %s með %s"
msgid "Too many arguments\n"
msgstr "Of mörg viðföng\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "byggði hdlist samantektar-skrá fyrir miðil \"%s\""
@@ -441,7 +445,7 @@ msgstr "get ekki lesið uppsetningarskrá [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "miðill `%s' er tilgreindur tvisvar, hætti"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "get ekki skrifað í uppsetningarskrá [%s]"
@@ -571,7 +575,7 @@ msgstr "það eru margir pakkar með sama rpm skráarnafn \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "get ekki túlkað rétt [%s] úr gildi \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "gat ekki kannað lista-skrá fyrir \"%s\", miðill hunsaður"
@@ -617,8 +621,10 @@ msgstr "[endurpökkun]"
#: ../urpm/install.pm:110
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "bjó til færslu fyrir uppsetningu á %s (fjarlægi=%d, set inn=%d, uppfæri=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"bjó til færslu fyrir uppsetningu á %s (fjarlægi=%d, set inn=%d, uppfæri=%d)"
#: ../urpm/install.pm:113
#, c-format
@@ -703,9 +709,10 @@ msgstr "aðvörun: md5 gátsumma fyrir %s ekki til í MD5SUM skrá"
#: ../urpm/md5sum.pm:45
#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "reikna md5 gátsummu yfir núverandi hdlist skrá (eða samantektar-skrá) [%s]"
+msgstr ""
+"reikna md5 gátsummu yfir núverandi hdlist skrá (eða samantektar-skrá) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -714,106 +721,106 @@ msgstr ""
"sýndarmiðill \"%s\" ætti hvorki að hafa skilgreindan hdlist né list skrá, "
"miðill hunsaður"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "sýndarmiðill \"%s\" ætti að hafa auða slóð, miðill hunsaður"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "ógilt hdlist skráarnafn"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "gat ekki fundið lista-skrá fyrir \"%s\", miðill hunsaður"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "ekki hægt að skrá \"samantekt\" (miðill \"%s\")"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"samantekt\" ætti að vera sett (miðill \"%s\")"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "gat ekki kannað hdlist fyrir \"%s\", miðill hunsaður"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "fékk ekki aðgang að hdlist skrá fyrir \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"miðill \"%s\" er að reyna að nota hdlist sem er þegar í notkun, miðill "
"hunsaður"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"miðill \"%s\" er að reyna að nota lista sem er þegar í notkun, miðill "
"hunsaður"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "reyni að hunsa núverandi miðil \"%s\", forðast"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "of margir tengipunktar fyrir útskiptanlegan miðil \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "tek útskiptanleg tæki sem \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Miðill \"%s\" er ISO ímynd, verður tengdur eftir þörfum"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "nota mismunandi útskiptanleg tæki [%s] fyrir \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "get ekki fundið slóð fyrir útskiptanlegan miðil \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "skrifaði %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "skrifa uppsetningarskrá [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Get ekki notað samhliða ham með \"use-distrib\" ham"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "nota tengdan miðil fyrir samhliða ham: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -822,144 +829,144 @@ msgstr ""
"--synthesis er ekki hægt að nota saman með --media, --excludemedia, --"
"sortmedia, --update, --use-distrib eða --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Athugið: þar sem enginn hdlist skrá er til fyrir miðill \"%s\", þá fannst "
"ekki neitt"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Leit byrjun: %s endir: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Fer yfir í annað sinn til að athuga hvað er háð\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "sleppi pakka %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "mundi setja inn í stað uppfærslu á pakka %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "miðill \"%s\" er þegar til"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "sýndarmiðlar verða að vera staðbundnir"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(sjálfgefið hunsað)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "bæti við miðli \"%s\" á undan fjartengdum miðli \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "bæti við miðli \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "get ekki tengt uppsetningarmiðil"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "þessi staðsetning virðist ekki innihalda neina dreifingu"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "sæki media.cfg skrá..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "get ekki unnið úr media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "fann ekki dreifingarmiðil (engin media.cfg skrá fannst)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "reynt að velja miðil sem er ekki til \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "vel marga miðla: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "fjarlægi miðil \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "endurstilli urpmi fyrir miðil \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...endurstilling mistókst"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "endurstillingu lokið"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Villa við myndun nafnaskrár: er háð %d sem finnst ekki"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Villa við myndun nafnaskrár: get ekki skrifað í skrá (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "miðill \"%s\" er uppfærð"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "athuga hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "athuga samantektar-skrá [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "byggi hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -968,77 +975,77 @@ msgstr ""
"Get ekki búið til samantektar-skrá fyrir miðil \"%s\". hdlist skráin þín er "
"kannski gölluð."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "vandræði við lestur á hdlist eða samantektar-skrá miðils \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...afritun brást"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "afrita lýsingaskrá fyrir \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...afritun lokið"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "afrita [%s] fyrir miðil \"%s\"..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "afrit af [%s] brást (skráin er grunsamlega lítil)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "reikna md5 gátsummu yfir afritaða skrá (eða samantektar-skrá)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "afrit af [%s] brást (md5 gátsumma passar ekki)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "reikna md5 gátsummu yfir sótta hdlist skrá (eða samantektar-skrá)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...mistókst að sækja: ósamræmi í md5 gátsummu"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "engar rpm skrár fundust frá [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "les rpm skrár frá [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "get ekki lesið rpm skrár frá [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "engar rpm skrár lesnar"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1049,78 +1056,78 @@ msgstr ""
"þetta getur verið vegna þess að þú tengdir möppuna handvirkt þegar þú bjóst "
"miðilinn til."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ógild hdlist skrá %s fyrir miðil \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "sæki hdlist skrá (eða samantektar-skrá) fyrir \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "fann, við leit, hdlist skrá (eða samantektar-skrá) sem %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "engin hdlist skrá fannst fyrir miðil \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "athuga lykilskrá \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...flutti inn lykil %s úr lyklaskrá \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "gat ekki flutt inn lykilskrá \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skrifa lista-skrá fyrir miðil \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "uppfærði miðil \"%s\""
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gat ekki unnið úr hdlist skrá fyrir \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "vandræði við lestur á samantektar-skrá fyrir miðil \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "les hausa frá miðli \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "JjYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Slæmt val. Reyndu aftur\n"
@@ -1175,47 +1182,47 @@ msgstr "ósamræmi í miðli \"%s\" merktur útskiptanlegur en er það ekki í
msgid "unable to access medium \"%s\""
msgstr "get ekki lesið miðil \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Enginn pakki heitir %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Eftirfarandi pakkar innihalda %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "vegna þess að %s vantar"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "vegna óuppfylltra %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "þegar reynt var að setja upp %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "til þess að halda %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "til þess að setja inn %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "vegna árekstra við %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "óumbeðið"
@@ -1269,7 +1276,8 @@ msgstr " --test - staðfesta að hægt sé að fjarlægja umbeðna pakk
#: ../urpme:47 ../urpmi:109 ../urpmq:67
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
msgstr " --force - þvinga uppsetningu þó sumir pakkar séu ekki til.\n"
#: ../urpme:48 ../urpmi:114 ../urpmq:69
@@ -1291,7 +1299,8 @@ msgstr " --root - nota aðra rót til að fjarlægja rpm.\n"
#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\n"
+msgstr ""
+" --urpmi-root - nota aðra rót fyrir urpmi gagnagrunn og rpm uppsetningu.\n"
#: ../urpme:52
#, c-format
@@ -1357,24 +1366,34 @@ msgstr "Ekkert til að fjarlægja"
msgid "Checking to remove the following packages"
msgstr "Forathugun við að fjarlægja eftirtalda pakka"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
+msgstr[1] ""
+"Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Til að viðhalda samræmi, verða eftirtaldir %d pakkar fjarlægðir (%d MB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Fjarlæga %d pakka?"
msgstr[1] "Fjarlæga %d pakka?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (J/n) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Mistókst að fjarlægja"
@@ -1414,7 +1433,8 @@ msgstr " --excludemedia - nota ekki uppgefna miðla, aðskildir með kommum.\n"
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - ekki leita að mynstrum, nota viðfang sem uppgefinn "
"ákveðinn texta.\n"
@@ -1426,13 +1446,16 @@ msgstr " --media - nota aðeins uppgefna miðla, aðskildir með kommum.
#: ../urpmf:42 ../urpmi:89 ../urpmq:53
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia - raða miðlum eftir undirstrengjum, aðskildir með kommum.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia - raða miðlum eftir undirstrengjum, aðskildir með kommum.\n"
#: ../urpmf:43 ../urpmi:90 ../urpmq:54
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
+msgstr ""
+" --synthesis - nota gefna samantektar-skrá í stað urpmi gagnagrunns.\n"
#: ../urpmf:44
#, c-format
@@ -1628,29 +1651,31 @@ msgstr " --vendor - útgefandi\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - miðillinn sem innihélt pakkann\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
+msgstr ""
+" -f - prenta útgáfu, undirnúmer og vélartegund með nafni.\n"
#: ../urpmf:137
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ógilt snið: þú mátt aðeins nota eitt fjölgildis-tag"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "nota tilgreint umhverfi á %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
-msgstr "Athugið: þar sem enginn miðill notar hdlist skrá, þá fann urpmf ekki neitt\n"
+msgstr ""
+"Athugið: þar sem enginn miðill notar hdlist skrá, þá fann urpmf ekki neitt\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Þú vilt kannski nota --name til að leita að pakkanöfnum.\n"
@@ -1673,7 +1698,8 @@ msgstr ""
#: ../urpmi:88
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - nota aðeins uppgefin miðil til að leita að umbeðnum "
"pökkum.\n"
@@ -1689,7 +1715,8 @@ msgstr ""
#: ../urpmi:92 ../urpmq:55
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select - velja sjálfkrafa pakka til að uppfæra kerfið.\n"
#: ../urpmi:93
@@ -1760,7 +1787,8 @@ msgstr " --src - næsti pakki er frumkóða-pakki.\n"
#: ../urpmi:106
#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --install-src - setja aðeins inn frumkóða-pakka (engin forþýdd forrit).\n"
+msgstr ""
+" --install-src - setja aðeins inn frumkóða-pakka (engin forþýdd forrit).\n"
#: ../urpmi:107
#, c-format
@@ -1950,7 +1978,7 @@ msgstr " --nolock - ekki læsa rpm gagnagrunni.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uppfæra aðeins pakka með sömu vélbúnaðartegund.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - velja allt sem passar á skipanalínu.\n"
@@ -1958,12 +1986,14 @@ msgstr " -a - velja allt sem passar á skipanalínu.\n"
#: ../urpmi:153
#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -p - leyfa leit í 'skaffar' (provides) til að finna pakka.\n"
+msgstr ""
+" -p - leyfa leit í 'skaffar' (provides) til að finna pakka.\n"
#: ../urpmi:154
#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -P - ekki leita í 'skaffar (provides) til að finna pakka.\n"
+msgstr ""
+" -P - ekki leita í 'skaffar (provides) til að finna pakka.\n"
#: ../urpmi:155
#, c-format
@@ -1973,7 +2003,8 @@ msgstr " --quiet, -q - hljóður hamur.\n"
#: ../urpmi:157
#, c-format
msgid " names or rpm files given on command line will be installed.\n"
-msgstr " nöfn eða rpm skrár sem eru tilgreindar á skipanalínunni verða sett inn.\n"
+msgstr ""
+" nöfn eða rpm skrár sem eru tilgreindar á skipanalínunni verða sett inn.\n"
#: ../urpmi:186
#, c-format
@@ -2169,109 +2200,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(aðeins prófun, ekkert verður sett inn í raun)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Halda áfram með uppsetningu á pakka? (%d MB)"
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Halda áfram með uppsetningu á %d pakka? (%d MB)"
-msgstr[1] "Halda áfram með uppsetningu á %d pökkunum? (%d MB)"
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Halda áfram með uppsetningu á pakka? (%d MB)"
+msgstr[1] "Halda áfram með uppsetningu á pakka? (%d MB)"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Sláðu á ENTER þegar tilbúinn..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Hætta við"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "Eftirfarandi pakki er með gallaða undirskrift"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Eftirfarandi pakkar eru með gallaðar undirskriftir"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Viltu halda áfram með uppsetningu ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Innsetning brást"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "miðla %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "set inn %s frá %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "Set inn %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Innsetning brást:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prófa innsetningu án þess að athuga hvaða skrár þarf? (j/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prófa sterkari innsetningu (--force)? (j/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d Innsetningarfærslur brugðust"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d Innsetningarfærslur brugðust"
+msgstr[1] "%d Innsetningarfærslur brugðust"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Innsetning er möguleg"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Pakkar eru uppfærðir"
-#: ../urpmi:847
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "Pakki %s er nú þegar kominn inn"
-#: ../urpmi:848
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkar %s eru nú þegar komnir inn"
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "Ekki er hægt að setja inn pakka %s"
-#: ../urpmi:852
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Ekki er hægt að setja inn pakka %s"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "endurræsi urpmi"
@@ -2322,19 +2350,22 @@ msgstr " --probe-rpms - nota rpm skrár (í stað samantektar/hdlist skrár).
#: ../urpmi.addmedia:59
#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
-msgstr " --no-probe - ekki reyna að finna neina hdlist eða samantektar-skrá.\n"
+msgstr ""
+" --no-probe - ekki reyna að finna neina hdlist eða samantektar-skrá.\n"
#: ../urpmi.addmedia:61
#, c-format
msgid ""
" --distrib - automatically create all media from an installation\n"
" medium.\n"
-msgstr " --distrib - sjálfvirkt búa til alla miðla frá dreifingarmiðli.\n"
+msgstr ""
+" --distrib - sjálfvirkt búa til alla miðla frá dreifingarmiðli.\n"
#: ../urpmi.addmedia:63
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive - með --distrib, biðja um staðfestingu fyrir hvern miðil\n"
+msgstr ""
+" --interactive - með --distrib, biðja um staðfestingu fyrir hvern miðil\n"
#: ../urpmi.addmedia:64
#, c-format
@@ -2368,12 +2399,14 @@ msgstr " --no-md5sum - aftengja MD5SUM skráarathugun.\n"
#: ../urpmi.addmedia:70
#, c-format
msgid " --nopubkey - don't import pubkey of added media\n"
-msgstr " --nopubkey - ekki flytja inn dulritunar-lykil fyrir viðbættan miðil\n"
+msgstr ""
+" --nopubkey - ekki flytja inn dulritunar-lykil fyrir viðbættan miðil\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - bæta miðlinum við uppsetningu, en ekki uppfæra hann.\n"
+msgstr ""
+" --raw - bæta miðlinum við uppsetningu, en ekki uppfæra hann.\n"
#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2472,8 +2505,10 @@ msgstr " --noclean - ekki hreinsa endurpökkunar-möppu við mörkun.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
-msgstr " --list - lista færslur síðan uppgefin dagsetning eða tímabil\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
+msgstr ""
+" --list - lista færslur síðan uppgefin dagsetning eða tímabil\n"
#: ../urpmi.recover:38
#, c-format
@@ -2520,9 +2555,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Hreinsa upp endurpökkunarmöppu [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d skrár fjarlægðar\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d skrár fjarlægðar\n"
+msgstr[1] "%d skrár fjarlægðar\n"
#: ../urpmi.recover:82
#, c-format
@@ -2606,7 +2643,8 @@ msgstr "Aðeins kerfisstjórar hafa leyfi til að fjarlægja miðil"
#: ../urpmi.removemedia:78
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
-msgstr "ekkert til að fjarlægja (notaðu urpmi.addmedia til að bæta við miðli)\n"
+msgstr ""
+"ekkert til að fjarlægja (notaðu urpmi.addmedia til að bæta við miðli)\n"
#: ../urpmi.removemedia:84
#, c-format
@@ -2648,8 +2686,11 @@ msgstr " --no-ignore - ekki uppfæra, merkja miðilinn sem virkan.\n"
#: ../urpmi.update:47
#, c-format
-msgid " --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr " --probe-rpms - ekki nota hdlist eða samantektar-skrá, nota rpm skrár beint.\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --probe-rpms - ekki nota hdlist eða samantektar-skrá, nota rpm skrár "
+"beint.\n"
#: ../urpmi.update:48
#, c-format
@@ -2743,7 +2784,8 @@ msgstr " --list-url - lista tiltæka miðla og slóðir að þeim.\n"
#: ../urpmq:62
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - lista tiltæka hnútpunkta þegar notað er --parallel.\n"
+msgstr ""
+" --list-nodes - lista tiltæka hnútpunkta þegar notað er --parallel.\n"
#: ../urpmq:63
#, c-format
@@ -2752,7 +2794,8 @@ msgstr " --list-aliases - lista tiltæk samhliða samheiti.\n"
#: ../urpmq:64
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr " --dump-config - sýna uppsetninguna sem urpmi.addmedia viðfang.\n"
#: ../urpmq:65
@@ -2762,7 +2805,8 @@ msgstr " --src - næsti pakki er frumkóða-pakki (sama og -s).\n"
#: ../urpmq:66
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - sýna alla frumpakka áður en þeir eru sóttir (aðeins "
"kerfisstjóri - root).\n"
@@ -2770,7 +2814,8 @@ msgstr ""
#: ../urpmq:68
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch - leyfa fyrirspurn eftir rpm pökkum fyrir annan vélbúnað.\n"
+msgstr ""
+" --ignorearch - leyfa fyrirspurn eftir rpm pökkum fyrir annan vélbúnað.\n"
#: ../urpmq:72
#, c-format
@@ -2807,109 +2852,115 @@ msgstr ""
" --whatrequires-recursive\n"
" - öflugri öfug leit (innifelur sýndarpakka).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - leita í 'skaffar' (provides) til að finna pakka.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - heildarúttak með pökkum sem á að fjarlægja.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - útvíkka fyrirspurn til pakka sem eru háðir.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - prenta hópa með nafni líka.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - prenta nytsamar upplýsingar á læsilegu sniði.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista skrár í pakka.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - samsvarar -du\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - leita í 'skaffar' (provides) til að finna pakka.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - prenta útgáfu og undirnúmer líka með nafni.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - næsti pakki er frumkóða-pakki (sama og --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
-msgstr " -u - fjarlægja pakka aðeins ef nýrri útgáfa er þegar uppsett.\n"
+msgstr ""
+" -u - fjarlægja pakka aðeins ef nýrri útgáfa er þegar uppsett.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - framkvæma loðna leit (sama og --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - eins og -y, en þvingar leit óháð stafastærð.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " leitað er að nöfnum eða rpm skrám sem skrifaðar eru á skipanalínu.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes er aðeins hægt að nota með --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"engin hdlist skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
"pakka %s"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"engin hdlist skrá fyrir miðil \"%s\", aðeins takmarkaðar upplýsingar fyrir "
"pakka %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr "engin hdlist skrá fyrir miðil \"%s\", engar upplýsingar fyrir pakka %s"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Engir skráarlistar fundust\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Enginn breytilisti fannst\n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Halda áfram með uppsetningu á %d pakka? (%d MB)"
+#~ msgstr[1] "Halda áfram með uppsetningu á %d pökkunum? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Engir skráarlistar fundust\n"
diff --git a/po/ka.po b/po/ka.po
index 8d438346..908957e9 100644
--- a/po/ka.po
+++ b/po/ka.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2003-01-29 23:47+0400\n"
"Last-Translator: Aiet Kolkhi <aiet@gmx.net>\n"
"Language-Team: Georgian\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 0.9.6\n"
"Plural-Forms: nplurals=1; plural=0\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
@@ -29,7 +29,7 @@ msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -73,11 +73,11 @@ msgid "_Install"
msgstr "ინსტáƒáƒšáƒ˜áƒ áƒ”ბáƒ"
#: ../gurpmi:98
-#, fuzzy, c-format
+#, c-format
msgid "_Save"
-msgstr "დáƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ”ბáƒ"
+msgstr "_შენáƒáƒ®áƒ•áƒ"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ"
@@ -87,27 +87,27 @@ msgstr "_გáƒáƒ£áƒ¥áƒ›áƒ”ბáƒ"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr "უცნáƒáƒ‘ი ტიპის ფáƒáƒ˜áƒšáƒ˜ %s-სთვის"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ბრძáƒáƒœáƒ”ბრáƒáƒ  იქნრმითითებული"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, fuzzy, c-format
msgid "Please wait..."
msgstr "გთხáƒáƒ•áƒ— იქáƒáƒœáƒ˜áƒáƒ— მáƒáƒ—მინებáƒ"
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -115,42 +115,42 @@ msgid ""
"Continue installation anyway?"
msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "გáƒáƒ¤áƒ áƒ—ხილებáƒ"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "áƒ-ქეი"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ ინსტáƒáƒšáƒ˜áƒ áƒ”ბáƒ"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "ერთერთი შემდეგი პáƒáƒ™áƒ”ტი სáƒáƒ­áƒ˜áƒ áƒáƒ:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, fuzzy, c-format
msgid "_Abort"
msgstr "შესáƒáƒ®áƒ”ბ..."
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -158,40 +158,45 @@ msgid ""
"Continue installation anyway?"
msgstr "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "დáƒáƒ›áƒáƒ™áƒ˜áƒ“ებულებების შესáƒáƒ¡áƒ áƒ£áƒšáƒ”ბლáƒáƒ“ შემდეგი პáƒáƒ™áƒ”ტები ჩáƒáƒ˜áƒ¬áƒ”რებრ(%d მბ)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "დáƒáƒ›áƒáƒ™áƒ˜áƒ“ებულებების შესáƒáƒ¡áƒ áƒ£áƒšáƒ”ბლáƒáƒ“ შემდეგი პáƒáƒ™áƒ”ტები ჩáƒáƒ˜áƒ¬áƒ”რებრ(%d მბ)"
+msgstr "დáƒáƒ›áƒáƒ™áƒ˜áƒ“ებულებების შესáƒáƒ¡áƒ áƒ£áƒšáƒ”ბლáƒáƒ“ შემდეგი პáƒáƒ™áƒ”ტები ჩáƒáƒ˜áƒ¬áƒ”რებრ(%d მბ)"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, fuzzy, c-format
msgid "Package installation..."
msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ˜áƒ¡áƒáƒ—ვის სáƒáƒ­áƒ˜áƒ áƒ ramdisk იმიჯები"
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "ვერ ვიყენებ პáƒáƒ áƒáƒšáƒ”ლურ პáƒáƒ áƒáƒ›áƒ”ტრს \"%s\""
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "გთხáƒáƒ•áƒ— ჩáƒáƒ“áƒáƒ—: %s სáƒáƒ®áƒ”ლით: %s"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "პáƒáƒ™áƒ”ტის ინსტáƒáƒšáƒáƒªáƒ˜áƒ: `%s' (%s/%s)..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -200,7 +205,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -208,37 +213,37 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბლის წáƒáƒ¨áƒšáƒ : %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr ""
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "პáƒáƒ™áƒ”ტის ინსტáƒáƒšáƒáƒªáƒ˜áƒ: `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "დáƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, fuzzy, c-format
msgid "Installation finished"
msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
@@ -287,63 +292,63 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "ვერ ვიძáƒáƒ®áƒ”ბ ფáƒáƒ˜áƒšáƒ¡ %s\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "ვიძáƒáƒ®áƒ”ბ hdlists ფáƒáƒ˜áƒšáƒ¡..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...გáƒáƒ›áƒáƒ«áƒáƒ®áƒ”ბრდáƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...გáƒáƒ›áƒáƒ«áƒáƒ®áƒ”ბრჩáƒáƒ˜áƒ¨áƒáƒšáƒ: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, fuzzy, c-format
msgid "unable to access rpm file [%s]"
msgstr "ვერ ვშიფრáƒáƒ• \"%s\"-ს ფáƒáƒ˜áƒšáƒ¨áƒ˜ [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ვერ ვშიფრáƒáƒ• \"%s\"-ს ფáƒáƒ˜áƒšáƒ¨áƒ˜ [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "ვერ ვწერ სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -363,27 +368,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "თქვენ უჯრის გáƒáƒ–იáƒáƒ áƒ”ბის უფლებრუნდრგáƒáƒ’áƒáƒ©áƒœáƒ“ეთ"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "ვერ წáƒáƒ•áƒ˜áƒ™áƒ˜áƒ—ხე მენიუს ფáƒáƒ˜áƒšáƒ˜:%s"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
@@ -408,7 +413,7 @@ msgstr "ვერ ვწერ სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ვერ ვწერ სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ¡ [%s]"
@@ -426,7 +431,7 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "პáƒáƒ áƒáƒšáƒ˜:"
#: ../urpm/download.pm:185
#, c-format
@@ -538,7 +543,7 @@ msgstr ""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ვერ ვშიფრáƒáƒ• \"%s\"-ს ფáƒáƒ˜áƒšáƒ¨áƒ˜ [%s]"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ვერ ვუკáƒáƒ•áƒ¨áƒ˜áƒ áƒ“ები list ფáƒáƒ˜áƒšáƒ¡ \"%s\"-სთვის, მედიუმი იგნáƒáƒ áƒ˜áƒ áƒ”ბულ იქნáƒ"
@@ -647,9 +652,9 @@ msgid "No base defined"
msgstr "ბრძáƒáƒœáƒ”ბრáƒáƒ  იქნრმითითებული"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "ვერ ვიყენებ მეხსიერებáƒáƒ¡ პáƒáƒšáƒ˜áƒ¢áƒ áƒ˜áƒ¡ ელემენტებისთვის"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -671,7 +676,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "source hdlist-ის (áƒáƒœ synthesis-ის) კáƒáƒžáƒ˜áƒ áƒ”ბრo"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -680,106 +685,106 @@ msgstr ""
"მედიუმი \"%s\" ცდილáƒáƒ‘ს გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ¡ უკვე გáƒáƒ›áƒáƒ§áƒ”ნებული hdlist. შედეგáƒáƒ“ უáƒáƒ áƒ˜ "
"ეთქვáƒ"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"მედიუმი \"%s\" ცდილáƒáƒ‘ს გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ¡ უკვე გáƒáƒ›áƒáƒ§áƒ”ნებული list. შედეგáƒáƒ“ უáƒáƒ áƒ˜ ეთქვáƒ"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr ""
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ვერ ვპáƒáƒ£áƒšáƒáƒ‘ list ფáƒáƒ˜áƒšáƒ¡ \"%s\"-სთვის, მედიუმი იგნáƒáƒ áƒ˜áƒ áƒ”ბულ იქნáƒ"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "ვცდილáƒáƒ‘ გáƒáƒ“áƒáƒ•áƒáƒ®áƒ¢áƒ” áƒáƒ áƒ¡áƒ”ბულ მედიáƒáƒ¡ \"%s\"-ს, თáƒáƒ•áƒ˜áƒ“áƒáƒœ ვიშáƒáƒ áƒ”ბ"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ვერ ვუკáƒáƒ•áƒ¨áƒ˜áƒ áƒ“ები hdlist ფáƒáƒ˜áƒšáƒ¡ \"%s\"-სთვის, მედიუმი იგნáƒáƒ áƒ˜áƒ áƒ”ბულ იქნáƒ"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ვერ ვუკáƒáƒ•áƒ¨áƒ˜áƒ áƒ“ები hdlist ფáƒáƒ˜áƒšáƒ¡ \"%s\"-სთვის, მედიუმი იგნáƒáƒ áƒ˜áƒ áƒ”ბულ იქნáƒ"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"მედიუმი \"%s\" ცდილáƒáƒ‘ს გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ¡ უკვე გáƒáƒ›áƒáƒ§áƒ”ნებული hdlist. შედეგáƒáƒ“ უáƒáƒ áƒ˜ "
"ეთქვáƒ"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"მედიუმი \"%s\" ცდილáƒáƒ‘ს გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ¡ უკვე გáƒáƒ›áƒáƒ§áƒ”ნებული list. შედეგáƒáƒ“ უáƒáƒ áƒ˜ ეთქვáƒ"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "ვცდილáƒáƒ‘ გáƒáƒ“áƒáƒ•áƒáƒ®áƒ¢áƒ” áƒáƒ áƒ¡áƒ”ბულ მედიáƒáƒ¡ \"%s\"-ს, თáƒáƒ•áƒ˜áƒ“áƒáƒœ ვიშáƒáƒ áƒ”ბ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "ძáƒáƒšáƒ˜áƒáƒœ ბევრი mount სáƒáƒ®áƒ”ლი შეცვლáƒáƒ“ი მედიუმისáƒáƒ—ვის \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "ვიღებ შეცვლáƒáƒ“ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ¡ რáƒáƒ’áƒáƒ áƒª \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "ვიყენებ სხვáƒáƒœáƒáƒ˜áƒ  შეცვლáƒáƒ“ მáƒáƒ¬áƒ§áƒáƒ‘ილáƒáƒ‘áƒáƒ¡ [%s] \"%s\"-სთვის"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ვერ ვიპáƒáƒ•áƒ” მდებáƒáƒ áƒ”áƒáƒ‘რშეცვლáƒáƒ“ი მედიუმისáƒáƒ—ვის \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "დáƒáƒ¬áƒ”რე სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ˜ [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "ვიყენებ მიმáƒáƒ’რებულ მედიáƒáƒ¡ პáƒáƒ áƒáƒšáƒ”ლური რეჟიმისáƒáƒ—ვის: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -788,222 +793,222 @@ msgstr ""
"--synthesis პáƒáƒ áƒáƒ›áƒ”ტრი ვერ გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნებრ--media, --update áƒáƒœ --parallel "
"პáƒáƒ áƒáƒ›áƒ”ტრებთáƒáƒœ ერთáƒáƒ“"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "კáƒáƒ›áƒžáƒ˜áƒšáƒ˜áƒ áƒ”ბული პáƒáƒ™áƒ”ტები"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr ""
"მხáƒáƒšáƒáƒ“ სრულუფლებიáƒáƒœ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს áƒáƒ¥áƒ•áƒ¡ უფლებრ\n"
"ჩáƒáƒ¬áƒ”რáƒáƒ¡ პáƒáƒ™áƒ”ტები."
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "მედიუმი \"%s\" უკვე áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr ""
"მედიუმი \"%s\" ცდილáƒáƒ‘ს გáƒáƒ›áƒáƒ˜áƒ§áƒ”ნáƒáƒ¡ უკვე გáƒáƒ›áƒáƒ§áƒ”ნებული list. შედეგáƒáƒ“ უáƒáƒ áƒ˜ ეთქვáƒ"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "ვáƒáƒ’დებ მედიáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ვერ ვიპáƒáƒ•áƒ” პირველი სáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ მედიუმი"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "ვიძáƒáƒ®áƒ”ბ hdlists ფáƒáƒ˜áƒšáƒ¡..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ვერ ვიძáƒáƒ®áƒ”ბ ფáƒáƒ˜áƒšáƒ¡ %s\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ვერ ვპáƒáƒ£áƒšáƒáƒ‘ პირველ სáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ მედიუმს (ვერ მივáƒáƒ™áƒ•áƒšáƒ˜áƒ” hdlists ფáƒáƒ˜áƒšáƒ¡)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ვცდილáƒáƒ‘ გáƒáƒ“áƒáƒ•áƒáƒ®áƒ¢áƒ” áƒáƒ áƒ¡áƒ”ბულ მედიáƒáƒ¡ \"%s\"-ს, თáƒáƒ•áƒ˜áƒ“áƒáƒœ ვიშáƒáƒ áƒ”ბ"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "ვირჩევ მრáƒáƒ•áƒáƒš მედიáƒáƒ¡: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "ვáƒáƒ’დებ მედიáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "პრáƒáƒ‘ლემრhdlist ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "მენიუს კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ დáƒáƒ›áƒáƒ®áƒ¡áƒáƒ•áƒ áƒ”ბულიáƒ"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "სერვერის კáƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "მედიუმი \"%s\" უკვე áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ვáƒáƒ›áƒáƒ¬áƒ›áƒ”ბ hdlist ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ვáƒáƒ›áƒáƒ¬áƒ›áƒ”ბ synthesis ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, fuzzy, c-format
msgid "building hdlist [%s]"
msgstr "ვáƒáƒ›áƒáƒ¬áƒ›áƒ”ბ hdlist ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...კáƒáƒžáƒ˜áƒ áƒ”ბრდáƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"-ის áƒáƒ¦áƒ¬áƒ”რილáƒáƒ‘ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ კáƒáƒžáƒ˜áƒ áƒ”ბáƒ..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...კáƒáƒžáƒ˜áƒ áƒ”ბრდáƒáƒ¡áƒ áƒ£áƒšáƒ“áƒ"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "...კáƒáƒžáƒ˜áƒ áƒ”ბრჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "source hdlist-ის (áƒáƒœ synthesis-ის) კáƒáƒžáƒ˜áƒ áƒ”ბრo"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "...კáƒáƒžáƒ˜áƒ áƒ”ბრჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "source hdlist-ის (áƒáƒœ synthesis-ის) კáƒáƒžáƒ˜áƒ áƒ”ბრo"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...გáƒáƒ›áƒáƒ«áƒáƒ®áƒ”ბრჩáƒáƒ˜áƒ¨áƒáƒšáƒ: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, fuzzy, c-format
msgid "no rpm files found from [%s]"
msgstr "ვáƒáƒ›áƒáƒ¬áƒ›áƒ”ბ hdlist ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "ვáƒáƒ›áƒáƒ¬áƒ›áƒ”ბ hdlist ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ვერ ვწერ სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1011,78 +1016,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "ვიძáƒáƒ®áƒ”ბ hdlists ფáƒáƒ˜áƒšáƒ¡..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "ვიპáƒáƒ•áƒ” პáƒáƒ áƒáƒšáƒ”ლური სáƒáƒ—áƒáƒ” (handler) nodes:-ისთვის %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\"-ის áƒáƒ¦áƒ¬áƒ”რილáƒáƒ‘ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ კáƒáƒžáƒ˜áƒ áƒ”ბáƒ..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ვერ ვწერ სáƒáƒ™áƒáƒœáƒ¤áƒ˜áƒ’ურáƒáƒªáƒ˜áƒ ფáƒáƒ˜áƒšáƒ¡ [%s]"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ვერ ვიძáƒáƒ®áƒ”ბ ფáƒáƒ˜áƒšáƒ¡ %s\n"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "დáƒáƒ›áƒáƒ¢áƒ”ბული მედიუმი %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ვერ ვუკáƒáƒ•áƒ¨áƒ˜áƒ áƒ“ები hdlist ფáƒáƒ˜áƒšáƒ¡ \"%s\"-სთვის, მედიუმი იგნáƒáƒ áƒ˜áƒ áƒ”ბულ იქნáƒ"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "პრáƒáƒ‘ლემრsynthesis-ის ფáƒáƒ˜áƒšáƒ˜áƒ¡ áƒáƒœ მედიუმის კითხვისáƒáƒ¡ \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "nNaAáƒ"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "yYkKxXხ"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "ცუდი áƒáƒ áƒ©áƒ”ვáƒáƒœáƒ˜áƒ, კიდევ სცáƒáƒ“ეთ\n"
@@ -1119,7 +1124,7 @@ msgstr "მáƒáƒ®áƒ¡áƒœáƒ (unmount)"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
+msgid "medium \"%s\" is not available"
msgstr "მედიუმი \"%s\" უკვე áƒáƒ áƒ¡áƒ”ბáƒáƒ‘ს"
#: ../urpm/removable.pm:143
@@ -1137,51 +1142,51 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "ვერ ვუკáƒáƒ•áƒ¨áƒ˜áƒ áƒ“ები მედიáƒáƒ¡ \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, fuzzy, c-format
msgid "No package named %s"
msgstr "áƒáƒ áƒª ერთ პáƒáƒ™áƒ”ტს áƒáƒ  ქვირ%s\n"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, fuzzy, c-format
msgid "The following packages contain %s: %s"
msgstr "ერთერთი შემდეგი პáƒáƒ™áƒ”ტი სáƒáƒ­áƒ˜áƒ áƒáƒ:"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ვერ ვპáƒáƒ£áƒšáƒáƒ‘ წáƒáƒ¡áƒáƒ¨áƒšáƒ”ლ შენáƒáƒ¢áƒáƒœáƒ¡!"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr ""
"მხáƒáƒšáƒáƒ“ სრულუფლებიáƒáƒœ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს áƒáƒ¥áƒ•áƒ¡ უფლებრ\n"
"ჩáƒáƒ¬áƒ”რáƒáƒ¡ პáƒáƒ™áƒ”ტები."
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr ""
"მხáƒáƒšáƒáƒ“ სრულუფლებიáƒáƒœ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს áƒáƒ¥áƒ•áƒ¡ უფლებრ\n"
"ჩáƒáƒ¬áƒ”რáƒáƒ¡ პáƒáƒ™áƒ”ტები."
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "Freestyle"
@@ -1325,23 +1330,30 @@ msgstr "ვერ ვპáƒáƒ£áƒšáƒáƒ‘ წáƒáƒ¡áƒáƒ¨áƒšáƒ”ლ შენáƒáƒ¢
msgid "Checking to remove the following packages"
msgstr "ერთერთი შემდეგი პáƒáƒ™áƒ”ტი სáƒáƒ­áƒ˜áƒ áƒáƒ:"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "დáƒáƒ›áƒáƒ™áƒ˜áƒ“ებულებების შესáƒáƒ¡áƒ áƒ£áƒšáƒ”ბლáƒáƒ“ შემდეგი პáƒáƒ™áƒ”ტები ჩáƒáƒ˜áƒ¬áƒ”რებრ(%d მბ)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "დáƒáƒ›áƒáƒ™áƒ˜áƒ“ებულებების შესáƒáƒ¡áƒ áƒ£áƒšáƒ”ბლáƒáƒ“ შემდეგი პáƒáƒ™áƒ”ტები ჩáƒáƒ˜áƒ¬áƒ”რებრ(%d მბ)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "ვáƒáƒ’დებ მედიáƒáƒ¡ \"%s\""
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ვáƒáƒ’დებ მედიáƒáƒ¡ \"%s\""
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (ხ/áƒ) [ხ] "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "შესვლრვერ გáƒáƒœáƒ®áƒáƒ áƒªáƒ˜áƒ”ლდáƒ"
@@ -1590,7 +1602,7 @@ msgstr "დáƒáƒáƒ­áƒ˜áƒ áƒ”თ Esc ღილáƒáƒ™áƒ¡ ინტერáƒáƒ¥áƒ¢
msgid " -m - the media in which the package was found\n"
msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1600,19 +1612,19 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1880,7 +1892,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -1946,58 +1958,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ ინსტáƒáƒšáƒ˜áƒ áƒ”ბáƒ"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "áƒáƒ•áƒ¢áƒáƒ›áƒáƒ¢áƒ£áƒ áƒ˜ ინსტáƒáƒšáƒ˜áƒ áƒ”ბáƒ"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "თქვენი áƒáƒ áƒ©áƒ”ვáƒáƒœáƒ˜? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "სáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒáƒªáƒ˜áƒ სერვერის კáƒáƒœáƒ¤áƒ˜áƒ’ურირებáƒ"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (ხ/áƒ) [ხ] "
@@ -2007,135 +2023,160 @@ msgstr " (ხ/áƒ) [ხ] "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
+msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
+msgstr "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
+msgstr "%s შედმეგ პáƒáƒ™áƒ”ტებშიáƒ: %s\n"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr ""
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr "გთხáƒáƒ•áƒ— დáƒáƒ’ვიდáƒáƒ¡áƒ¢áƒ£áƒ áƒáƒ— Enter ღილáƒáƒ™áƒ–ე დáƒáƒ­áƒ”რით..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "გáƒáƒ›áƒáƒ¥áƒªáƒ”ვáƒ"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "ერთერთი შემდეგი პáƒáƒ™áƒ”ტი სáƒáƒ­áƒ˜áƒ áƒáƒ:"
+msgstr "ერთერთი შემდეგი პáƒáƒ™áƒ”ტი სáƒáƒ­áƒ˜áƒ áƒáƒ:"
+
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "ერთერთი შემდეგი პáƒáƒ™áƒ”ტი სáƒáƒ­áƒ˜áƒ áƒáƒ:"
-#: ../urpmi:668
+#: ../urpmi:673
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "გნებáƒáƒ•áƒ— დáƒáƒáƒ›áƒ£áƒ¨áƒáƒáƒ—:"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "ვáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”ბ: %s\n"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ვáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”ბ: %s\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "ვáƒáƒ˜áƒœáƒ¡áƒ¢áƒáƒšáƒ˜áƒ áƒ”ბ: %s\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "გნებáƒáƒ•áƒ— ვცáƒáƒ“ე ჩáƒáƒ¬áƒ”რრდáƒáƒ›áƒáƒ™áƒ˜áƒ“ებულებების შემáƒáƒ¬áƒ›áƒ”ბის გáƒáƒ áƒ”შე? (ხ/áƒ) [áƒ] "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "გნებáƒáƒ•áƒ— ვცáƒáƒ“რჩáƒáƒ¬áƒ”რრძáƒáƒšáƒ˜áƒ— (--force)? (ხ/áƒ) [áƒ] "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒáƒ¨áƒ¢áƒáƒœ დáƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ”ბული მითითებები"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "ინსტáƒáƒšáƒáƒªáƒ˜áƒáƒ¨áƒ¢áƒáƒœ დáƒáƒ™áƒáƒ•áƒ¨áƒ˜áƒ áƒ”ბული მითითებები"
-#: ../urpmi:828
+#: ../urpmi:825
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "ინსტáƒáƒšáƒáƒªáƒ˜áƒ ჩáƒáƒ˜áƒ¨áƒáƒšáƒ"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
+msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
+msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "უკვე ყველáƒáƒ¤áƒ”რი ჩáƒáƒ¬áƒ”რილიáƒ"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2225,17 +2266,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr ""
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr ""
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr ""
@@ -2371,8 +2412,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
#: ../urpmi.recover:82
#, c-format
@@ -2494,44 +2536,50 @@ msgstr ""
#: ../urpmi.update:47
#, c-format
-msgid " -a - select all non-removable media.\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
msgstr ""
-#: ../urpmi.update:49
+#: ../urpmi.update:48
#, c-format
-msgid " -f - force generation of hdlist files.\n"
+msgid " -a - select all non-removable media.\n"
msgstr ""
-#: ../urpmi.update:70
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
+
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr ""
"მხáƒáƒšáƒáƒ“ სრულუფლებიáƒáƒœ მáƒáƒ›áƒ®áƒ›áƒáƒ áƒ”ბელს áƒáƒ¥áƒ•áƒ¡ უფლებრ\n"
"ჩáƒáƒ¬áƒ”რáƒáƒ¡ პáƒáƒ™áƒ”ტები."
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr ""
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "ვáƒáƒ’დებ მედიáƒáƒ¡ \"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "ვáƒáƒ’დებ მედიáƒáƒ¡ \"%s\""
@@ -2629,114 +2677,123 @@ msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” áƒ
msgid " --summary, -S - print summary.\n"
msgstr ""
-#: ../urpmq:88
-#, c-format
-msgid " -c - complete output with package to be removed.\n"
-msgstr ""
-
-#: ../urpmq:89
+#: ../urpmq:87
#, c-format
-msgid " -d - extend query to package dependencies.\n"
+msgid " --whatrequires - reverse search to what requires package.\n"
msgstr ""
-#: ../urpmq:91
+#: ../urpmq:88
#, fuzzy, c-format
-msgid " -g - print groups with name also.\n"
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
-#: ../urpmq:92
-#, c-format
-msgid " -i - print useful information in human readable form.\n"
-msgstr ""
-
-#: ../urpmq:93
+#: ../urpmq:90
#, fuzzy, c-format
-msgid " -l - list files in package.\n"
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
-#: ../urpmq:94
+#: ../urpmq:93
#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
+msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:95
+#: ../urpmq:94
#, c-format
-msgid " -p - search in provides to find package.\n"
+msgid " -d - extend query to package dependencies.\n"
msgstr ""
#: ../urpmq:96
-#, c-format
-msgid " -r - print version and release with name also.\n"
-msgstr ""
+#, fuzzy, c-format
+msgid " -g - print groups with name also.\n"
+msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
#: ../urpmq:97
#, c-format
-msgid " -R - reverse search to what requires package.\n"
+msgid " -i - print useful information in human readable form.\n"
msgstr ""
#: ../urpmq:98
#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
+msgid " -l - list files in package.\n"
msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " --help - áƒáƒ©áƒ•áƒ”ნე ეს დáƒáƒ›áƒ®áƒ›áƒáƒ áƒ” ტექსტი.\n"
+
+#: ../urpmq:100
+#, c-format
+msgid " -r - print version and release with name also.\n"
+msgstr ""
+
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
+msgstr ""
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "სურáƒáƒ—ები ვერ ვიპáƒáƒ•áƒ”"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "სურáƒáƒ—ები ვერ ვიპáƒáƒ•áƒ”"
#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "სურáƒáƒ—ები ვერ ვიპáƒáƒ•áƒ”"
+
+#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/ko.po b/po/ko.po
index c6b9fea2..3ea9404d 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2001-09-22 03:14+0900\n"
"Last-Translator: Jaegeum Choe <baedaron@hananet.net>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -86,12 +86,12 @@ msgstr "취소 (_C)"
msgid "Choose location to save file"
msgstr "íŒŒì¼ ì„ íƒ"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr "알 수 없는 연결 유형"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ì„ íƒëœ 팩키지 ëª©ë¡ ì €ìž¥"
@@ -119,7 +119,7 @@ msgstr "ì¼ë¶€ 팩키지는 제거ë˜ì–´ì•¼ 합니다."
msgid "Warning"
msgstr "경고"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "확ì¸"
@@ -204,7 +204,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "ë‹¤ìŒ íŒ©í‚¤ì§€ë“¤ì´ ì„¤ì¹˜ë  ê²ƒìž…ë‹ˆë‹¤."
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -212,7 +212,7 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "%s 제거 중"
@@ -232,9 +232,9 @@ msgstr "팩키지 설치 중: [%s] (%s/%s)..."
msgid "_Done"
msgstr "완료"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "설치 실패."
#: ../gurpmi2:344
@@ -291,63 +291,63 @@ msgstr "ë‹¤ìŒ íŒ©í‚¤ì§€ë¥¼ 설치중 오류가 ë°œìƒí–ˆìŠµë‹ˆë‹¤: "
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "%s 파ì¼ì„ ì—´ 수 없습니다.\n"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "유효하지 ì•Šì€ RPM íŒŒì¼ ì´ë¦„ [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "유효하지 ì•Šì€ RPM íŒŒì¼ ì´ë¦„ [%s]"
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, fuzzy, c-format
msgid "...retrieving done"
msgstr "[%s] 추출 중"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, fuzzy, c-format
msgid "...retrieving failed: %s"
msgstr "FATí¬ê¸°ì¡°ì • 실패: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM 파ì¼ã€Œ%sã€ì— 접근할 수 없습니다."
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "RPM 파ì¼ã€Œ%sã€ì— 접근할 수 없습니다."
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "RPM 파ì¼ã€Œ%sã€ì— 접근할 수 없습니다."
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "지역 팩키지 ë“±ë¡ ì˜¤ë¥˜"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -387,7 +387,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "매체「%sã€ì— 대한 ëª©ë¡ í•©ì„± íŒŒì¼ ìƒì„± 완료."
@@ -412,7 +412,7 @@ msgstr "설정 íŒŒì¼ [%s]ì— ê¸°ë¡í•  수 없습니다."
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "설정 íŒŒì¼ [%s]ì— ê¸°ë¡í•  수 없습니다."
@@ -544,7 +544,7 @@ msgstr "ë™ì¼í•œ íŒŒì¼ ì´ë¦„ 「%sã€ë¥¼ 가진 여러 ê°œì˜ íŒ©í‚¤ì§€ê°€ ì¡
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "매체「%2$sã€ì—ì„œ RPM 파ì¼ã€Œ%1$sã€ë¥¼ ì½ì„ 수 없습니다."
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "「%sã€ì˜ ëª©ë¡ íŒŒì¼ì— 접근할 수 없습니다. 매체 무시ë¨."
@@ -677,328 +677,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "ëª©ë¡ íŒŒì¼ì—「%sã€ì— 대한 기ë¡ì´ 없습니다."
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "「%sã€ì— 대한 ëª©ë¡ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 매체 무시ë¨."
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "매체 「%sã€ê°€ ì´ë¯¸ 사용ë˜ëŠ” 목ë¡ì„ 사용하려 합니다. 매체 무시ë¨."
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "유효하지 ì•Šì€ RPM íŒŒì¼ ì´ë¦„ [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "「%sã€ì— 대한 ëª©ë¡ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다. 매체 무시ë¨."
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "「%sã€ë§¤ì²´ë¥¼ ìƒì„±í•  수 없습니다.\n"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "매체「%sã€ì— 대한 ëª©ë¡ í•©ì„± íŒŒì¼ ìƒì„± 완료."
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "「%sã€ì˜ ëª©ë¡ íŒŒì¼ì— 접근할 수 없습니다. 매체 무시ë¨."
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "「%sã€ì˜ 목ë¡íŒŒì¼ì„ 분ì„í•  수 없습니다."
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "매체 「%sã€ëŠ” ì´ë¯¸ 사용 ì¤‘ì¸ ëª©ë¡íŒŒì¼ì„ 사용하려 합니다. 매체 무시ë¨."
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "매체 「%sã€ê°€ ì´ë¯¸ 사용ë˜ëŠ” 목ë¡ì„ 사용하려 합니다. 매체 무시ë¨."
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "존재하지 않는 매체「%sã€ ì„ íƒ ì‹œë„"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, fuzzy, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "「%sã€ë§¤ì²´ë¥¼ ìƒì„±í•  수 없습니다.\n"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, fuzzy, c-format
msgid "taking removable device as \"%s\""
msgstr "íƒˆì°©ì‹ ìž¥ì¹˜"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, fuzzy, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "íƒˆì°©ì‹ ìž¥ì¹˜"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, fuzzy, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "「%sã€ë§¤ì²´ë¥¼ ìƒì„±í•  수 없습니다.\n"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "설정 íŒŒì¼ [%s]ì— ê¸°ë¡"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "ì„¤ì¹˜ëœ í°íŠ¸ 검색"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "%s 팩키지 설치중"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "팩키지 설치중 문제 ë°œìƒ %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "매체「%sã€ëŠ” ì´ë¯¸ 존재합니다."
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "매체 「%sã€ê°€ ì´ë¯¸ 사용ë˜ëŠ” 목ë¡ì„ 사용하려 합니다. 매체 무시ë¨."
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "매체「%2$sã€ì—ì„œ RPM 파ì¼ã€Œ%1$sã€ë¥¼ ì½ì„ 수 없습니다."
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "%s 제거 중"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "「%sã€ì˜ ëª©ë¡ íŒŒì¼ì— 접근할 수 없습니다. 매체 무시ë¨."
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "[%s] 추출 중"
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "%s 파ì¼ì„ ì—´ 수 없습니다.\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "「%sã€ì˜ ëª©ë¡ íŒŒì¼ì— 접근할 수 없습니다. 매체 무시ë¨."
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "「%sã€ë§¤ì²´ë¥¼ ìƒì„±í•  수 없습니다.\n"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "존재하지 않는 매체「%sã€ ì„ íƒ ì‹œë„"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "%s 제거 중"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "프린터 「%s〠설정 중 ..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "메뉴 ì„¤ì •ì´ ì €ìž¥ë˜ì—ˆìŠµë‹ˆë‹¤."
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "서버 설정"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "매체 [%s]는 ì„ íƒë˜ì§€ 않았습니다."
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "ëª©ë¡ [%s] ìƒì„± 중"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "ì˜ì¡´ëª©ë¡ íŒŒì¼ [%s] ì½ê¸°"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "ëª©ë¡ [%s] ìƒì„± 중"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, fuzzy, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "「%sã€ë§¤ì²´ì— 대한 합성 파ì¼ì„ 만들 수 없습니다."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "매체「%sã€ì— 대한 ëª©ë¡ í•©ì„± íŒŒì¼ ìƒì„± 완료."
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, fuzzy, c-format
msgid "...copying failed"
msgstr "로그ì¸ì— 실패했습니다"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "ëª©ë¡ íŒŒì¼ì—「%sã€ì— 대한 기ë¡ì´ 없습니다."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, fuzzy, c-format
msgid "...copying done"
msgstr "[%s] 추출 중"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "매체「%sã€ì— 대한 ëª©ë¡ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s]ì˜ wget 실패 (wgetì´ ì„¤ì¹˜ë˜ì–´ 있습니까?)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "ëª©ë¡ íŒŒì¼ì—「%sã€ì— 대한 기ë¡ì´ 없습니다."
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] 복사 실패."
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "ëª©ë¡ íŒŒì¼ì—「%sã€ì— 대한 기ë¡ì´ 없습니다."
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "FATí¬ê¸°ì¡°ì • 실패: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s]ì—ì„œ RPM 파ì¼ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s]ì—ì„œ RPM 파ì¼ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "매체「%2$sã€ì—ì„œ RPM 파ì¼ã€Œ%1$sã€ë¥¼ ì½ì„ 수 없습니다."
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1006,78 +1006,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "매체「%sã€ì— 대한 ëª©ë¡ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "[%s] 추출 중"
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "ëª©ë¡ íŒŒì¼ì—「%sã€ì— 대한 기ë¡ì´ 없습니다."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "매체「%sã€ì— 대한 ëª©ë¡ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "프린터 「%s〠제거 중 ..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "「%sã€ì˜ ëª©ë¡ íŒŒì¼ì„ 기ë¡í•  수 없습니다."
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "「%sã€ì˜ ëª©ë¡ íŒŒì¼ì„ 기ë¡í•  수 없습니다."
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "매체「%sã€ì— 대한 ëª©ë¡ íŒŒì¼ì„ ì°¾ì„ ìˆ˜ 없습니다."
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "매체 êµí™˜"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "「%sã€ì˜ 목ë¡íŒŒì¼ì„ 분ì„í•  수 없습니다."
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "매체「%sã€ì— 대한 ëª©ë¡ í•©ì„± íŒŒì¼ ìƒì„± 완료."
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "매체「%2$sã€ì—ì„œ RPM 파ì¼ã€Œ%1$sã€ë¥¼ ì½ì„ 수 없습니다."
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn아니오"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy예"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "ì„ íƒì´ 잘못ë˜ì—ˆìŠµë‹ˆë‹¤. 다시 ì‹œë„하세요.\n"
@@ -1132,47 +1132,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "매체「%sã€ì— 접근할 수 없습니다."
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "%së¼ëŠ” 팩키지는 없습니다."
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "ë‹¤ìŒ íŒ©í‚¤ì§€ë“¤ì€ %s를 ë‹´ê³  있습니다: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "kdesuê°€ ì—†ìŒ"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "kdesuê°€ ì—†ìŒ"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "제거할 태그 ì—†ìŒ!"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "ì°½ í…Œë‘리 테마"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ìžë™ 설치 플로피 ë””ìŠ¤í¬ ìƒì„±"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "kdesuê°€ ì—†ìŒ"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "콘퀘스트"
@@ -1313,27 +1313,33 @@ msgstr "제거할 태그 ì—†ìŒ!"
msgid "Checking to remove the following packages"
msgstr "ë‹¤ìŒ íŒ©í‚¤ì§€ë“¤ 중 하나가 필요합니다:"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
"ì˜ì¡´ì„± 문제로 ì¸í•˜ì—¬, ë‹¤ìŒ íŒ©í‚¤ì§€ë“¤ë„\n"
"설치ë˜ì–´ì•¼ 합니다.\n"
"\n"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s 팩키지 설치중"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, fuzzy, c-format
msgid " (y/N) "
msgstr " (Y/n) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "로그ì¸ì— 실패했습니다"
@@ -1581,7 +1587,7 @@ msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
@@ -1591,19 +1597,19 @@ msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1870,7 +1876,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
@@ -2065,15 +2071,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
#: ../urpmi:623
@@ -2081,92 +2082,93 @@ msgstr[0] ""
msgid "Press Enter when ready..."
msgstr "다 ë˜ì—ˆìœ¼ë©´ ENTER키를 누르세요..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "취소"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "ë‹¤ìŒ íŒ©í‚¤ì§€ë“¤ì´ ì„¤ì¹˜ë  ê²ƒìž…ë‹ˆë‹¤."
-#: ../urpmi:673
+#: ../urpmi:672
#, fuzzy, c-format
msgid "The following packages have bad signatures"
msgstr "ë‹¤ìŒ íŒ©í‚¤ì§€ë“¤ì´ ì„¤ì¹˜ë  ê²ƒìž…ë‹ˆë‹¤."
-#: ../urpmi:674
+#: ../urpmi:673
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "ì´ ë²„íŠ¼ì„ ëˆ„ë¥´ì‹œê² ìŠµë‹ˆê¹Œ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "설치 실패."
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "%s 설치 중...\n"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s 설치 중...\n"
-#: ../urpmi:737
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s 설치 중...\n"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "설치 실패."
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ì˜ì¡´ì„± ê²€ì‚¬ì—†ì´ ì„¤ì¹˜í•©ë‹ˆê¹Œ? (y/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "설치를 강제 추진합니까? (y/N) "
-#: ../urpmi:825
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "설치 실패."
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "설치 실패."
-#: ../urpmi:834
+#: ../urpmi:825
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "설치 문제"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "모든 ê²ƒì´ ì´ë¯¸ 설치ë˜ì–´ 있습니다."
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "모든 ê²ƒì´ ì´ë¯¸ 설치ë˜ì–´ 있습니다."
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "[%s] 팩키지를 설치할 수 없습니다."
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "[%s] 팩키지를 설치할 수 없습니다."
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2409,8 +2411,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
#: ../urpmi.recover:82
#, c-format
@@ -2694,110 +2697,111 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:92
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "하드 디스í¬ë¥¼ ì°¾ì„ ìˆ˜ 없습니다."
-
-#: ../urpmq:428
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "하드 디스í¬ë¥¼ ì°¾ì„ ìˆ˜ 없습니다."
#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "하드 디스í¬ë¥¼ ì°¾ì„ ìˆ˜ 없습니다."
+
+#, fuzzy
#~ msgid " -R - reverse search to what requires package.\n"
#~ msgstr " -v - ìƒì„¸ ì •ë³´ 모드.\n"
diff --git a/po/ky.po b/po/ky.po
index 2de5bc21..b9154e43 100644
--- a/po/ky.po
+++ b/po/ky.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ky\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-07-13 13:23+0000\n"
"Last-Translator: Timur Jamakeev <ztimur@mail..ru>\n"
"Language-Team: Kyrgyz\n"
@@ -17,7 +17,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3.1\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM орнотуу"
@@ -27,7 +27,7 @@ msgstr "RPM орнотуу"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -93,7 +93,7 @@ msgstr "_Орнотуу"
msgid "_Save"
msgstr "_Сактоо"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Калтыруу"
@@ -103,29 +103,29 @@ msgstr "_Калтыруу"
msgid "Choose location to save file"
msgstr "Сактоо үчүн орун тандаңыз"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"белгиÑиз опциÑлар: '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "%s аттуу пакет жок"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Күтө туруңуз..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "root укуктары талап кылынат"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "ЭÑкертүү"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (жаңылоо)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (орнотуу)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Пакет тандоо"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Төмөнкү пакеттердин бири талап кылынат:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Токтотуу"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,43 +182,49 @@ msgstr ""
"%s\n"
"Уланталыбы?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
-msgstr[1] ""
+msgstr ""
"Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
+"%s\n"
-#: ../gurpmi2:223
+#: ../gurpmi2:219 ../urpmi:583
+#, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Пакет орнотулууда..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "баштапкы пакеттерди алууга болбоду, күтүлбөгөн аÑктоо"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "\"%s\" аттуу булагын [%s] түзүлүшүнө орнотуңуз"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' пакети жүктөлүүдө..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -231,7 +237,7 @@ msgstr ""
"\n"
"Орнотууну улантууну каалайÑызбы?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -242,37 +248,37 @@ msgstr ""
"%s\n"
"Мүмкүн Ñизге urpmi берилиштер базаÑын жаңылоо керек"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s алынып Ñалынууда"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "ДаÑрдоо ..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_ДаÑÑ€"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Орнотуу ишке ашпады"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Бардыгы алдагачан орнотулган"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Орнотуу аÑктады"
@@ -321,63 +327,63 @@ msgstr "Суперколдонуучу гана пакеттерди орнотÐ
msgid "Running urpmi in restricted mode..."
msgstr "urpmi чектелген режимде иштөөдө..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb ачууга болбоду"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "[%s] туура ÑÐ¼ÐµÑ rpm файл аты"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "[%s] rpm файлы кабыл алынууда..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...кабыл алуу аÑктады"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...кабыл алуу ийгиликÑиз: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "[%s] rpm файлына жетүүгө болбоду"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%s\" түшүнүүгө болбоду; ал [%s] файлынын ичинде"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "rpm файлын каттого болбоду"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "локалдык пакеттерди каттоо катаÑÑ‹"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Чектелген режим учурунда бул операциÑны аткарууга болбойт"
@@ -397,27 +403,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Бул команданы колдонуу үчүн root болушуңуз керек! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: \"%s\" rpm файлын окууга болбоду\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
@@ -442,7 +448,7 @@ msgstr "[%s] конфиг файлын жазуу мүмкүн ÑмеÑ"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] конфиг файлын жазуу мүмкүн ÑмеÑ"
@@ -450,17 +456,17 @@ msgstr "[%s] конфиг файлын жазуу мүмкүн ÑмеÑ"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "proxy ге кирүү үчүн өтүнүч\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Колдонуучунун Ñ‹Ñымы:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Пароль:"
#: ../urpm/download.pm:185
#, c-format
@@ -572,7 +578,7 @@ msgstr "\"%s\" rpm файл аты бирдей болгон бир нече пÐ
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "[%s] туура ажыратууга мүмкүн ÑмеÑ, ал \"%s\" ичинде"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "\"%s\" үчүн тизме файлына жетүүгө болбоду, булак четке кагылды"
@@ -686,7 +692,7 @@ msgstr "%s аттуу пакет жок"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -709,7 +715,7 @@ msgstr "ÑÑкертүү: MD5SUM файлынын ичинде %s үчүн md5su
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "баштапкы hdlist (же synthesis) үчүн md5sum ÑÑептелүүдө"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -718,110 +724,110 @@ msgstr ""
"\"%s\" виртуалдык булагы hdlist же тизме файлын аныктабашы керек, булак "
"четке кагылды"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"\"%s\" виртуалдык булагынын url'и бош болушу керек, булак четке кагылды"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "[%s] туура ÑÐ¼ÐµÑ rpm файл аты"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "\"%s\" үчүн тизме файлы табылбады, булак четке кагылды"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "жашабаган \"%s\" булагын тандоо аракети"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" булагы үчүн hdlist synthesis файлы түзүлдү"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" үчүн hdlist файлына жетүүгө болбоду, булак четке кагылды"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "\"%s\" үчүн hdlist файлын түшүнө албадым"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"\"%s\" булагы алдагачан колдонулуп жаткан hdlist алуу аракетинде, булак "
"четке кагылды"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"\"%s\" булагы алдагачан колдонулуп жаткан тизмени алуу аракетинде, булак "
"четке кагылды"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "\"%s\" бар булагынан аттап өтүү аракети, калтырылды"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr ""
" \"%s\" чыгарылып алынуучу булагы үчүн бириктирүү чекиттери Ó©Ñ‚Ó© Ñле көп "
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "чыгарылып алынуучу түзүлүш \"%s\" катары каралууда"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
"\"%s\" булагы ISO Ñүрөттөлүшү болуп ÑÑептелет жана ал автоматтык түрдө "
"туташылат"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "[%s] башка чыгарып алынуучу түзүлүш колдонулууда; \"%s\" үчүн"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "\"%s\" чыгарып алынуучу булагынын жолун алуу мүмкүн ÑмеÑ"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "[%s] конфиг файлын жазуу"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Параллелдик режимди use-distrib режими менен чогуу колдонууга болбойт"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "параллелдик режим үчүн байланышкан булак колдонулууда: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -830,144 +836,144 @@ msgstr ""
"--synthesis төмөнкүлөр менен бирге --media, --excludemedia, --sortmedia, --"
"update же --parallel менен колдонууга болбойт"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"ЭÑке алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf Ñч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Издөө: башы-%s, аÑгы-%s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "көз карандылыктарды Ñкинчи жолку ÑÑептөөÑÒ¯Ò¯ аткарылууда\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s пакети коё берилүүдө"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s пакетин жаңылоонун ордуна аны орнотуу аткарылат"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" булагы алдагачан бар"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "виртуалдык булак локалдык болушу керек"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" булагынын башÑаптары окулууда"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "\"%s\" булагы алынып Ñалынууда"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "инÑталлÑциÑнын биринчи булагына жетүү мүмкүн ÑмеÑ"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists файлы кабыл алынууда..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb ачууга болбоду"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "биринчи инÑталлÑлык булакка жетүүгө болбоду (hdlists файлы табылбады)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "жашабаган \"%s\" булагын тандоо аракети"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "ÑоÑтавдык булак тандалууда: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "\"%s\" булагы алынып Ñалынууда"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" булагы үчүн urpmi программаÑын кайра конфигурациÑлоо"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...кайра конфигурациÑлоо ишке ашпады"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "кайра конфигурациÑлоо аÑктады"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" булагы тандалган ÑмеÑ"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "[%s] hdlist файлы текшерилүүдө"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "[%s] synthesis файлы текшерилүүдө"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s] түзүлүшү"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -976,77 +982,77 @@ msgstr ""
"\"%s\" булагы үчүн synthesis файлын түзүүгө болбоду. Сиздин hdlist файлыңыз "
"бузук болушу мүмкүн."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist же synthesis файлын окуу проблемаÑÑ‹"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...көчүрүү ишке ашпады"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" үчүн баÑндоо файлы көчүрүлүүдө..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...көчүрүү аÑктады"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] көчүрүү ишке ашпады (файл күмөндүү кыÑка)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "көчүрүлгөн баштапкы hdlist (же synthesis) үчүн md5sum ÑÑептелүүдө"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr " [%s] көчүрүү ишке ашпады (md5sum туура ÑмеÑ)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "кабыл алынган баштапкы hdlist (же synthesis) үчүн md5sum ÑÑептелүүдө"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...кабыл алуу ийгиликÑиз: md5sum дал келбеÑтиги"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] булагында rpm файлдары табылдбады"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] булагынын rpm файлдары окулууда"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] булагынан rpm файлдарын окууга болбоду: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "rpm-дер окулбады"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1057,78 +1063,78 @@ msgstr ""
"бул ката Ñиз булакты түзүүдө аны өз алдыңызча бириктиргенде пайда болушу "
"мүмкүн."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" булагынын баштапкы hdlist (же synthesis) кабыл алынууда..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "изделген hdlist (же synthesis) табылды: %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" булагы үчүн hdlist файлы табылбады"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" үчүн ачык ачкыч файлы текшерилүүдө..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...%s ачкычы \"%s\" ачык ачкычынан импорттолду"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" ачык ачкыч файлын импортоо мүмкүн ÑмеÑ"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" булагы үчүн тизме файлы жазылууда"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s булагы кошулду"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" үчүн hdlist файлын түшүнө албадым"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" булагынын synthesis файлын окуу проблемаÑÑ‹"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" булагынын башÑаптары окулууда"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnжЖ;:"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyоО"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Кечириңиз, туура ÑÐ¼ÐµÑ Ñ‚Ð°Ð½Ð´Ð¾Ð¾, кайталап көрүңүз\n"
@@ -1164,8 +1170,8 @@ msgid "unmounting %s"
msgstr "%s ажыратылууда"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "\"%s\" булагы тандалган ÑмеÑ"
#: ../urpm/removable.pm:143
@@ -1185,47 +1191,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "\"%s\" булагына жетүүгө мүмкүн ÑмеÑ"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s аттуу пакет жок"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Төмөнкү пакеттер %s камтыйт: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s жоктугунан"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s канаатанбагандыгынан"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "%s активдештирүү аракети"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s Ñактоо үчүн"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s орнотуу үчүн"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s менен конфликтешкендиги үчүн"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "талап кылынбаган"
@@ -1372,24 +1378,34 @@ msgstr "Ðлып Ñалууга Ñч нерÑе жок"
msgid "Checking to remove the following packages"
msgstr "Төмөнкү пакеттерди алып Ñалуу мүмкүнчүлүгүн текшерүү"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
+msgstr[1] ""
+"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid " (%d MB)"
msgstr ""
-"Көз карандылыктарды канаатандыруу үчүн төмөнкү %d пакет жоготулат (%d Мб)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "%s пакети алынып Ñалынууда"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s пакети алынып Ñалынууда"
+msgstr[1] "%s пакети алынып Ñалынууда"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Ðлып Ñалуу ишке ашпады"
@@ -1647,7 +1663,7 @@ msgstr " --verbose - кеңири режим.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - пакеттеги файлдар тизмеÑи.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1659,12 +1675,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s үчүн Ñпецификалык чөйрө колдонулууда\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1673,7 +1689,7 @@ msgstr ""
"ЭÑке алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf Ñч "
"кандай жыйынтык кайтара албады\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1980,7 +1996,7 @@ msgstr " --noclean - rpm-дерди кÑштен тазалабоо.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - архитектуралары бирдей гана пакеттерди жаңылоо.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - бардык тийиштүүÑүн командалык Ñаптан алуу.\n"
@@ -2051,65 +2067,68 @@ msgstr ""
"Ката:мүмкүн %s окуу үчүн гана колдонулган.\n"
" --allow-force операциÑны чакыруу үчүн колдонуу."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (жаңылоо)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (жаңылоо)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (орнотуу)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (орнотуу)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Сиздин тандооңуз? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Төмөнкү пакеттерди орнотууга болбойт, Ñебеби алар ÑÑкирген пакеттерден көз "
"каранды:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"Төмөнкү пакеттерди орнотууга болбойт, Ñебеби алар ÑÑкирген пакеттерден көз "
"каранды:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Буга карабай улантайынбы?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -2119,56 +2138,65 @@ msgstr " (Y/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Талап кылынган кÑÑ Ð±Ð¸Ñ€ пакеттерди орноттууга болбойт:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Талап кылынган кÑÑ Ð±Ð¸Ñ€ пакеттерди орноттууга болбойт:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Орнотууну улантууга болбойт, Ñебеби башкаларын жаңылоо\n"
"үчүн төмөнкү пакеттерди алып Ñалуу талап кылынат:\n"
",%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Орнотууну улантууга болбойт, Ñебеби башкаларын жаңылоо\n"
"үчүн төмөнкү пакеттерди алып Ñалуу талап кылынат:\n"
",%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып Ñалуу талап кылынат:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Башкаларын жаңылоо үчүн төмөнкү пакеттерди алып Ñалуу талап кылынат:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2177,100 +2205,111 @@ msgstr ""
"Төмөнкү көз карандылыктарды орнотуу үчүн Ñиз root болушуңуз керек:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "ДаÑÑ€ болгон Ñоң, Enter баÑыңыз..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Калтыруу"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Төмөнкү пакеттердин ÑигнарураÑÑ‹ туура ÑмеÑ"
-msgstr[1] "Төмөнкү пакеттердин ÑигнарураÑÑ‹ туура ÑмеÑ"
+msgstr "Төмөнкү пакеттердин ÑигнарураÑÑ‹ туура ÑмеÑ"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Төмөнкү пакеттердин ÑигнарураÑÑ‹ туура ÑмеÑ"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Орнотууну улантууну каалайÑызбы ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Орнотуу ишке ашпады"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "%s бөлүштүрүлүүдө"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "%2s булагынан %1s орнотулууда"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s орнотулууда"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Орнотуу ишке ашпады"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Көз карадылыктарды ÑÑке албай орнотуп көрөйүнбү? (y/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Мажбурлап орнотуп көрөйүнбү (--force)? (y/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d орнотуу транзакциÑлары ишке ашпады"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d орнотуу транзакциÑлары ишке ашпады"
+msgstr[1] "%d орнотуу транзакциÑлары ишке ашпады"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Орнотууга мүмкүн"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Бардыгы алдагачан орнотулган"
-msgstr[1] "Бардыгы алдагачан орнотулган"
+msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Бардыгы алдагачан орнотулган"
-msgstr[1] "Бардыгы алдагачан орнотулган"
+msgstr "Бардыгы алдагачан орнотулган"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Бардыгы алдагачан орнотулган"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi кайра ишке киргизилүүдө"
@@ -2379,17 +2418,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - конфигурациÑга булакты кошуу, бирок аны жаңылабоо.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - башÑаптар (headers) кÑшинин каталогун тазалоо.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - кыÑкартылган режим (quiet).\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - кеңири режим.\n"
@@ -2527,8 +2566,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2586,12 +2627,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"колдонулушу: urpmi.removemedia [-a] <аты> ...\n"
+"колдонулушу: urpmi.removemedia (-a | <аты> ...)\n"
"мында: <аты> алынып Ñалынуучу булак аты.\n"
#: ../urpmi.removemedia:41
@@ -2654,26 +2695,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - жаңылабоо,булакты өз тартибинде белгилөө.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - synthesis же hdlist файлын издөөгө\n"
+" аракет кылбоо.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - чыкпоочу бардык булактарды тандоо.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - hdlist файлдардын түзүүгө мажбурлоо.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Суперколдонуучу гана пакет булактарын жаңылай алат"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "жаңылоого Ñч нерÑе жок (булак кошуу үчүн urpmi.addmedia колдонуңуз)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2682,17 +2731,17 @@ msgstr ""
"жаңылоо үчүн пунк жок\n"
"(%s ичинен бири)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "%s булагы оңдолууда:"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "%s булагы иштөөдө"
@@ -2802,72 +2851,73 @@ msgstr " --changelog - changelog чыгаруу.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - жалпы маалымат Ñ‚Ñгин чыгаруу.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - кректелген пакеттерди теÑкери тартипте издөө.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - теÑкери тартипте кеңири издөө (анык пакеттерди "
+"камтыйт).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - пакеттерди табуу үчүн provides'терден издөө.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - пакетти алып Ñалууда кеңири маалымат чыгаруу.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - пакеттерди көз карандылыктары үчүн кеңейтилген Ñуроо-"
"талап.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - группаларды наамдары менен кошо чыгаруу.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - керектүү информациÑны окууга ыңгайлуу формада чыгаруу.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - пакеттеги файлдар тизмеÑи.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - пакетти табуу үчүн, provides'терден издебөө (алдынала "
-"орнотулган).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - пакеттерди табуу үчүн provides'терден издөө.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - кыÑкартылган режим (quiet).\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - верÑиÑÑын жана релизин наамдары менен кошо чыгаруу.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - кректелген пакеттерди теÑкери тартипте издөө.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - теÑкери тартипте кеңири издөө (анык пакеттерди "
-"камтыйт).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - кийинки пакет-баштапкы пакет (--src ÑÑ‹Ñктуу).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2875,112 +2925,95 @@ msgid ""
msgstr ""
" -u - жаңыраак верÑиÑÑÑ‹ орнотулган болÑо пакетти алып Ñалуу.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - издөөнү так ÑÐ¼ÐµÑ Ð»Ð¾Ð³Ð¸ÐºÐ°Ð½Ñ‹Ð½ негизинде көрÑÓ©Ñ‚Ò¯Ò¯(--fuzzy "
"ÑÑ‹Ñктуу).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - -y ачкычынын Ñквиваленти, бирок тамгалар региÑтрин ÑÑке "
"албайт.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " командалык Ñапта көрÑөтүлгөн наамдар же rpm файлдар Ñуралды.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes опциÑÑÑ‹ --parallel менен чогуу гана колдонулат"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"ЭÑке алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf Ñч "
+"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "filelist табылбады\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"ЭÑке алыңыз: изилденип жаткан булак hdlist'терди колдонбогондуктан, urpmf Ñч "
+"кандай жыйынтык кайтара албады\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "changelog табылбады\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "filelist табылбады\n"
+
+#~ msgid "medium \"%s\" is not selected"
+#~ msgstr "\"%s\" булагы тандалган ÑмеÑ"
+
+#~ msgid " -f - force generation of hdlist files.\n"
+#~ msgstr " -f - hdlist файлдардын түзүүгө мажбурлоо.\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
-#~ msgstr[1] ""
-#~ "Көз карандылыктарды канаатандыруу үчүн, төмөнкү пакет орнотулат (%d Мб)"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - пакетти табуу үчүн, provides'терден издебөө (алдынала "
+#~ "орнотулган).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - кректелген пакеттерди теÑкери тартипте издөө.\n"
#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
+#~ " -RR - extended reverse search (includes virtual packages).\n"
#~ msgstr ""
-#~ "Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
-#~ "%s\n"
+#~ " -RR - теÑкери тартипте кеңири издөө (анык пакеттерди "
+#~ "камтыйт).\n"
-#, fuzzy
#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
#~ "%s\n"
-#~ msgstr[1] ""
+#~ msgstr ""
#~ "Көз карандылыктарды канаатандыруу үчүн, төмөнкү %d пакет орнотулат:\n"
#~ "%s\n"
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "%s булагы коё берилди: hdlist жок"
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Орнотуу ишке ашпады"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "Пакет орнотулууда: `%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "[%s] synthesis файлы текшерилүүдө"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "%s бөлүштүрүлүүдө"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Пакет орнотулууда..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Пакет орнотулууда..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - synthesis файлын издөө жана аны колдонуу.\n"
diff --git a/po/lt.po b/po/lt.po
index c8037fc8..b06503a8 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,16 +10,17 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-08-18 23:34+0200\n"
"Last-Translator: Arvydas Svirka <arvydas@arvis.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM įdiegimas"
@@ -29,7 +30,7 @@ msgstr "RPM įdiegimas"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Gerai"
@@ -95,7 +96,7 @@ msgstr "Į_diegti"
msgid "_Save"
msgstr "IÅ¡_saugoti"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Atšaukti"
@@ -105,27 +106,27 @@ msgstr "_Atšaukti"
msgid "Choose location to save file"
msgstr "Pasirinkite vietą bylos išsaugojimui"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr "Nežinomas perspėjimas"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Išsaugoti paketų pasirinkimą"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Palaukite..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Turi būti pradinis"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +137,42 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "DÄ—mesio"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Gerai"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (atnaujinti)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (įdiegti)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Paketų pasirinkimas"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Vienas iš šių paketų yra reikalingas."
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Nutraukti"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,42 +183,47 @@ msgstr ""
"%s\n"
"Tęsti?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-msgstr[1] "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-msgstr[2] "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
+msgstr "Priklausomybių patenkinimui, bus įdiegtas šis paketas (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d paketų"
+msgstr[1] "%d paketų"
+msgstr[2] "%d paketų"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Paketų įdiegimas..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "negaliu gauti pirminių paketų, nutraukiu"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Įdėkite laikmeną, pavadintą \"%s\", į įrenginį [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "ParsiunÄiamas paketas `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -230,7 +236,7 @@ msgstr ""
"\n"
"Ar norite tęsti įdiegimą ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -241,37 +247,37 @@ msgstr ""
"%s\n"
"Jūs galite norėti atnaujinti urpmi duomenų bazę"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "pašalinama %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Ruošiamasi..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Įdiegiamas paketas `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "Baigta"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Įdiegimas nepavyko"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Paketas(-ai) jau įdiegti"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Įdiegimas baigtas"
@@ -320,63 +326,63 @@ msgstr "Paketus įdiegti leidžiama tik supervartotojui"
msgid "Running urpmi in restricted mode..."
msgstr "urpmi paleidžiama apribota veiksena..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "negaliu atverti rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "netinkamas rpm bylos vardas [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "atkuriama rpm byla [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...atkūrimas baigtas"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...atkūrimas nepavyko: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "negaliu prieiti prie rpm bylos [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "negaliu išnagrinėti \"%s\" byloje [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "negaliu įregistruoti rpm bylos"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "vietinių paketų registravimo klaida"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Operacija yra draudžiama, kai dirbama apribotoje veiksenoje"
@@ -396,27 +402,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Kad galėtumėte dalintis katalogais, jūs turite būti atpažintas"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: negaliu perskaityti rpm bylos \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" laikmenai sudaryta hdlist sintezÄ—s byla"
@@ -441,7 +447,7 @@ msgstr "nagaliu įrašyti konfigūracijos bylos [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "nagaliu įrašyti konfigūracijos bylos [%s]"
@@ -454,12 +460,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Naudotojo vardas:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Slaptažodis:"
#: ../urpm/download.pm:185
#, c-format
@@ -571,7 +577,7 @@ msgstr "tokį pat rpm bylos pavadinimą turi keletas paketų \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "negaliu teisingai išnagrinėti [%s] ties verte \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "negaliu prieiti prie \"%s\" list bylos, laikmena ignoruojama"
@@ -683,9 +689,9 @@ msgid "No base defined"
msgstr "Išsaugoti paketų pasirinkimą"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Nepavyko paskirti spalvų lentelės įrašų"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -707,7 +713,7 @@ msgstr "įspėjimas: MD5SUM byloje negalima %s md5sum"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "esanÄiam hdlist (arba sintezei) skaiÄiuojama md5sum"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -716,105 +722,105 @@ msgstr ""
"virtualioji laikmena \"%s\" neturėtų turėti hdlist ar list bylos, laikmena "
"ignoruojama"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"virtualioji laikmena \"%s\" turėtų turėti aiškų url, laikmena ignoruojama"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "netinkamas rpm bylos vardas [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "negaliu rasti sąrašo dėl \"%s\", laikmena ignoruojama"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "bandoma iÅ¡rinkti nesanÄiÄ… laikmenÄ… \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" laikmenai sudaryta hdlist sintezÄ—s byla"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "negaliu prieiti prie \"%s\" hdlist bylos, laikmena ignoruojama"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "negaliu išnagrinėti \"%s\" hdlist bylos"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"laikmena \"%s\" bando panaudoti ir jau naudojo hdlist, laikmena ignoruojama"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"laikmena \"%s\" bando panaudoti ir jau naudojo list, laikmena ignoruojama"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "bandau praleisti esanÄiÄ… laikmenÄ… \"%s\", vengiu"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "per daug išimamos laikmenos prijungimo taškų \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "išimamas įrenginys priimamas kaip \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Laikmena \"%s\" yra ISO atvaizdas, bus prijungta on-the-fly metodu"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "naudojamas skirtingas išimamas įrenginys [%s] dėl \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "negaliu išgauti kelio vardo išimamai laikmenai\"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "įrašyta konfigūracijos byla [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "use-distrib veiksenai negaliu naudoti lygiagreÄios veiksenos "
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "naudojama susijusi laikmena lygiagreÄiajai veiksenai: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -823,144 +829,144 @@ msgstr ""
"--sintezė negali būti naudojama su --media, --excludemedia, --sortmedia, --"
"update or --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Paieškos pradžia: %s pabaiga: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "atliekamas antrasis priklausomybių skaiÄiavimo bandymas\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "praleidžiamas paketas %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "bus įdiegtas vietoje atnaujinimo paketo %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "laikmena \"%s\" jau yra"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuali laikmena turi būti vietinė"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "iš laikmenos \"%s\" skaitomos antraštės"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "pašalinama laikmena \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "negaliu prieiti prie pirmojo įdiegimo laikmenos"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "atkuriama hdlists byla..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "negaliu atverti rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "negaliu prieiti prie pirmojo įdiegimo laikmenos (nerasta hdlists byla)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "bandoma iÅ¡rinkti nesanÄiÄ… laikmenÄ… \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "išrenkama daugialypė laikmena: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "pašalinama laikmena \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "laikmenai \"%s\" iš naujo konfigūruojama urpmi"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...naujas konfigūravimas nepavyko"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "naujas konfigūravimas atliktas"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "laikmena \"%s\" neišrinkta"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "tikrinama hdlist byla [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "tikrinama sintezÄ—s byla [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "sudaromas hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -969,77 +975,77 @@ msgstr ""
"Laikmenai \"%s\" negaliu sudaryti sintezės bylos. Jūsų hdlist byla gali būti "
"sugadinta."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "hdlist skaitymo arba \"%s\" laikmenos bylos sintezÄ—s problema"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopijavimas nepavyko"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopijuojama \"%s\" aprašo byla..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopijavimas baigtas"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopijavimas nepavyko (byla per daug maža)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "nukopijuotam hdlist (arba sintezei) skaiÄiuojama md5sum"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopijavimas nepavyko (md5sum neatitikimas)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "atkurtam hdlist (arba sintezei) skaiÄiuojama md5sum"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...atkūrimas nepavyko: md5sum neatitikimas"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nerasta jokių rpm bylų iš [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "iš [%s] skaitomos rpm bylos"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "negaliu skaityti rpm bylų iš [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "neperskaityta jokių rpms"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1050,78 +1056,78 @@ msgstr ""
"tai galėjo atsitikti, jei, kurdami laikmeną, rankiniu būdu prijungėte "
"katalogÄ…."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "atkuriamas \"%s\" pirminis hdlist (arba zintezÄ—)..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "rastas ištirtas hdlist (arba sintezė) kaip %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "laikmenai \"%s\" nerasta hdlist byla"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "tikrinama \"%s\" pubkey byla..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...iš \"%2$s\" pubkey bylos importuotas raktas %1$s"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "negaliu importuoti \"%s\" pubkey bylos"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "įrašoma laikmenos \"%s\" sąrašo byla"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "įtraukta laikmena %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "negaliu išnagrinėti \"%s\" hdlist bylos"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "laikmenos \"%s\" sintezÄ—s bylos skaitymo problema"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "iš laikmenos \"%s\" skaitomos antraštės"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "TtYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Gaila, bet pasirinkimas blogas, pakartokite\n"
@@ -1157,8 +1163,8 @@ msgid "unmounting %s"
msgstr "atjungiama %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "laikmena \"%s\" neišrinkta"
#: ../urpm/removable.pm:143
@@ -1176,47 +1182,47 @@ msgstr "nesuderinama laikmena \"%s\" pažymėta kaip išimama, bet tokia nėra"
msgid "unable to access medium \"%s\""
msgstr "negaliu prieiti prie laikmenos \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "NÄ—ra paketo, pavadinto %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Å ie paketai turi %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "dėl trūkstamo %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "dÄ—l nepatenkinto %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "bandau paaukštinti %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s išlaikymui"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s įdiegimui"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "dėl konfliktų su %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nepareikalautas"
@@ -1363,23 +1369,34 @@ msgstr "Nėra ką pašalinti"
msgid "Checking to remove the following packages"
msgstr "Tikrinami pašalintini sekantys paketai"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+msgstr[1] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+msgstr[2] "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Priklausomybių patenkinimui, šie paketai %d bus pašalinti (%d MB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "pašalinamas paketas %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "pašalinamas paketas %s"
+msgstr[1] "pašalinamas paketas %s"
+msgstr[2] "pašalinamas paketas %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (t/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Pašalinimas nepavyko"
@@ -1638,7 +1655,7 @@ msgstr " --verbose - verbose veiksena.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - paketo bylas sudėti į sąrašą.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1650,12 +1667,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s naudojama specifinÄ— aplinka\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1664,7 +1681,7 @@ msgstr ""
"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
"išvesti jokio rezultato\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Galbūt noresite naudoti --pavadinimas paketų pavadinimų paieškai.\n"
@@ -1972,7 +1989,7 @@ msgstr " --noclean - rpms iš cache neišvalyti.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - atnaujinti tik tokios pat architektūros paketus.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komandinėje eilutėje išrinkti visus atitikimus.\n"
@@ -2043,69 +2060,68 @@ msgstr ""
"Klaida: %s prijungta tik skaitymui.\n"
"Operacijos vykdymui naudokite --allow-force"
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (atnaujinti)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (atnaujinti)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (įdiegti)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (įdiegti)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Koks Jūsų pasirinkimas? (1-%d)"
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Išvardyti paketai negali būti įdiegti, nes jie yra priklausomi nuo paketų,\n"
"kurie yra senesni nei dabar įdiegti:\n"
"%s"
-msgstr[1] ""
-"Išvardyti paketai negali būti įdiegti, nes jie yra priklausomi nuo paketų,\n"
-"kurie yra senesni nei dabar įdiegti:\n"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Išvardyti paketai negali būti įdiegti, nes jie yra priklausomi nuo paketų,\n"
"kurie yra senesni nei dabar įdiegti:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ar vis tiek tęsti?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (T/n) "
@@ -2115,66 +2131,65 @@ msgstr " (T/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-msgstr[1] ""
-"Pareikalautas paketas negali būti įdiegtas:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Pareikalautas paketas negali būti įdiegtas:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Įdiegimas negali būti tęsiamas, nes šie paketai\n"
"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
"%s\n"
-msgstr[1] ""
-"Įdiegimas negali būti tęsiamas, nes šie paketai\n"
-"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[2] ""
+msgstr ""
"Įdiegimas negali būti tęsiamas, nes šie paketai\n"
"turi būti pašalinti, kad kitus būtų galima atnaujinti:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
"%s"
-msgstr[1] ""
-"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[2] ""
+msgstr ""
"Šie paketai turi būti pašalinti tam, kad kitus būtų galima atnaujinti:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2183,104 +2198,113 @@ msgstr ""
"Išvardintų priklausomybių įdiegimiui jūs turite būti pradiniu:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Kai būsite pasiruošę, paspauskite Enter..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Atšaukti"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Šie paketai turi netinkamus ženklus"
-msgstr[1] "Šie paketai turi netinkamus ženklus"
-msgstr[2] "Šie paketai turi netinkamus ženklus"
+msgstr "Šie paketai turi netinkamus ženklus"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Šie paketai turi netinkamus ženklus"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ar norite tęsti įdiegimą ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Įdiegimas nepavyko"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "paskirstomas %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "iš %2$s įdiegiamas %1$s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "įdiegiama %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Įdiegimas nepavyko"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Pabandyti įdiegimą be priklausomybių tikrinimo? (t/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Pabandyti įdiegimą priverstinai (--force)? (t/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d įdiegimo operacijos nepavyko"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d įdiegimo operacijos nepavyko"
+msgstr[1] "%d įdiegimo operacijos nepavyko"
+msgstr[2] "%d įdiegimo operacijos nepavyko"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Įdiegimas galimas"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Paketas(-ai) jau įdiegti"
-msgstr[1] "Paketas(-ai) jau įdiegti"
-msgstr[2] "Paketas(-ai) jau įdiegti"
+msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Paketas(-ai) jau įdiegti"
-msgstr[1] "Paketas(-ai) jau įdiegti"
-msgstr[2] "Paketas(-ai) jau įdiegti"
+msgstr "Paketas(-ai) jau įdiegti"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Paketas(-ai) jau įdiegti"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "iš naujo paleidžiama urpmi"
@@ -2391,17 +2415,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - įtraukti laikmenos konfigūraciją, bet jos neatnaujinti.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - iÅ¡valyti antraÅ¡Äių cache katalogÄ….\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - paslÄ—ptoji veiksena.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - verbose veiksena.\n"
@@ -2535,8 +2559,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2594,12 +2621,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"naudojimas: urpmi.removemedia [-a] <pavadinimas> ...\n"
+"naudojimas: urpmi.removemedia (-a | <pavadinimas> ...)\n"
"kur <pavadinimas> yra pašalintinos laikmenos pavadinimas.\n"
#: ../urpmi.removemedia:41
@@ -2662,26 +2689,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - neatnaujinti, laikmeną pažymėti kaip įgalintą.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - nebandyti surasti nei sintezes, nei\n"
+" hdlist bylų.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - išrinkti visas neišimamas laikmenas.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - vykdyti hdlist bylų sudarymą.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Atnaujinti laikmenas gali tik supervartotojas"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "nÄ—ra kÄ… atnaujinti (laikmenos pridÄ—jimui naudokite urpmi.addmedia)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2690,17 +2725,17 @@ msgstr ""
"atnaujintino įrašo nėra\n"
"(vienas iš %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "ignoruojama laikmena %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "įgalinama laikmena %s"
@@ -2808,70 +2843,73 @@ msgstr " --changelog - atspausdinti changelog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - spausdinti suvestinÄ™.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - atbulinė paieška to, kas reikalauja paketo.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - išplėstinė atbulinė paieška (apima ir virtualius "
+"paketus).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - iškoti paketo suradimo pateiktyse.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - išvedimą užbaigti paketu, kuris turi būti pašalintas.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - išplėsti paketo priklausomybių užklausą.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - spausdinti grupes kartu su pavadinimu.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - naudingą informaciją spausdinti žmogui suprantama forma.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketo bylas sudėti į sąrašą.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - pasiūlymuose paketo neiškoti (standartinis).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - iškoti paketo suradimo pateiktyse.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - paslÄ—ptoji veiksena.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - atspausdinti versijÄ… ir leidimÄ… kartu su pavadinimu.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - atbulinė paieška to, kas reikalauja paketo.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - išplėstinė atbulinė paieška (apima ir virtualius "
-"paketus).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sekantis paketas yra pradinis (tas pats kaip --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2879,55 +2917,74 @@ msgid ""
msgstr ""
" -u - paketą pašalinti, jei yra įdiegta naujesnė jo versija.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - skirti neaiškią paiešką (tas pats kaip --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - panašiai kaip -y, bet yra vykdoma nekreipiant dėmesio į "
"didžiąsiais ir mažąsias raides.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " apklausiami komandinÄ—je eilutÄ—je duoti pavadinimai arba rpm bylos.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-mazgas gali būti naudojamas tik su --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
+"išvesti jokio rezultato\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nerastas bylų sąrašas\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Pastaba: kadangi nei viena surasta laikmena nenaudoja hdlists, urpmf negali "
+"išvesti jokio rezultato\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nerastas changelog\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Nerastas bylų sąrašas\n"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P - pasiūlymuose paketo neiškoti (standartinis).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - atbulinė paieška to, kas reikalauja paketo.\n"
+
+#~ msgid ""
+#~ " -RR - extended reverse search (includes virtual packages).\n"
+#~ msgstr ""
+#~ " -RR - išplėstinė atbulinė paieška (apima ir virtualius "
+#~ "paketus).\n"
+
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/lv.po b/po/lv.po
index a78813d0..57ec7d1e 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,16 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2002-09-27 17:43+0200\n"
"Last-Translator: Raivo Saars <spaiks@inbox.lv>\n"
"Language-Team: ll10nt <ll10nt@listes.murds.lv>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Sagatavoju instalēšanu"
@@ -30,7 +31,7 @@ msgstr "Sagatavoju instalēšanu"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Labi"
@@ -80,7 +81,7 @@ msgstr "_UzstÄdÄ«t"
msgid "_Save"
msgstr "_SaglabÄt"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "At_celt"
@@ -90,29 +91,29 @@ msgstr "At_celt"
msgid "Choose location to save file"
msgstr "Izvēlieties failu"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"nezinÄmas opcijas '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "SaglabÄt pakotņu izvÄ“li"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "LÅ«dzu gaidiet..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, fuzzy, c-format
msgid "Must be root"
msgstr "Peles ports"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -123,42 +124,42 @@ msgstr ""
"%s\n"
"vai piekrītat?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Uzmanību"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Labi"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "AtjauninÄt"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Instalēšanas beigas"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Ir nepiecieÅ¡ama viena no sekojoÅ¡Äm pakotnÄ“m:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_PÄrtraukt"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -166,42 +167,47 @@ msgid ""
"Continue installation anyway?"
msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
-msgstr[1] "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
-msgstr[2] "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
+msgstr "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d pakotnes"
+msgstr[1] "%d pakotnes"
+msgstr[2] "%d pakotnes"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, fuzzy, c-format
msgid "Package installation..."
msgstr "Sagatavoju instalēšanu"
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "nevar dabÅ«t koda pakotnes, pÄrtraucu"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lūdzu ielieciet datu nesēju \"%s\" ierīcē [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, fuzzy, c-format
msgid "Downloading package `%s'..."
msgstr "Instalēju pakotnes..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -210,7 +216,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "SekojoÅ¡Äm pakotnÄ“m ir slikti paraksti"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -218,37 +224,37 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "Atvienoju %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Sagatavoju..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, fuzzy, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Instalēju pakotnes..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "Izdarīts"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "InstalÄ“Å¡ana neizdevÄs"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "viss jau ir instalēts"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Instalēšana pabeigta"
@@ -299,63 +305,63 @@ msgstr "nevaru instalēt pakotni %s"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "Nevar atvērt failu %s\n"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nederÄ«gs rpm faila vÄrds [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...atgūšana veikta"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...atgÅ«Å¡ana neizdevÄs: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "nav iespējams piekļūt rpm failam [%s]"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "kļūda reÄ£istrÄ“jot lokÄlÄs pakotnes"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -375,27 +381,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Jums ir jÄbÅ«t autorizÄ“tam, lai koplietotu katalogus"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, fuzzy, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "nevar nolasīt izvēlnes failu:%s"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
@@ -420,7 +426,7 @@ msgstr "nevar saglabÄt konfigurÄcijas failu [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "nevar saglabÄt konfigurÄcijas failu [%s]"
@@ -433,12 +439,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "LietotÄja vÄrds:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Parole:"
#: ../urpm/download.pm:185
#, c-format
@@ -550,7 +556,7 @@ msgstr "ir vairÄkas pakotnes ar vienÄdu rpm faila vÄrdu \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "nav iespējams nolasīt rpm failu [%s] no datu nesēja \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, fuzzy, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "nevar piekļūt \"%s\" hdlist failam, datu nesējs tiek ignorēts"
@@ -659,9 +665,9 @@ msgid "No base defined"
msgstr "SaglabÄt pakotņu izvÄ“li"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Nevaru pieslēgties serverim"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -683,7 +689,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -692,330 +698,330 @@ msgstr ""
"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
"ignorēts"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
"ignorēts"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nederÄ«gs rpm faila vÄrds [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
"nevar atrasta saraksta failu priekÅ¡ \"%s\", datu nesÄ“js neiks ņemts vÄ“rÄ"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "nevar izveidot datu nesēju \"%s\"\n"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "uzbūvēju hdlist synthesis failu priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "nevar piekļūt \"%s\" hdlist failam, datu nesējs tiek ignorēts"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "nevaru izanalizēt \"%s\" hdlist failu"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"Datu nesējs \"%s\" mēģina lietot jau pielietotu hdlist, datu nesējs tiek "
"ignorēts"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
"ignorēts"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "mÄ“Ä£inÄts izvÄ“lÄ“ties neeksistÄ“joÅ¡u datu nesÄ“ju \"%s\""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "pÄrÄk daudz montÄ“Å¡anas punktu noņemamajam datu nesÄ“jam \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, fuzzy, c-format
msgid "taking removable device as \"%s\""
msgstr "Atvienojama ierīce"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, fuzzy, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "lietoju citu noņemamo ierīci [%s] priekš \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, fuzzy, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "pÄrÄk daudz montÄ“Å¡anas punktu noņemamajam datu nesÄ“jam \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "rakstu konfigurÄcijas failu [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Meklēt instalētos fontus"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "Instalēju pakotni %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "Problēmas, instalējot pakotni %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "datu nesējs \"%s\" jau eksistē"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr ""
"Datu nesējs \"%s\" mēģina lietot jau pielietotu sarakstu, datu nesējs tiek "
"ignorēts"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "nav iespÄ“jams piekļūt pirmajam instalÄcijas datu nesÄ“jam"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "Nevar atvērt failu %s\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "nav iespÄ“jams piekļūt pirmajam instalÄcijas datu nesÄ“jam"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "nevar izveidot datu nesēju \"%s\"\n"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "izvÄ“los vairÄkas vides: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Konfigurēju printeri \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "IzvÄ“lnes konfigurÄcija saglabÄta"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Servera konfigurÄcija"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "datu nesējs \"%s\" nav izvēlēts"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "eksaminēju hdlist failu [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "eksaminēju synthesis failu [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "būvēju hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, fuzzy, c-format
msgid "...copying failed"
msgstr "...kopēšana veikta"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopēšana veikta"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopÄ“Å¡ana neizdevÄs"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopÄ“Å¡ana neizdevÄs"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...atgÅ«Å¡ana neizdevÄs: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "netika atrasti rpm faili no [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "nolasu rpm failus no [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "neizdevÄs nolasÄ«t rpm failus no [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1023,78 +1029,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "atgūstu hdlists failu..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "saraksta fails priekš \"%s\" ir tukšs"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "kopēju \"%s\" apraksta failu ..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nevaru ierakstīt \"%s\" saraksta failu"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "netika atrasts hdlist fails priekš datu nesēja \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "pievienoju datu nesēju %s."
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nevaru izanalizēt \"%s\" hdlist failu"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "problēma nolasot datu nesēja \"%s\" synthesis failu"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "jJYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Atvainojiet, nepareiza izvēle. Mēģiniet vēlreiz\n"
@@ -1130,8 +1136,8 @@ msgid "unmounting %s"
msgstr "atmontēju %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "datu nesējs \"%s\" nav izvēlēts"
#: ../urpm/removable.pm:143
@@ -1149,47 +1155,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "nav iespējams piekļūt datu nesējam \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nav pakotnes ar nosaukumu %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sekojošas pakotnes satur %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "trūkstošs kdesu"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Nav nekÄ, ko noņemt.\n"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Loga rÄmja tÄ“ma"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "nevaru instalēt pakotni %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s konflikē ar %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "Konkvests"
@@ -1333,23 +1339,34 @@ msgstr "Nav iezīmes ko noņemt!"
msgid "Checking to remove the following packages"
msgstr "Ir nepiecieÅ¡ama viena no sekojoÅ¡Äm pakotnÄ“m:"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
+msgstr[1] "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
+msgstr[2] "Lai apmierinÄtu atkarÄ«bas, tiks noņemtas sekojoÅ¡as pakotnes (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "Instalēju pakotni %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Instalēju pakotni %s"
+msgstr[1] "Instalēju pakotni %s"
+msgstr[2] "Instalēju pakotni %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "NeveiksmÄ«ga PieteikÅ¡anÄs"
@@ -1603,7 +1620,7 @@ msgstr " -v - runīgais režīms.\n"
msgid " -m - the media in which the package was found\n"
msgstr " --list - izvadÄ«t sarakstu ar pieejamÄm pakotnÄ“m.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -v - runīgais režīms.\n"
@@ -1613,19 +1630,19 @@ msgstr " -v - runīgais režīms.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1900,7 +1917,7 @@ msgstr " --clean - izņemt rpm no kešatmiņas, pirms darīt ko citu.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -q - klusais režīms.\n"
@@ -1966,60 +1983,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "AtjauninÄt"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "AtjauninÄt"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Instalēšanas beigas"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Instalēšanas beigas"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "KÄda ir jÅ«su izvÄ“le? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Tad turpinÄt?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
@@ -2029,54 +2048,57 @@ msgstr " (J/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr "Dažas pakotnes nepieciešams noņemt"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] "Dažas pakotnes nepieciešams noņemt"
-msgstr[1] "Dažas pakotnes nepieciešams noņemt"
-msgstr[2] "Dažas pakotnes nepieciešams noņemt"
+msgstr "Dažas pakotnes nepieciešams noņemt"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"SekojoÅ¡as pakotnes ir jÄnoņem, lai uzlabotu citas:\n"
"%s\n"
"vai piekrītat?"
-msgstr[1] ""
-"SekojoÅ¡as pakotnes ir jÄnoņem, lai uzlabotu citas:\n"
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
"%s\n"
-"vai piekrītat?"
-msgstr[2] ""
+msgstr ""
"SekojoÅ¡as pakotnes ir jÄnoņem, lai uzlabotu citas:\n"
"%s\n"
"vai piekrītat?"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr "Tiks noņemtas sekojošas pakotnes"
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] "Tiks noņemtas sekojošas pakotnes"
-msgstr[1] "Tiks noņemtas sekojošas pakotnes"
-msgstr[2] "Tiks noņemtas sekojošas pakotnes"
+msgstr "Tiks noņemtas sekojošas pakotnes"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2085,104 +2107,113 @@ msgstr ""
"Jums jÄbÅ«t root, lai instalÄ“tu sekojoÅ¡as atkarÄ«bas:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Nospiediet Enter, kad gatavs..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Atcelt"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "SekojoÅ¡Äm pakotnÄ“m ir slikti paraksti"
-msgstr[1] "SekojoÅ¡Äm pakotnÄ“m ir slikti paraksti"
-msgstr[2] "SekojoÅ¡Äm pakotnÄ“m ir slikti paraksti"
+msgstr "SekojoÅ¡Äm pakotnÄ“m ir slikti paraksti"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "SekojoÅ¡Äm pakotnÄ“m ir slikti paraksti"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "VÄ“laties turpinÄt instalÄ“Å¡anu?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "InstalÄ“Å¡ana neizdevÄs"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "tiek instalēta %s\n"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "tiek instalēta %s\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "tiek instalēta %s\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "InstalÄ“Å¡ana neizdevÄs"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Vai mÄ“Ä£inÄt instalÄ“t bez atkarÄ«bu pÄrbaudes? (j/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Vai mÄ“Ä£inÄt instalÄ“t vÄ“l uzstÄjÄ«gÄk (--force)? (j/N) "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "InstalÄ“Å¡ana neizdevÄs"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "InstalÄ“Å¡ana neizdevÄs"
+msgstr[1] "InstalÄ“Å¡ana neizdevÄs"
+msgstr[2] "InstalÄ“Å¡ana neizdevÄs"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalēšana ir iespējama"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "viss jau ir instalēts"
-msgstr[1] "viss jau ir instalēts"
-msgstr[2] "viss jau ir instalēts"
+msgstr "viss jau ir instalēts"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "viss jau ir instalēts"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "viss jau ir instalēts"
-msgstr[1] "viss jau ir instalēts"
-msgstr[2] "viss jau ir instalēts"
+msgstr "viss jau ir instalēts"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "viss jau ir instalēts"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2288,17 +2319,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, fuzzy, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - runīgais režīms.\n"
@@ -2431,8 +2462,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2490,12 +2524,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"Pielietojums: urpmi.removemedia [-a] <vÄrds> ...\n"
+"Pielietojums: urpmi.removemedia (-a | <vÄrds> ...)\n"
"kur <vÄrds> ir datu nesÄ“js, ko noņemt.\n"
#: ../urpmi.removemedia:41
@@ -2558,26 +2592,33 @@ msgstr ""
#: ../urpmi.update:47
#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" -h - mÄ“Ä£inÄt atrast un lietot synthesis vai hdlist failu.\n"
+
+#: ../urpmi.update:48
+#, fuzzy, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Tikai root drīkst instalēt pakotnes"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"nav ko atjauninÄt (lietojiet urpmi.addmedia, lai pievienotu datu nesÄ“ju)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2586,17 +2627,17 @@ msgstr ""
"atjuninÄjumÄ trÅ«kst kÄda ieraksta\n"
"(viens no %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "noņemu datu nesēju \"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "noņemu datu nesēju \"%s\""
@@ -2693,65 +2734,67 @@ msgstr " --help - izvadīt šo palīdzības ziņojumu.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - drukÄt iezÄ«mi: kopsavilkums."
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
+
#: ../urpmq:88
#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
+
+#: ../urpmq:93
+#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " dota komandrindÄ; bez pakotnes vÄrda)."
-#: ../urpmq:89
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -q - klusais režīms.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - izvadÄ«t sarakstu ar pieejamÄm pakotnÄ“m.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " --list - izvadÄ«t sarakstu ar pieejamÄm pakotnÄ“m.\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -q - klusais režīms.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -v - runīgais režīms.\n"
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -u - noņemt pakotni, ja ir uzinstalÄ“ta jaunÄka versija.\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2759,54 +2802,66 @@ msgid ""
msgstr ""
" -u - noņemt pakotni, ja ir uzinstalÄ“ta jaunÄka versija.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " --list - izvadÄ«t sarakstu ar pieejamÄm pakotnÄ“m.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--synthesis nevar tikt lietots ar --media, --update vai --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
-msgstr[2] ""
+msgstr ""
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Cietņi netika atrasti"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Cietņi netika atrasti"
#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Cietņi netika atrasti"
+
+#, fuzzy
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " --list - izvadÄ«t sarakstu ar pieejamÄm pakotnÄ“m.\n"
+
+#, fuzzy
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -f - forsēt hdlist failu ģenerēšanu.\n"
+
+#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
#~ "installed:\n"
diff --git a/po/mk.po b/po/mk.po
index 08b02a75..b82237f2 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-mk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-07-18 01:58+0200\n"
"Last-Translator: Зоран ДимовÑки <decata@mt.net.mk>\n"
"Language-Team: Macedonian <ossm-members@hedona.on.net.mk>\n"
@@ -19,7 +19,7 @@ msgstr ""
"X-Generator: KBabel 1.10.1\n"
"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM инÑталација"
@@ -29,7 +29,7 @@ msgstr "RPM инÑталација"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Во ред"
@@ -96,7 +96,7 @@ msgstr "_ИнÑталирај"
msgid "_Save"
msgstr "_Зачувај"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Откажи"
@@ -106,29 +106,29 @@ msgstr "_Откажи"
msgid "Choose location to save file"
msgstr "Изберете локација за зачувување на датотека"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"непознати опции '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "нема пакет именуван како %s"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Ве молиме почекајте..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Мора да Ñте root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Предупредување"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Во ред"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (за надоградување)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (за инÑталирање)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Избор на пакети"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Потребен е еден од Ñледниве пакети:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Откажи"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -185,43 +185,49 @@ msgstr ""
"%s\n"
"Да продолжам?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"За да Ñе задоволат завиÑноÑтите, Ñледниов пакет ќе биде инÑталиран (%d MB)"
-msgstr[1] ""
+msgstr ""
"За да Ñе задоволат завиÑноÑтите, Ñледниов пакет ќе биде инÑталиран (%d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"За да Ñе задоволат завиÑноÑтите, ќе Ñе инÑталираат Ñледниве %d пакети:\n"
+"%s\n"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "%d пакети"
+msgstr[1] "%d пакети"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "ИнÑталација на пакетот..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "не можам да ги добија изворните пакети, прекинувам"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ве молиме внеÑете го медиумот именуван како \"%s\" во уредот [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Го преземам пакетот `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -234,7 +240,7 @@ msgstr ""
"\n"
"Дали Ñакате да продолжите Ñо инÑталацијата?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -245,37 +251,37 @@ msgstr ""
"%s\n"
"Можеби Ñакате да ја ажурирате вашата urpmi база на податоци"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "отÑтранувам %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Се подготвувам..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "ИнÑталирам пакет `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Завршено"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ИнÑталацијата не уÑпеа"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Се е веќе инÑталирано"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "ИнÑталирањето заврши"
@@ -324,63 +330,63 @@ msgstr "Само ÑуперкориÑникот има дозвола за инÑ
msgid "Running urpmi in restricted mode..."
msgstr "urpmi Ñе вклучува во затворен режим.."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "не можам да отворам rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "невалидно име на rpm датотеката [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "преземам rpm датотека [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...преземањето заврши"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...преземањето не уÑпеа: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "не можам да приÑтапам до rpm датотеката [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "не можам да пренеÑам \"%s\" во датотека [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "не можам да ја региÑтрирам rpm датотеката"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "грешка при региÑтрирање на локалните пакети"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Оваа акција не е дозволена додека работи во затворен режим"
@@ -400,27 +406,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Треба да Ñте авторизиран за да Ñподелувате директориуми"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: не можам да ја прочитам rpm датотеката \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
@@ -445,7 +451,7 @@ msgstr "не можам да запишам конфигурациона датÐ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "не можам да запишам конфигурациона датотека [%s]"
@@ -453,17 +459,17 @@ msgstr "не можам да запишам конфигурациона датÐ
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Ве молиме внеÑете ги вашите податоци за приÑтапување на прокÑи\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "КориÑничко име:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Лозинка:"
#: ../urpm/download.pm:185
#, c-format
@@ -575,7 +581,7 @@ msgstr "има повеќе паќети Ñо иÑтото име на rpm даÑ
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "не можам правилно да пренеÑам [%s] на вредноÑÑ‚ \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -690,9 +696,9 @@ msgid "No base defined"
msgstr "нема пакет именуван како %s"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Ðе можам да алоцирам запиÑи за мапа на бои"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -714,7 +720,7 @@ msgstr "предупредување: md5sum за %s е недоÑтапен вÐ
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "преÑметувам md5sum на поÑтоечкиот изворен hdlist (или synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -723,111 +729,111 @@ msgstr ""
"виртуалниот медиум \"%s\" не треба да има дефинирано hdlist или лиÑта на "
"датотеки, медиумот е игнориран"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"виртуалниот медиум \"%s\" треба да има празен url, медиумот е игнориран"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "невалидно име на rpm датотеката [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
"не можам да пронајдам лиÑта на датотеки за \"%s\", медиумот е игнориран"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "Ñе обидувам да изберем непоÑтоечки медиум \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "изградена е hdlist synthesis датотека за медиумот \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
"не можам да приÑтапам до hdlist датотека на \"%s\", медиумот е игнориран"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "не можам да ја пренеÑам hdlist датотеката на \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"медиумот \"%s\" Ñе обидува да кориÑти веќе употребен hdlist, медиумот е "
"игнориран"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"медиумот \"%s\" Ñе обидува да кориÑти веќе употребена лиÑта, медиумот е "
"игнориран"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "Ñе обидувам да го заобиколам медиумот \"%s\", избегнувам"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "премногу монтирани точки за отÑтранливиот медиум \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "отÑтранливите уреди Ñе земаат како \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Медиумот \"%s\" е ISO Ñлика, веднаш ќе Ñе монтира"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "употребувам различни отÑтранливи уреди [%s] за \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
"не можам да го преземам името на патеката за отÑтранливиот медиум \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "запиши конфигурациона датотека [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
"Ðе можам да го употребувам паралелниот режим Ñо режимот кориÑти-диÑтрибуција"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "употребувам аÑоцииран медиум за паралелниот режим: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -836,146 +842,146 @@ msgstr ""
"--synthesis не може да Ñе кориÑти Ñо --media, --excludemedia, --sortmedia, --"
"update или --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не кориÑти hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Почеток на барањето: %s крај: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "изведувам втор пат за преÑметување на завиÑноÑтите\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "го преÑкокнувам пакетот %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "пакетот %s ќе Ñе инÑталира намеÑто да Ñе ажурира"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "медиумот \"%s\" веќе поÑтои"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "виртуелниот медиум мора да е локален"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ги читам заглавјата од медиумот \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "го отÑтранувам медиумот \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "не можам да приÑтапам до првиот медиум за инÑталација"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "преземам датотека на hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "не можам да отворам rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"не можам да приÑтапам на првиот медиум за инÑталација (не е пронајдена "
"датотека на hdlist)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Ñе обидувам да изберем непоÑтоечки медиум \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "избирам повеќе медиуми: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "го отÑтранувам медиумот \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "реконфигурирање на urpmi за медиумот \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...реконфигурирањето не уÑпеа"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "реконфигурирањето заврши"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "не е избран медиумот \"%s\""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ја иÑпитувам датотеката hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ја иÑпитувам датотеката synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "градам hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -984,78 +990,78 @@ msgstr ""
"Ðе можам да направам synthesis датотека за медиумот \"%s\". Можеби вашата "
"hdlist е оштетена."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"проблем при читање на датотеката hdlist или synthesis на медиумот \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...копирањето не уÑпеа"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Ñе копира датотеката за Ð¾Ð¿Ð¸Ñ Ð½Ð° \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...копирањето заврши"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "запишувам датотека Ñо лиÑта за медиумот \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирањето на [%s] не уÑпеа (датотеката е премногу мала)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "преÑметувам md5sum на копираниот изворен hdlist (или synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копирањето на [%s] не уÑпеа (md5sum не Ñе Ñовпаѓа)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "преÑметувам md5sum на преземаниот изворен hdlist (или synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...преземањето не уÑпеа: md5sum не Ñе Ñовпаѓа"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "не Ñе пронајдени rpm датотеки од [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читам rpm датотеки од [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "не можам да ги прочитам rpm датотеките од [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "нема rpm датотеки за читање"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1066,78 +1072,78 @@ msgstr ""
"ова може да Ñе Ñлучи ако рачно Ñте го монтирале директориумот при Ñоздавање "
"на медиумот."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "преземам изворен hdlist (или synthesis) на \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "пронајден е пробан hdlist (или synthesis) како %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "не е пронајдена hdlist датотека за медиумот \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "иÑпитувам датотека Ñо јавен клуч од \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...внеÑен клуч %s од датотека Ñо јавен клуч од \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не можам да внеÑам датотека Ñо јавен клуч од \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "запишувам датотека Ñо лиÑта за медиумот \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додаден медиум %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "не можам да ја пренеÑам hdlist датотеката на \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем при читање на датотеката synthesis на медиумот \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "ги читам заглавјата од медиумот \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Dd"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Извинете, лош избор, обидете Ñе повторно\n"
@@ -1173,8 +1179,8 @@ msgid "unmounting %s"
msgstr "одмонтирам %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "не е избран медиумот \"%s\""
#: ../urpm/removable.pm:143
@@ -1192,47 +1198,47 @@ msgstr "нејаÑен медиум \"%s\" означен како отÑтраÐ
msgid "unable to access medium \"%s\""
msgstr "не можам да приÑтапам на медиумот \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ðема пакет именуван како %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следниве пакети Ñодржат %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "поради недоÑтаток на %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "поради незадоволени %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "Ñе обидувам да промовирам %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "за да Ñе задржи %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "за да Ñе инÑталира %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "поради конфликти Ñо %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "непобарано"
@@ -1381,25 +1387,36 @@ msgstr "Ðема за отÑтранување"
msgid "Checking to remove the following packages"
msgstr "Проверка за отÑтранување на Ñледниве пакети"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"За да Ñе задоволат завиÑноÑтите, Ñледниве %d пакети ќе бидат отÑтранети (%d "
+"MB)"
+msgstr[1] ""
"За да Ñе задоволат завиÑноÑтите, Ñледниве %d пакети ќе бидат отÑтранети (%d "
"MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "го отÑтранувам пакетот %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "го отÑтранувам пакетот %s"
+msgstr[1] "го отÑтранувам пакетот %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "ОтÑтранувањето не уÑпеа"
@@ -1666,7 +1683,7 @@ msgstr " --verbose - опширен режим.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - лиÑта на датотеките во пакетот.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1677,12 +1694,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "употребувам одредена околина на %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1691,7 +1708,7 @@ msgstr ""
"Забелешка: бидејќи ниеден пребаран медиум не кориÑти hdlist, urpmf не можеше "
"да врати било каков резултат\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Можеби Ñакате да употребите --name за да барате имиња на пакети.\n"
@@ -1999,7 +2016,7 @@ msgstr " --noclean - не ги бриши rpm пакетите од кеш
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - надградува Ñамо пакети Ñо иÑта архитектура.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - избери ги Ñите Ñовпаѓања на командната линија.\n"
@@ -2073,65 +2090,68 @@ msgstr ""
"Грешка: %s изгледа дека е монтиран Ñамо за читање.\n"
"КориÑтете --allow-force за да принудете операцијата."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (за надоградување)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (за надоградување)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (за инÑталирање)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (за инÑталирање)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Кој е вашиот избор? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Следниве пакети не може да Ñе инÑталираат бидејќи завиÑат од пакети\n"
"кои Ñе поÑтари од инÑталираните:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"Следниве пакети не може да Ñе инÑталираат бидејќи завиÑат од пакети\n"
"кои Ñе поÑтари од инÑталираните:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Продолжуваме?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (D/n) "
@@ -2141,56 +2161,65 @@ msgstr " (D/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Ðекои од бараните пакети не можат да Ñе инÑталираат:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Ðекои од бараните пакети не можат да Ñе инÑталираат:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"ИнÑталацијата не може да продолжи бидејќи Ñледниве пакети\n"
"треба да Ñе отÑтранат за да други Ñе надоградат:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"ИнÑталацијата не може да продолжи бидејќи Ñледниве пакети\n"
"треба да Ñе отÑтранат за да други Ñе надоградат:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Следниве пакети треба да Ñе отÑтранат за да други Ñе надоградат:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Следниве пакети треба да Ñе отÑтранат за да други Ñе надоградат:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2199,100 +2228,111 @@ msgstr ""
"Треба да Ñе root за да ги инÑталирате Ñледниве завиÑноÑти:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "ПритиÑнете Ентер кога Ñте подготвени..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Откажи"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Следниве пакети имаат лоши потпиÑи"
-msgstr[1] "Следниве пакети имаат лоши потпиÑи"
+msgstr "Следниве пакети имаат лоши потпиÑи"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Следниве пакети имаат лоши потпиÑи"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Дали Ñакате да продолжите Ñо инÑталацијата ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ИнÑталацијата не уÑпеа"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "диÑтрибуирам %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "инÑталирање на %s од %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "инÑталирам %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ИнÑталацијата не уÑпеа"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Обидете Ñе Ñо инÑталација без проверка на завиÑноÑти? (y/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Обидете Ñе инÑталација дури уште поÑилно (--force)? (y/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d неуÑпешни транÑакциии на инÑталацијата"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d неуÑпешни транÑакциии на инÑталацијата"
+msgstr[1] "%d неуÑпешни транÑакциии на инÑталацијата"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Возможна е инÑталација"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Се е веќе инÑталирано"
-msgstr[1] "Се е веќе инÑталирано"
+msgstr "Се е веќе инÑталирано"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Се е веќе инÑталирано"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Се е веќе инÑталирано"
-msgstr[1] "Се е веќе инÑталирано"
+msgstr "Се е веќе инÑталирано"
+
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Се е веќе инÑталирано"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "реÑтартирам urpmi"
@@ -2403,17 +2443,17 @@ msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
" --raw - додава медиум во конфигурацијата, но не го ажурира.\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - иÑчиÑти го кеш директориумот за заглавја.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - тивок режим.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - опширен режим.\n"
@@ -2546,8 +2586,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2605,12 +2647,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"употреба: urpmi.removemedia [-a] <name> ...\n"
+"употреба: urpmi.removemedia (-a | <name> ...)\n"
"каде <name> е името на медиумот кој треба да Ñе отÑтрани.\n"
#: ../urpmi.removemedia:41
@@ -2675,26 +2717,34 @@ msgstr ""
" --no-ignore - не надоградувај, означи го медиумот како овозможен.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - не Ñе обидува да пронајде било каква synthesis или\n"
+" hdlist датотека.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - избери ги Ñите неотÑтранливи медиуми.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - принуди генерирање на hdlist датотеки.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Само на ÑуперкориÑникот му е дозволено да ажурира медиуми"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "нема за ажурирање (кориÑтете urpmi.addmedia за додавање на медиум)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2703,17 +2753,17 @@ msgstr ""
"недоÑтаÑува внеÑот за ажурирање\n"
"(еден од %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "игнорирање на медиумот %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "овозможување на медиумот %s"
@@ -2818,69 +2868,73 @@ msgstr " --changelog - иÑпишува измени во евиденциј
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - иÑпишува резиме.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+" --whatrequires - обратно барање на она што му е потребно на пакетот.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - продолжено обратно барање (вклучува и виртуелни "
+"пакет).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - барај за наоѓање на пакет.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - комплетна излезна лиÑта Ñо пакетот кој треба да Ñе "
"отÑтрани.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - продолжено чекање на завиÑноÑтите на пакетот.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - иÑпишува групу заедно Ñо имињата.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - иÑпишува кориÑни информации читлива за луѓе.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - лиÑта на датотеките во пакетот.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - не барај за пронаоѓање на пакет (Ñтандардно).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - барај за наоѓање на пакет.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - тивок режим.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - иÑпишува верзија и објавување заедно Ñо името.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-" -R - обратно барање на она што му е потребно на пакетот.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - продолжено обратно барање (вклучува и виртуелни пакет).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - наредниот пакет е изворен пакет (иÑто како --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2888,112 +2942,88 @@ msgid ""
msgstr ""
" -u - отÑтрани пакет ако веќе е инÑталирана понова верзија.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - принудива барање на обележани пакети (иÑто како --"
"fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - како -y, но принудува Ñовпаѓање на различноÑта на "
"буквите.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " потребни Ñе имиња или rpm датотеки дадени на командната линија.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може да Ñе употребува Ñамо Ñо --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Забелешка: бидејќи ниеден пребаран медиум не кориÑти hdlist, urpmf не можеше "
+"да врати било каков резултат\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ðема пронајдени лиÑти на датотеки\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Забелешка: бидејќи ниеден пребаран медиум не кориÑти hdlist, urpmf не можеше "
+"да врати било каков резултат\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ðе е пронајдена измена на евиденцијата\n"
-#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Ðема пронајдени лиÑти на датотеки\n"
+
#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "За да Ñе задоволат завиÑноÑтите, Ñледниов пакет ќе биде инÑталиран (%d MB)"
-#~ msgstr[1] ""
-#~ "За да Ñе задоволат завиÑноÑтите, Ñледниов пакет ќе биде инÑталиран (%d MB)"
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P - не барај за пронаоѓање на пакет (Ñтандардно).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - обратно барање на она што му е потребно на пакетот.\n"
#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
+#~ " -RR - extended reverse search (includes virtual packages).\n"
#~ msgstr ""
-#~ "За да Ñе задоволат завиÑноÑтите, ќе Ñе инÑталираат Ñледниве %d пакети:\n"
-#~ "%s\n"
+#~ " -RR - продолжено обратно барање (вклучува и виртуелни "
+#~ "пакет).\n"
-#, fuzzy
#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "За да Ñе задоволат завиÑноÑтите, ќе Ñе инÑталираат Ñледниве %d пакети:\n"
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
#~ "%s\n"
-#~ msgstr[1] ""
+#~ msgstr ""
#~ "За да Ñе задоволат завиÑноÑтите, ќе Ñе инÑталираат Ñледниве %d пакети:\n"
#~ "%s\n"
#~ msgid "skipping media %s: no hdlist"
#~ msgstr "преÑкокнувам медиум %s: нема hdlist"
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "ИнÑталацијата не уÑпеа"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "ИнÑталирам пакет `%s' (%s/%s)..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "ја иÑпитувам датотеката synthesis [%s]"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "диÑтрибуирам %s"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "ИнÑталација на пакетот..."
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "ИнÑталација на пакетот..."
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr ""
#~ " --probe-synthesis - Ñе обидува да пронајде и кориÑти synthesis "
diff --git a/po/mn.po b/po/mn.po
index 148efa51..9fdd96c5 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2003-08-22 19:38+0200\n"
"Last-Translator: Khurelbaatar Lkhagvasuren <hujii247@yahoo.com>\n"
"Language-Team: Mongolian <openmn-core@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
"X-Generator: KBabel 1.0.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Суулгалтын бÑлтгÑл"
@@ -28,7 +28,7 @@ msgstr "Суулгалтын бÑлтгÑл"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -76,7 +76,7 @@ msgstr "_Суулгах"
msgid "_Save"
msgstr "_Хадгалах"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Хүчингүй"
@@ -86,29 +86,29 @@ msgstr "_Хүчингүй"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"үл мÑдÑгдÑÑ… Ñонголтууд '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ТухайлÑан тушаал алга"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, fuzzy, c-format
msgid "Please wait..."
msgstr "ХүлÑÑÐ½Ñ Ò¯Ò¯."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr ""
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -116,42 +116,42 @@ msgid ""
"Continue installation anyway?"
msgstr "г Ñ Ð²Ñ‹?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Ðнхааруулга"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ок"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr ""
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Ñмх"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Дараах багцуудын нÑг нь шаардлагатай:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, fuzzy, c-format
msgid "_Abort"
msgstr "ТаÑлах"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -159,41 +159,46 @@ msgid ""
"Continue installation anyway?"
msgstr "г Ñ Ð²Ñ‹?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Дараах багцууд Ñуулгагдах гÑж байна"
-msgstr[1] "Дараах багцууд Ñуулгагдах гÑж байна"
+msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "Тааруухан багц"
+msgstr[1] "Тааруухан багц"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Багц Ñуулгалт..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, fuzzy, c-format
msgid "unable to get source packages, aborting"
msgstr "%s багцийг уÑтгаж болÑонгүй"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, fuzzy, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ñ Ñ"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' багцыг татан авч байна..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -202,7 +207,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -213,37 +218,37 @@ msgstr ""
"%s\n"
"Та магадгүй urpmi баазаа шинÑчлÑÑ… Ñ…ÑÑ€ÑгтÑй байх"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "%s-г уÑтгаж байна"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "БÑлдÑж байна..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) багцийг Ñуулгаж байна..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "БиелÑгдÑв"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, fuzzy, c-format
-msgid "Installation failed"
+msgid "Installation failed:"
msgstr "Суулгалтын аÑуудал"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, fuzzy, c-format
msgid "Installation finished"
msgstr "Суулгалт боломжтой"
@@ -290,63 +295,63 @@ msgstr "%s багцийг Ñуулгаж болÑонгүй"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb-г нÑÑж болÑонгүй"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "буруу rpm файлын нÑÑ€ [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm файлыг хүлÑÑн авч байна [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...хүлÑÑн авалт дууÑлаа"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...хүлÑÑн авалт бүтÑлгүйтлÑÑ: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "rpm файлыг бүртгÑж болÑонгүй"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, fuzzy, c-format
msgid "error registering local packages"
msgstr "локал"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -366,27 +371,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Та хавтаÑнуудыг буÑдад түгÑÑхийн тулд шалгагдÑан байх Ñ…ÑÑ€ÑгтÑй"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm файлыг уншиж чадахгүй \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, fuzzy, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Ñ"
@@ -411,7 +416,7 @@ msgstr "[%s] тохируулгын файлыг бичиж болÑонгүй"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "[%s] тохируулгын файлыг бичиж болÑонгүй"
@@ -429,7 +434,7 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Ðууц үг:"
#: ../urpm/download.pm:185
#, c-format
@@ -541,7 +546,7 @@ msgstr "Ñнд \"%s\" гÑÑÑн ижил rpm файл нÑртÑй олон бÐ
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "Ñ Ñ"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, fuzzy, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
@@ -653,7 +658,7 @@ msgstr "ТухайлÑан тушаал алга"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -676,328 +681,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "ааÑ"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "Ñ"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "Ñ Ð¶Ð¸Ð³Ñаалт"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "буруу rpm файлын нÑÑ€ [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, fuzzy, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "жигÑаалт Ñ"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "Ñ"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "Ñ"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, fuzzy, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "[%s] тохируулгын файлыг бичиж болÑонгүй"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "Ñ"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, fuzzy, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "Ñ Ð¶Ð¸Ð³Ñаалт"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "Ñ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, fuzzy, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "ЦÑг Ñ"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, fuzzy, c-format
msgid "taking removable device as \"%s\""
msgstr "Ñ"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, fuzzy, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "Ñ Ñ"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, fuzzy, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "Ñ"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, fuzzy, c-format
msgid "wrote config file [%s]"
msgstr "[%s] тохируулгын файлыг бичиж болÑонгүй"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, fuzzy, c-format
msgid "using associated media for parallel mode: %s"
msgstr "горим"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "СуулгагдÑан бичгийн Ñ…Ñвүүдийг хайх"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, fuzzy, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Ñекунд"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s багцийг алгаÑаж байна"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s багцийг уÑтгаж болÑонгүй"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, fuzzy, c-format
msgid "medium \"%s\" already exists"
msgstr "Ñ"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "Ñ Ð¶Ð¸Ð³Ñаалт"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Ñ"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "%s багцийг уÑтгалт"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists файлыг хүлÑÑн авч байна..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb-г нÑÑж болÑонгүй"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "үгүй"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Ñ"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, fuzzy, c-format
msgid "selecting multiple media: %s"
msgstr "Ñ"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, fuzzy, c-format
msgid "removing medium \"%s\""
msgstr "%s багцийг уÑтгалт"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Ñ."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "ЦÑÑний тохируулга хадгалагдÑан"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Серверийн тохируулга"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Ñ Ð±Ð¾Ð»"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, fuzzy, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist [%s]-ийг байгуулж байна"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, fuzzy, c-format
msgid "examining synthesis file [%s]"
msgstr "MD5SUM файлыг шалгаж байна"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s]-ийг байгуулж байна"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "Ð°Ð°Ñ Ñ"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...хуулалт бүтÑлгүйтÑв"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, fuzzy, c-format
msgid "copying description file of \"%s\"..."
msgstr "Тодорхойлолт Ð°Ð°Ñ Ñ."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...хуулждууÑлаа"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "жигÑаалт Ñ"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Ð°Ð°Ñ Ñ"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "ааÑ"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Ð°Ð°Ñ Ñ"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "ааÑ"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...хүлÑÑн авалт бүтÑлгүйтлÑÑ: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s]-ÑÑÑ Ñмар нÑг rpm олдÑонгүй"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, fuzzy, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s]-ÑÑÑ Ñмар нÑг rpm олдÑонгүй"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, fuzzy, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1005,78 +1010,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "[%s]-ÑÑÑ Ñмар нÑг rpm олдÑонгүй"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, fuzzy, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "hdlists файлыг хүлÑÑн авч байна..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "Ð°Ð°Ñ Ñ."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, fuzzy, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "[%s]-ÑÑÑ Ñмар нÑг rpm олдÑонгүй"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" Ñ…ÑвлÑгчийн уÑтгаж байна..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "%s файлыг нÑÑж болохгүй байна\n"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "%s файлыг нÑÑж болохгүй байна\n"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, fuzzy, c-format
msgid "writing list file for medium \"%s\""
msgstr "жигÑаалт Ñ"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s файлыг нÑÑж болохгүй байна\n"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, fuzzy, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "[%s] тохируулгын файлыг бичиж болÑонгүй"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, fuzzy, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Ð°Ð°Ñ Ñ"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, fuzzy, c-format
msgid "reading headers from medium \"%s\""
msgstr "Ñ"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnÒ¯Ò®"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyтТ"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "ХарамÑалтай нь буруу Ñонголт байна, дахин ородоно уу!\n"
@@ -1113,7 +1118,7 @@ msgstr "%s-ийг Ñалгаж байна"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, fuzzy, c-format
-msgid "medium \"%s\" is not selected"
+msgid "medium \"%s\" is not available"
msgstr "Ñ Ð±Ð¾Ð»"
#: ../urpm/removable.pm:143
@@ -1131,47 +1136,47 @@ msgstr "Ñ"
msgid "unable to access medium \"%s\""
msgstr "[%s] rpm файл руу хандаж болÑонгүй"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s нÑртÑй багц байхгүй байна"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Дараах багцууд %s: %s-ийг агуулж байна"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Юу ч үгүй"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Ñмх"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "%s багцийг Ñуулгаж болÑонгүй"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr ""
@@ -1313,23 +1318,32 @@ msgstr "Юу ч үгүй"
msgid "Checking to remove the following packages"
msgstr "Дараах багцуудыг уÑтгахаар шалгаж байна"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "тийш МБ"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "тийш МБ"
+msgstr[1] "тийш МБ"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "%s багцийг уÑтгалт"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%s багцийг уÑтгалт"
+msgstr[1] "%s багцийг уÑтгалт"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "Хуулалт бүтÑлгүйтÑв"
@@ -1580,7 +1594,7 @@ msgstr "Ðарийвчилан харах бол Esc товч дарна уу"
msgid " -m - the media in which the package was found\n"
msgstr " --list - боломжтой багцуудын жагÑаалт.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, fuzzy, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr "нÑÑ€"
@@ -1590,19 +1604,19 @@ msgstr "нÑÑ€"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "Ñ"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1878,7 +1892,7 @@ msgstr "Ñмх"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, fuzzy, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
@@ -1944,59 +1958,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr ""
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr ""
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Ñмх"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Ñмх"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Таны Ñонголт юу бÑ? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Ямар ч байÑан үргÑлжлүүлÑÑ… Ò¯Ò¯?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -2006,142 +2023,162 @@ msgstr " (Y/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-msgstr[1] "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
+msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr "г Ñ Ð²Ñ‹?"
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] "г Ñ Ð²Ñ‹?"
-msgstr[1] "г Ñ Ð²Ñ‹?"
+msgstr "г Ñ Ð²Ñ‹?"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
+msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[0] "Дараах багцууд Ñуулгагдах гÑж байна"
-msgstr[1] "Дараах багцууд Ñуулгагдах гÑж байна"
+msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, fuzzy, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
"%s\n"
msgstr "Та г Ñ"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "БÑлÑн болонгуут Enter товчоо дарна уу..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Хүчингүй"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Дараах багцууд Ñуулгагдах гÑж байна"
-msgstr[1] "Дараах багцууд Ñуулгагдах гÑж байна"
+msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
-#: ../urpmi:668
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr "Дараах багцууд Ñуулгагдах гÑж байна"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Та Ñуулгалтыг үргÑлжлүүлÑхийг Ñ…Ò¯ÑÑж байна уу?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, fuzzy, c-format
+msgid "Installation failed"
+msgstr "Суулгалтын аÑуудал"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "%s-ийг Ñуулгаж байна\n"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s-ийг Ñуулгаж байна\n"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "%s-ийг Ñуулгаж байна\n"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Суулгалтын аÑуудал"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Хамаарлыг шалгахгүйгÑÑÑ€ Ñуулгахыг оролдох уу? (y/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Reyna Ñ‚ N "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Суулгалт боломжтой"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Суулгалт боломжтой"
+msgstr[1] "Суулгалт боломжтой"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Суулгалт боломжтой"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-msgstr[1] "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
+msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-msgstr[1] "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
+msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Бүх зүйл Ñ…Ñдийн ÑууÑан байна"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2233,17 +2270,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, fuzzy, c-format
msgid " -q - quiet mode.\n"
msgstr " --all - бүх тагуудыг Ñ…ÑвлÑÑ….\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - Ðжилуулах горим.\n"
@@ -2379,8 +2416,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2500,42 +2539,48 @@ msgstr ""
#: ../urpmi.update:47
#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr "үгүй\n"
+
+#: ../urpmi.update:48
+#, fuzzy, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-#: ../urpmi.update:49
+#: ../urpmi.update:50
#, fuzzy, c-format
-msgid " -f - force generation of hdlist files.\n"
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "бол"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, fuzzy, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "юу ч үгүй"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, fuzzy, c-format
msgid ""
"the entry to update is missing\n"
"(one of %s)\n"
msgstr "бол г Ð°Ð°Ñ Ñ"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Ñ"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "Ñ"
@@ -2633,117 +2678,133 @@ msgstr " --all - бүх тагуудыг Ñ…ÑвлÑÑ….\n"
msgid " --summary, -S - print summary.\n"
msgstr " --all - бүх тагуудыг Ñ…ÑвлÑÑ….\n"
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
+
#: ../urpmq:88
#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr "Ñмх"
+
+#: ../urpmq:93
+#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, fuzzy, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " --all - бүх тагуудыг Ñ…ÑвлÑÑ….\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - Ñ…ÑÑ€ÑгтÑй мÑдÑÑллийг хүн уншиж болохоор Ñ…ÑлбÑÑ€ÑÑÑ€ Ñ…ÑвлÑÑ….\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - боломжтой багцуудын жагÑаалт.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr "Ñмх"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr "Ñмх"
+msgid " -m - equivalent to -du\n"
+msgstr " --all - бүх тагуудыг Ñ…ÑвлÑÑ….\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " --all - бүх тагуудыг Ñ…ÑвлÑÑ….\n"
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, fuzzy, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr "Ñ Ð±Ð¾Ð»"
-#: ../urpmq:100
+#: ../urpmq:102
#, fuzzy, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr "бол"
-#: ../urpmq:101
+#: ../urpmq:103
#, fuzzy, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr "Ñ‚"
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr "ÐÑÑÑ…"
-#: ../urpmq:103
+#: ../urpmq:105
#, fuzzy, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "ÐÑÑÑ…"
-#: ../urpmq:178
+#: ../urpmq:180
#, fuzzy, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "жигÑаалт"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Зураг олдÑонгүй"
+#: ../urpmq:366
+#, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Зураг олдÑонгүй"
#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Зураг олдÑонгүй"
+
+#, fuzzy
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr "Ñмх"
+
+#, fuzzy
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -c - түр Ñанах ойн хавтаÑын толгойг цÑвÑрлÑÑ….\n"
+
+#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
#~ msgid_plural ""
diff --git a/po/ms.po b/po/ms.po
index 842a1108..ec34b6f3 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-11-26 15:30+0800\n"
"Last-Translator: Sharuzzaman Ahmat Raslan <sharuzzaman@myrealbox.com>\n"
"Language-Team: Malay <translation-team-ms@lists.sourceforge.net>\n"
@@ -18,7 +18,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "Pemasangan RPM"
@@ -28,7 +28,7 @@ msgstr "Pemasangan RPM"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -81,7 +81,7 @@ msgstr "_Pasang"
msgid "_Save"
msgstr "_Simpan"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Batal"
@@ -91,27 +91,27 @@ msgstr "_Batal"
msgid "Choose location to save file"
msgstr "Pilih lokasi untuk menyimpan fail"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Pilihan tidak diketahui %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Tiada pakej dinyatakan"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Sila tunggu..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Mesti menjadi root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -119,42 +119,42 @@ msgid ""
"Continue installation anyway?"
msgstr "semua telah diinstal"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Amaran"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (untuk naiktaraf)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (untuk memasang)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Pilihan pakej"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Salah satu pakej berikut diperlukan:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Batal"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -165,43 +165,48 @@ msgstr ""
"%s\n"
"Teruskan?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
-msgstr[1] ""
-"Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
+msgstr ""
+"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
+"%s\n"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
+msgstr[1] ""
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Pemasangan pakej..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "tidak dapat mengambil pakej asal, batal"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Masukkan media \"%s\" ke peranti [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Memuatturun pakej `%s'..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -214,7 +219,7 @@ msgstr ""
"\n"
"Adakah anda hendak meneruskan pemasangan ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -222,37 +227,37 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "membuang %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Menyediakan..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Install pakej `%s' (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Selesai"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalasi gagal"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "semua telah diinstal"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Pemasangan selesai"
@@ -300,63 +305,63 @@ msgstr "Hanya superuser yang boleh menginstal pakej"
msgid "Running urpmi in restricted mode..."
msgstr "Melaksanakan urpmi dalam mod terhad..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "tidak dapat membuka rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mengambil fail rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...capaian selesai"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...gagal terambil: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "gagal akses fail rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "tidak dapat menghurai \"%s\" dalam fail [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "tidak dapat mendaftarkan fail rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "ralat pendaftaran pakej setempat"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -376,27 +381,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Anda harus jadi root utk menggunakan --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: tidak dapat membaca fail rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
@@ -421,7 +426,7 @@ msgstr "gagal tulis fail konfigurasi [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "gagal tulis fail konfigurasi [%s]"
@@ -434,12 +439,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Nama pengguna:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Katalaluan:"
#: ../urpm/download.pm:185
#, c-format
@@ -551,7 +556,7 @@ msgstr "banyak pakej dgn nama fail rpm sama \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "tidak dapat menhurai dengan betul [%s] pada nilai \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "gagal mengakses fail list \"%s\", media diabaikan"
@@ -661,7 +666,7 @@ msgstr "Tiada pakej dinyatakan"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -684,7 +689,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -693,323 +698,323 @@ msgstr ""
"medium virtual \"%s\" tidak sepatutnya mentakrifkan hdlist atau fail "
"senarai, media diabaikan"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "medium maya \"%s\" perlu mempunyai url yang jelas, medium diabaikan"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nama fail rpm [%s] tidak sah"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "gagal cari fail daftar \"%s\", media diabaikan"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "cubaan untuk memilih media tidak wujud \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "gagal mengakses fail hdlist \"%s\", media diabaikan"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "gagal mengolah fail hdlist \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"medium \"%s\" cuba menggunakan hdlist yang telah digunakan, medium diabaikan"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"medium \"%s\" cuba menggunakan senarai yang telah digunakan, medium diabaikan"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "mencuba untuk mengatasi media sedia ada \"%s\", melangkau"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "terlalu banyak titik sambung utk media removable \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "ambil peranti removable sbg \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "pakai removable peranti lain [%s] untuk \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "tidak dapat mengambil nama path utk media removable \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "tulis fail konfigurasi [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Carian mula: %s tamat: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "melangkau pakej %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "tidak dapat membuang pakej %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" telah ada"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "media virtual perlu menjadi tempatan"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "membaca pengepala dari media \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "hapus media \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "gagal mengakses media instalasi pertama"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "ambil fail hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "tidak dapat membuka rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "gagal mengakses media instalasi pertama (fail hdlists tidak dijumpai)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "cubaan untuk memilih media tidak wujud \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "memilih pelbagai media: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "hapus media \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "mengulangtetap urpmi untuk media \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...gagal mengulangtetap"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "selesai ulangtetap"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "media \"%s\" tidak dipilih"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "periksa baca fail hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "periksa file sintesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "bangun hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "bangunkan fail sintesis hdlist utk media \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...gagal menyalin"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "fail deskripsi \"%s\" sedang disalin"
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...salin selesai"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "menulis senarai fail untuk media \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "salinan [%s] gagal (md5sum tidak sepadan)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "mengira md5sum salinan sumber hdlist (atau sintesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...gagal terambil: md5sum tidak sepadan"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "tiada fail rpm dijumpai dari [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "membaca fail rpm dari [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "tidak dapat membaca fail rpm dari [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "tiada rpms dibaca"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1017,78 +1022,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "mencapai hdlist sumber (atau sintesis) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "menjumpai hdlist dikesan (atau sintesis) seperti %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "memeriksa fail pubkey \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "tidak dapat mengimport fail pubkey \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "tidak dapat mengimport fail pubkey \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "menulis senarai fail untuk media \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "media %s ditambahkan"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "gagal mengolah fail hdlist \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "masalah membaca fail sintesis untuk media \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "membaca pengepala dari media \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnTt"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Salah pilih, cuba lagi\n"
@@ -1124,8 +1129,8 @@ msgid "unmounting %s"
msgstr "unmount %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "media \"%s\" tidak dipilih"
#: ../urpm/removable.pm:143
@@ -1143,47 +1148,47 @@ msgstr "media ketidaksinambungan \"%s\" bertanda removable, seharusnya tidak"
msgid "unable to access medium \"%s\""
msgstr "gagal akses media \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Tiada pakej bernama %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakej berikut mengandungi %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "kerana kehilangan %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "kerana ketidakpuasan %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "cuba untuk menaikkan %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "untuk menyimpan %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "untuk memasang %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "kerana konflik dengan %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr ""
@@ -1324,25 +1329,36 @@ msgstr "Tiada untuk dibuang"
msgid "Checking to remove the following packages"
msgstr "Memeriksa untuk membuang pakej berikut"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
+"%s\n"
+msgstr[1] ""
"Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
"%s\n"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "membuang pakej %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "membuang pakej %s"
+msgstr[1] "membuang pakej %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/T) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Pembuangan gagal"
@@ -1590,7 +1606,7 @@ msgstr "Vendor:"
msgid " -m - the media in which the package was found\n"
msgstr "Cache Fail Pakej Jauh"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
@@ -1600,19 +1616,19 @@ msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, fuzzy, c-format
msgid "using specific environment on %s\n"
msgstr "Buat partisyen pada pemacu spesifik (ondisk)"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1879,7 +1895,7 @@ msgstr " --noclean - jaga rpm tidak dipakai dalam kache.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
@@ -1945,59 +1961,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (untuk naiktaraf)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (untuk naiktaraf)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (untuk memasang)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (untuk memasang)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Pilihan Anda? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "%s %s pemasangan pada hos %s"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Y/t) "
@@ -2007,54 +2026,63 @@ msgstr " (Y/t) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
+msgstr "semua telah diinstal"
+
+#: ../urpmi:504
+#, fuzzy, c-format
+msgid ""
"Some requested packages cannot be installed:\n"
"%s"
-msgstr[0] "semua telah diinstal"
-msgstr[1] "semua telah diinstal"
+msgstr "semua telah diinstal"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
"%s\n"
"Teruskan?"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, fuzzy, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
"%s\n"
"Teruskan?"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
"%s\n"
"Teruskan?"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, fuzzy, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Pakej berikut perlu dibuang untuk yang lain dinaiktaraf:\n"
"%s\n"
"Teruskan?"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2063,108 +2091,119 @@ msgstr ""
"Anda perlu menjadi root utk install kebergantungan berikutnya:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, fuzzy, c-format
msgid "Press Enter when ready..."
msgstr ""
"Tekan <Enter> untuk mengulangbut sistem anda.\n"
"\n"
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Batal"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] ""
+msgstr ""
"mengambil\n"
" pakej berikut berjaya:\n"
"\n"
-msgstr[1] ""
+
+#: ../urpmi:672
+#, fuzzy, c-format
+msgid "The following packages have bad signatures"
+msgstr ""
"mengambil\n"
" pakej berikut berjaya:\n"
"\n"
-#: ../urpmi:668
+#: ../urpmi:673
#, fuzzy, c-format
msgid "Do you want to continue installation ?"
msgstr "Apa yang anda ingin lakukan sekarang?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalasi gagal"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "Mulakan %s:"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Tapisan From:"
-#: ../urpmi:731
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "Memasang %s-%s-%s... "
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalasi gagal"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Cuba instalasi tanpa periksa kebergantungan? (y/T) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Cuba instalasi lebih keras (--force)? (y/T) "
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Gagal menerima %s: %s"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Gagal menerima %s: %s"
+msgstr[1] "Gagal menerima %s: %s"
-#: ../urpmi:828
+#: ../urpmi:825
#, fuzzy, c-format
msgid "Installation is possible"
msgstr "Pemasangan sekecil mungkin"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "semua telah diinstal"
-msgstr[1] "semua telah diinstal"
+msgstr "semua telah diinstal"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "semua telah diinstal"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "semua telah diinstal"
-msgstr[1] "semua telah diinstal"
+msgstr "semua telah diinstal"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "semua telah diinstal"
+
+#: ../urpmi:862
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "Mengulanghidup $prog:"
@@ -2263,17 +2302,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - bersihkan direktori kache header.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - mod diam.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - mod verbos.\n"
@@ -2406,8 +2445,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2465,12 +2506,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"penggunan: urpmi.removemedia [-a] <nama> ...\n"
+"penggunan: urpmi.removemedia (-a | <nama> ...)\n"
"<nama> adalah nama media yg akan dihapus.\n"
#: ../urpmi.removemedia:41
@@ -2533,26 +2574,32 @@ msgstr ""
#: ../urpmi.update:47
#, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
+#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - pilih semua media non-removable.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - paksa buat fail hdlist.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, fuzzy, c-format
msgid "Only superuser is allowed to update media"
msgstr "Hanya superuser yang boleh menginstal pakej"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
"tiada apa-apa yang perlu dikemaskini (guna urpmi.addmedia utk tambah media)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2561,17 +2608,17 @@ msgstr ""
"masukan kemaskini hilang\n"
"(satu dari %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Pemeriksaan Media"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "Pemeriksaan Media"
@@ -2669,65 +2716,67 @@ msgstr "Pengurus Pencetak"
msgid " --summary, -S - print summary.\n"
msgstr "Pengurus Pencetak"
+#: ../urpmq:87
+#, fuzzy, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
+
#: ../urpmq:88
#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
+
+#: ../urpmq:93
+#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -d - tambah pencarian ke kebergantungan pakej.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - tambah pencarian ke kebergantungan pakej.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, fuzzy, c-format
msgid " -g - print groups with name also.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -f - paksa buat fail hdlist.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr "Up2date - Senarai Pakej (pendaftaran)"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - jangan cari dalam tersedia utk mencari pakej.\n"
-
-#: ../urpmq:95
+#: ../urpmq:99
#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
+msgid " -m - equivalent to -du\n"
+msgstr " -q - mod diam.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, fuzzy, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -f - cetak versi, keluaran dan arch dgn nama.\n"
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -p - izinkan carian dlm sediaada utk mencari pakej.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - pakej berikut adalah pakej sumber (sama dgn --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, fuzzy, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2735,60 +2784,60 @@ msgid ""
msgstr ""
" -s - pakej berikut adalah pakej sumber (sama dgn --src).\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - lakukan pencarian fuzzy (sama dengan --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - pilih semua yg sama dgn baris perintah.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " dicarikan nama atau fail rpm yg tertera pada baris perintah.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "Tiada senarai fail dijumpai\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Tiada log perubahan dijumpai\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
-#~ msgstr[1] ""
-#~ "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
+#~ msgid "No filelist found\n"
+#~ msgstr "Tiada senarai fail dijumpai\n"
+
+#~ msgid "medium \"%s\" is not selected"
+#~ msgstr "media \"%s\" tidak dipilih"
+
+#~ msgid " -f - force generation of hdlist files.\n"
+#~ msgstr " -f - paksa buat fail hdlist.\n"
#~ msgid ""
#~ "To satisfy dependencies, the following %d packages are going to be "
@@ -2798,68 +2847,9 @@ msgstr "Tiada log perubahan dijumpai\n"
#~ "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
#~ "%s\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
-#~ "%s\n"
-#~ msgstr[1] ""
-#~ "Untuk memenuhi kebergantungan, %d pakej berikut perlu dipasang:\n"
-#~ "%s\n"
-
-#, fuzzy
-#~ msgid "skipping media %s: no hdlist"
-#~ msgstr "fail hdlist utk media \"%s\" tak dijumpai"
-
#~ msgid "on node %s"
#~ msgstr "pada nod %s"
-#, fuzzy
-#~ msgid "Propagating synthesis to nodes..."
-#~ msgstr "Path relatif ke sintesis/hdlist:"
-
-#, fuzzy
-#~ msgid "Distributing files to nodes..."
-#~ msgstr "Fail dalam proses: %d"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Instalasi gagal"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr ""
-#~ "memasang\n"
-#~ " pakej berikut berjaya:\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "scp failed on host %s (%d)"
-#~ msgstr "Hos maya default pada port %s"
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "Path relatif ke sintesis/hdlist:"
-
-#, fuzzy
-#~ msgid "Resolving dependencies on %s..."
-#~ msgstr "%s %s pemasangan pada hos %s"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "Fail dalam proses: %d"
-
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Pasang pada Sistem"
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Pasang pada Sistem"
-
#~ msgid ""
#~ "\n"
#~ "unknown options '%s'\n"
@@ -2897,10 +2887,6 @@ msgstr "Tiada log perubahan dijumpai\n"
#~ msgid "removing %d obsolete headers in cache"
#~ msgstr "hapus %d header usang dlm kache"
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Pakej berikut mengandungi %s: %s"
-
#~ msgid "copying hdlists file..."
#~ msgstr "sedang menyalin fail hdlist..."
@@ -2920,10 +2906,3 @@ msgstr "Tiada log perubahan dijumpai\n"
#~ " --headers - keluarkan header senarai pakej dari dalam db urpmi "
#~ "ke\n"
#~ " stdout (hanya root).\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed (%d MB)"
-#~ msgstr ""
-#~ "Pakej berikut akan dihapus agar syarat kebergantungan dipenuhi (%d MB)"
diff --git a/po/mt.po b/po/mt.po
index 78147d87..ff01df9d 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: mt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-09-07 05:59+0200\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -21,7 +21,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: KBabel 1.3\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, fuzzy, c-format
msgid "RPM installation"
msgstr "Installazzjoni tas-sistema"
@@ -31,7 +31,7 @@ msgstr "Installazzjoni tas-sistema"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -97,7 +97,7 @@ msgstr "Installa"
msgid "_Save"
msgstr "Ikteb"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "I_kkanċella"
@@ -107,29 +107,29 @@ msgstr "I_kkanċella"
msgid "Choose location to save file"
msgstr "Agħżel fejn tikteb il-fajl"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"għażla \"%s\" mhux magħrufa\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Ebda kmand speċifikat"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, fuzzy, c-format
msgid "Please wait..."
msgstr "Stenna ftit."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, fuzzy, c-format
msgid "Must be root"
msgstr "Port tal-maws"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -139,42 +139,42 @@ msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Twissija"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, fuzzy, c-format
msgid " (to upgrade)"
msgstr "AÄ¡Ä¡ornament"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, fuzzy, c-format
msgid " (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, fuzzy, c-format
msgid "_Abort"
msgstr "Waqqaf"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -184,45 +184,49 @@ msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
-"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
-"d MB)"
-msgstr[1] ""
+msgstr ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll (%"
"d MB)"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr ""
+"Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d MB)"
+
+#: ../gurpmi2:219 ../urpmi:583
+#, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
+msgstr[1] ""
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Installazzjoni ta' pakketti..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ma nistax inġib il-pakketti tas-sors, se noħroġ"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Jekk jogħġbok daħħal id-diska mmarkata \"%s\" fl-apparat [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Qed jitniżżel il-pakkett \"%s\"..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, fuzzy, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -236,7 +240,7 @@ msgstr ""
"\n"
"Trid tkompli bl-installazzjoni?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,37 +252,37 @@ msgstr ""
"%s\n"
"Forsi trid taġġorna d-database urpmi"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "qed jitneħħa %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Qed nipprepara..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, fuzzy, c-format
msgid "_Done"
msgstr "Lest"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "installazzjoni falliet"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "kollox diġà installat"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Installazzjoni lesta"
@@ -327,63 +331,63 @@ msgstr "Is-\"superuser\" biss għandu l-awtorità jistalla pakketti"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "ma nistax niftaħ rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "isem tal-fajl rpm [%s] invalidu"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "qed jinġab il-fajl rpm [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...qari lest"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...qari falla: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ma nistax naċċessa l-fajl rpm [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ma nistax nifli \"%s\" fil-fajl [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ma nistax nirreġistra l-fajl rpm"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "problema fir-reġistrazzjoni ta' pakketti lokali"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -403,27 +407,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "Trid tkun \"root\" biex tuża dan il-kmand ! \n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: ma nistax naqra l-fajl rpm \"%s\"\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
@@ -448,7 +452,7 @@ msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ma setax jinkiteb il-fajl ta' konfigurazzjoni [%s]"
@@ -466,7 +470,7 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Password:"
#: ../urpm/download.pm:185
#, c-format
@@ -578,7 +582,7 @@ msgstr "hemm diversi pakketti bl-istess isem ta' rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ma nistax nifli sew [%s] fuq il-valur \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ma nistax naċċessa l-fajl tal-lista \"%s\", sors injorat"
@@ -690,7 +694,7 @@ msgstr "Ebda kmand speċifikat"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -714,7 +718,7 @@ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr ""
"qed tiġi kalkulata l-md5sum ta l-hdlist (jew sinteżi) tas-sors eżistenti"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -723,102 +727,102 @@ msgstr ""
"sors virtwali \"%s\" ma jistax ikollu hdlist jew fajl ta' lista definit; "
"sors injorat"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "is-sors virtwali \"%s\" għandu jkollu url ċar; sors injurat"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "isem tal-fajl rpm [%s] invalidu"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ma nistax insib il-fajl tal-lista għal \"%s\", sors injorat."
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "ibni l-fajl ta' sintesi tal-hdlist għas-sors \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ma nistax naċċessa l-fajl hdlist ta' \"%s\", sors injorat"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "sors \"%s\" qed jipprova juża hdlist li diġà użat, sors injorat"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "is-sors \"%s\" jipprova juża lista diġà użata, sors injorat"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "qed nipprova naqbeż is-sors eżistenti \"%s\""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "wisq punti ta' mmuntar għas-sors li jitneħħa \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "qed nieħu l-apparat li jitneħħa bħala \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "qed jintuża apparat [%s] għal \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ma nistax nikseb il-path għal sors li jitneħħa \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "ikteb fajl ta' konfigurazzjoni [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ma nistax nuża modalità parallela ma' modalità use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "qed tintuża sors assoċjat għal modalità parallela: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -827,223 +831,223 @@ msgstr ""
"--synthesis ma jistax jintuża ma' --media, --excludemedia, --sortmedia, --"
"update jew --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Fittex fonts installati"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Qed ngħaddi t-tieni passata biex niddetermina dipendenzi\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "qed jinqabeż pakkett %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "jaġġorna minflok jinstalla pakkett %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "sors \"%s\" diġà jeżisti"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "sors virtwali \"%s\" mhux lokali; sors injorat"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ma nistax naċċessa l-ewwel sors ta' installazzjoni"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "qed naqra l-fajl \"hdlists\"..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ma nistax niftaħ rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ma nistax naċċessa l-ewwel sors ta' installazzjoni (ma nstabx il-fajl "
"hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "qed nipprova naċċessa sors ineżistenti \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "qed nagħżel sors multiplu: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "qed jitneħħa s-sors \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "qed jiġi rikonfigurat urpmi għas-sors \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...rikonfigurazzjoni falliet"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "rikonfigurazzjoni lesta"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "sors \"%s\" mhuwiex magħżul"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "qed jiġi eżaminat il-fajl hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "qed jinbena hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema fil-qari tal-hdlist jew sinteżi għas-sors \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...ikkupjar falla"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "qed nikkopja l-fajl ta' deskrizzjoni ta' \"%s\""
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...ikkupjar lest"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "l-ikkuppjar tal-fajl [%s] falla (il-fajl jidher żgħir wisq)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "qed nikkalkula md5sum tal-hdlist jew sinteżi kkupjat"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "l-ikkuppjar tal-fajl [%s] falla (md5sum ma qablitx)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "qed tiġi kalkulata l-md5sum għall-hdlist jew sinteżi tas-sors imniżżel"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...qari falla: md5sum ma qablitx"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ebda fajls rpm ma nstabu minn [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "qed jinqraw fajls rpm minn [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ma setgħux jinqraw l-fajls rpm minn [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1054,78 +1058,78 @@ msgstr ""
"dan jista' jiġri jekk timmonta d-direttorju manwalment waqt li qed jinħoloq "
"is-sors."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "qed jinġab l-hdlist jew sinteżi sors għal \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "sibt l-hdlist (jew sinteżi) bħala %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ma nstabx fajl hdlists għas-sors \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "qed jiġi eżaminat fajl pubkey ta' \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...Ä‹ifrarju %s importat mill-fajl pubkey ta' \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ma stajtx nimporta fajl pubkey ta' \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "qed jinkiteb il-fajl b'lista għas-sors \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ġie miżjud is-sors %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ma nistax nifli l-fajl hdlist ta' \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema fil-qari tas-sinteżi għas-sors \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "qed naqra l-\"headers\" mis-sors \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "LlNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "IiYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Għażla ħażina, jiddispjaċini. Erġa' pprova\n"
@@ -1161,8 +1165,8 @@ msgid "unmounting %s"
msgstr "qed niżmonta %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "sors \"%s\" mhuwiex magħżul"
#: ../urpm/removable.pm:143
@@ -1180,47 +1184,47 @@ msgstr "sors \"%s\" immarkat li jista' jitneħħa, imma m'hux"
msgid "unable to access medium \"%s\""
msgstr "ma nistax naċċessa s-sors \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ebda pakkett imsejjaħ %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Dawn il-pakketti fihom %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "minħabba %s nieqes"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "minħabba %s mhux sodisfatt"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "qed nipprova nippromwovi %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "sabiex inżomm %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "sabiex ninstalla %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "minħabba konflitt ma' %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "mhux mitlub"
@@ -1365,24 +1369,34 @@ msgstr "M'hemm xejn x'inneħħi"
msgid "Checking to remove the following packages"
msgstr "Qed niċċekkja biex jitneħħa wieħed minn dawn il-pakketti"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
+msgstr[1] ""
"Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jitneħħew ukoll (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "ed jitneħħa l-pakkett %s"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ed jitneħħa l-pakkett %s"
+msgstr[1] "ed jitneħħa l-pakkett %s"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (i/L) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Tneħħija falliet"
@@ -1637,7 +1651,7 @@ msgstr " -verbose - modalità b'ħafna dettalji.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - illistja l-fajls fil-pakkett.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1648,12 +1662,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "qed jintuża ambjent speċifiku fuq %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1662,7 +1676,7 @@ msgstr ""
"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
"jirritorna riżultati\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Forsi trid tuża --name biex tfittex ismijiet tal-pakketti.\n"
@@ -1970,7 +1984,7 @@ msgstr " --noclean - żomm rpms mhux użati fil-cache.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - agħżel kull ma jaqbel fuq il-linja tal-kmand.\n"
@@ -2040,59 +2054,62 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr "AÄ¡Ä¡ornament"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr "AÄ¡Ä¡ornament"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr "Oħroġ mill-installazzjoni"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr "Oħroġ mill-installazzjoni"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "X'tagħżel? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "Trid tkompli xorta?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (I/l) "
@@ -2102,56 +2119,65 @@ msgstr " (I/l) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"L-installazzjoni ma tistax tkompli għax dawn il-pakketti jridu \n"
"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"L-installazzjoni ma tistax tkompli għax dawn il-pakketti jridu \n"
"jitneħħew sabiex oħrajn jiġu aġġornati:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Dawn il-pakketti jridu jitneħħew qabel oħrajn jiġu aġġornati:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2160,100 +2186,111 @@ msgstr ""
"Trid tkun \"root\" biex tinstalla dawn id-dipendenzi:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Agħfas Enter meta tlesti..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Ikkanċella"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Dawn il-pakketti fihom firem ħżiena"
-msgstr[1] "Dawn il-pakketti fihom firem ħżiena"
+msgstr "Dawn il-pakketti fihom firem ħżiena"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Dawn il-pakketti fihom firem ħżiena"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Trid tkompli l-installazzjoni ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "installazzjoni falliet"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "qed jiġi distribwit %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "qed jiġi nstallat %s"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "installazzjoni falliet"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Trid tinstalla mingħajr ma niċċekkja d-dipendenzi? (i/L) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Trid tipprova b'iżjed qawwa (--force)? (i/L)"
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d tranżazzjonijiet ta' installazzjoni fallew"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d tranżazzjonijiet ta' installazzjoni fallew"
+msgstr[1] "%d tranżazzjonijiet ta' installazzjoni fallew"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Installazzjoni possibbli"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "kollox diġà installat"
-msgstr[1] "kollox diġà installat"
+msgstr "kollox diġà installat"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "kollox diġà installat"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "kollox diġà installat"
-msgstr[1] "kollox diġà installat"
+msgstr "kollox diġà installat"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "kollox diġà installat"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "qed jiġi ristartjat urpmi"
@@ -2360,17 +2397,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - naddaf id-direttorju tal-cache tal-headers.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - modalità kwieta.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - modalità b'ħafna dettalji (verbose).\n"
@@ -2504,8 +2541,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2563,12 +2602,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"użu: urpmi.removemedia [-a] <isem> ...\n"
+"użu: urpmi.removemedia (-a | <isem> ...)\n"
"fejn <isem> huwa l-isem tas-sors xi tneħħi.\n"
#: ../urpmi.removemedia:41
@@ -2630,26 +2669,32 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr " --no-probe - tippruvax tfittex fajls sinteżi jew hdlist.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - agħżel is-sorsi kollha li ma jitneħħewx.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Is-\"superuser\" biss għandu l-awtorità jaġġorna sorsi"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "m'hemm xejn x'naġġorna (uża urpmi.addmedia biex iżżid sors)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2658,17 +2703,17 @@ msgstr ""
"l-element li trid taġġorna m'hux hemm\n"
"(wieħed minn %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "ignoring media %s"
msgstr "Editja s-sors \"%s\":"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, fuzzy, c-format
msgid "enabling media %s"
msgstr "qed jitneħħa s-sors \"%s\""
@@ -2775,71 +2820,71 @@ msgstr " --changelog - uri \"changelog\": lista ta' tibdiliet.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - uri t-tag \"summary\": sommarju.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
+" --whatrequires - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
+"pakkett.\n"
+
#: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" -R - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
+"pakkett.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - fittex fil-\"provides\" biex issib pakkett.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - output komplet bil-pakkett li se jitneħħa.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - estendi t-tfittix għad-dipendenzi tal-pakketti.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - uri l-gruppi flimkien ma' l-isem.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - uri informazzjoni utli f'forma li tinftiehem.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - illistja l-fajls fil-pakkett.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - tfittixx fil-\"provides\" biex issib pakkett "
-"(impliċitu).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - fittex fil-\"provides\" biex issib pakkett.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - modalità kwieta.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - uri verżjoni u ħarġa flimkien ma' l-isem.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr ""
-" -R - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
-"pakkett.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -R - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
-"pakkett.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - il-pakkett li jmiss huwa sors (l-istess bħal --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2848,115 +2893,79 @@ msgstr ""
" -u - neħħi pakkett jekk diġà hemm verżjoni iżjed riċenti "
"nstallata.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - ġiegħel tfittix \"fuzzy\" (l-istess bħal --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - bħal -y, imma ma jiddistingwix bejn ittri kbar/żgħar.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" ismijiet jew fajls rpm li jingħataw fuq il-linja tal-kmand jiġu "
"spezzjonati.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes tista' tintuża biss ma' --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
+"jirritorna riżultati\n"
+
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ma nstabx lista ta' fajls\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Nota: peress li ebda sors imfittex ma juża hdlists, urpmf ma setax "
+"jirritorna riżultati\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ma nstabx changelog\n"
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgstr[0] ""
-#~ "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll "
-#~ "(%d MB)"
-#~ msgstr[1] ""
-#~ "Biex nissodisfa d-dipendenzi, dawn il-pakketti jridu jiġu nstallati wkoll "
-#~ "(%d MB)"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d "
-#~ "MB)"
-
-#, fuzzy
-#~ msgid ""
-#~ "To satisfy dependencies, the following packages are going to be installed"
-#~ msgid_plural ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr[0] ""
-#~ "Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d "
-#~ "MB)"
-#~ msgstr[1] ""
-#~ "Biex nissodisfa d-dipendenzi, %d pakkett/i jridu jiġu nstallati wkoll (%d "
-#~ "MB)"
-
-#, fuzzy
-#~ msgid "skipping media %s: no hdlist"
-#~ msgstr "qed jinqabeż sors %s: ebda hdlist\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "installazzjoni falliet"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "Qed jiġi nstallat \"%s\" (%s/%s)..."
+#~ msgid "No filelist found\n"
+#~ msgstr "Ma nstabx lista ta' fajls\n"
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "qed jiġi eżaminat il-fajl ta' sinteżi [%s]"
+#~ msgid "medium \"%s\" is not selected"
+#~ msgstr "sors \"%s\" mhuwiex magħżul"
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "qed jiġi distribwit %s"
+#~ msgid " -f - force generation of hdlist files.\n"
+#~ msgstr " -f - ġiegħel il-fajls hdlist jiġu ġenerati.\n"
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Installazzjoni ta' pakketti..."
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - tfittixx fil-\"provides\" biex issib pakkett "
+#~ "(impliċitu).\n"
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Installazzjoni ta' pakketti..."
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr ""
+#~ " -R - tfittix bil-kontra, għal dak li jirrikjedi dan il-"
+#~ "pakkett.\n"
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr " --probe-synthesis - ipprova sib il-fajl \"synthesis\".\n"
@@ -3016,15 +3025,6 @@ msgstr "Ma nstabx changelog\n"
#~ msgid "using process %d for executing transaction"
#~ msgstr "qed jintuża l-proċess %d biex jagħmel tranżazzjoni"
-#, fuzzy
-#~ msgid " --norebuild - don't try to rebuild hdlist if not readable.\n"
-#~ msgstr ""
-#~ " --buildhost - uri t-tag \"buildhost\": kompjuter fejn inbena.\n"
-
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Dawn il-pakketti fihom %s: %s"
-
#~ msgid "copying hdlists file..."
#~ msgstr "qed nikkopja l-fajl hdlist..."
@@ -3085,15 +3085,6 @@ msgstr "Ma nstabx changelog\n"
#~ msgid "%s: command not found\n"
#~ msgstr "%s: kmand ma nstabx\n"
-#, fuzzy
-#~ msgid ""
-#~ "Some package requested cannot be installed:\n"
-#~ "%s\n"
-#~ "Continue?"
-#~ msgstr ""
-#~ "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
-#~ "%s"
-
#~ msgid "md5sum mismatch"
#~ msgstr "md5sum ma qablitx"
@@ -3210,15 +3201,6 @@ msgstr "Ma nstabx changelog\n"
#~ "Xi pakketti mitluba ma jistgħux jiġu nstallati:\n"
#~ "%s"
-#, fuzzy
-#~ msgid ""
-#~ " --keep - keep existing packages if possible, reject requested\n"
-#~ " packages that leads to remove.\n"
-#~ msgstr ""
-#~ " --keep - żomm il-pakketti eżistenti jekk jista' jkun, iċħadkeep "
-#~ "existing packages if possible, reject requested\n"
-#~ " packages that lead to removals.\n"
-
#~ msgid "unable to write file [%s]"
#~ msgstr "ma setax jinkiteb il-fajl [%s]"
diff --git a/po/nb.po b/po/nb.po
index 6ec01116..85bc1536 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -15,7 +15,7 @@ msgid ""
msgstr ""
"Project-Id-Version: nb\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-08-18 02:05+0200\n"
"Last-Translator: Per Øyvind Karlsen <pkarlsen@mandriva.com>\n"
"Language-Team: Norwegian Bokmål <cooker-i18n@mandrivalinux.com>\n"
@@ -25,7 +25,7 @@ msgstr ""
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM-installasjon"
@@ -35,7 +35,7 @@ msgstr "RPM-installasjon"
msgid "Error: unable to find file %s, will cancel operation"
msgstr "Feil: klarte ikke å finne fil %s, vil avbryte handling"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -101,7 +101,7 @@ msgstr "_Installer"
msgid "_Save"
msgstr "_Lagre"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Avbryt"
@@ -111,27 +111,27 @@ msgstr "_Avbryt"
msgid "Choose location to save file"
msgstr "Velg sted hvor fil skal lagres"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Ukjent valg %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ingen pakker spesifisert"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Vennligst vent..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "Må være root"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -142,42 +142,42 @@ msgstr ""
"%s\n"
"Fortsett installasjonen uansett?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Advarsel"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (Ã¥ oppgradere)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (Ã¥ installere)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr "Pakkevalg"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "En av følgende pakker behøves:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "_Avbryt"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -188,43 +188,48 @@ msgstr ""
"%s\n"
"Fortsett installasjon uansett?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
-"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] ""
+msgstr ""
"For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
-msgstr[1] ""
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
"For å tilfredstille avhengigheter, så vil de følgende pakkene bli installert"
-#: ../gurpmi2:217 ../urpmi:580
-#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d pakker, %d MB)"
+#: ../gurpmi2:219 ../urpmi:583
+#, fuzzy, c-format
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d pakker, %d MB)"
+msgstr[1] "(%d pakker, %d MB)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Pakkeinstallasjon..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "kunne ikke få tak i kildepakker, avslutter"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Sett inn mediumet kalt «%s» på enhet [%s]"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "Laster ned pakke «%s»..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -237,7 +242,7 @@ msgstr ""
"\n"
"Vil du fortsette installasjonen?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,37 +253,37 @@ msgstr ""
"%s\n"
"Du ønsker antageligvis å oppdatere urpmi-databasen din"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "fjerner %s"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Forbereder..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "Installerer pakke «%s» (%s/%s)..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Ferdig"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Installasjon mislyktes"
+msgid "Installation failed:"
+msgstr "Installasjon mislyktes:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Pakken(e) er allerede installert"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Installasjon ferdig"
@@ -327,63 +332,63 @@ msgstr "Bare superbruker har adgang til å installere pakker"
msgid "Running urpmi in restricted mode..."
msgstr "Kjører urpmi i begrenset modus..."
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "kunne ikke åpne rpmdb"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ugyldig rpm-filnavn [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "mottar rpm-fil [%s] ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...ferdig mottatt"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...mottak mislyktes: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kunne ikke nå rpm-fil [%s]"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "klarte ikke å lese spec-fil %s [%s]"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ikke i stand til å registrere rpm-fil"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]"
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "feil ved registrering av lokale pakker"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denne operasjonen er ikke lovlig under kjøring i begrenset modus"
@@ -403,27 +408,27 @@ msgstr "Omgivelsekatalog %s eksisterer ikke"
msgid "You need to be root to use --use-distrib"
msgstr "Du må være root for å bruke --use-distrib"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: kan ikke lese rpm-fil «%s»\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr "For mange argumenter\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bygd hdlistesyntese-fil for medium «%s»"
@@ -448,7 +453,7 @@ msgstr "kunne ikke skrive oppsettfil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "kunne ikke skrive oppsettfil [%s]"
@@ -456,17 +461,17 @@ msgstr "kunne ikke skrive oppsettfil [%s]"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Skriv inn dine referanser for å få tilgang til mellomtjener\n"
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "Brukernavn:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "Passord:"
#: ../urpm/download.pm:185
#, c-format
@@ -579,7 +584,7 @@ msgstr "det er flere pakker med samme rpm-filnavn «%s»"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "kunne ikke korrekt tolke [%s] på verdi «%s»"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "kan ikke få tilgang til liste-fil til «%s», medium ignorert"
@@ -693,9 +698,9 @@ msgid "No base defined"
msgstr "Ingen pakker spesifisert"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
-#, c-format
-msgid "Cannot connect to ldap uri :"
-msgstr ""
+#, fuzzy, c-format
+msgid "Cannot connect to ldap uri:"
+msgstr "Kan ikke koble til tjeneren"
#: ../urpm/lock.pm:50
#, fuzzy, c-format
@@ -717,7 +722,7 @@ msgstr "advarsel: md5sum for %s er ikke tilgjengelig i MD5SUM-filen"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "regner ut md5sum til eksisterende kildehdliste (eller syntese)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -726,103 +731,103 @@ msgstr ""
"virtuelt medium «%s» skal ikke ha definert hdlist- eller list-fil, medium "
"ignorert"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuelt medium «%s» burde ha en klar url, medium ignorert"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "ugyldig rpm-filnavn [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "kunne ikke finne listefil for «%s», medium ignorert"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "prøver å velge ikke-eksisterende medium «%s»"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "bygd hdlistesyntese-fil for medium «%s»"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kunne ikke nå hdlistefil til «%s», medium ignorert"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ikke i stand til å tolke hdlistefil til «%s»"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "medium «%s» prøver å bruke en allerede brukt hdliste, medium ignorert"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "medium «%s» prøver å bruke en allerede brukt liste, medium ignorert"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "prøver å forbigå eksisterende medium «%s», hopper over"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "for mange monteringspunkter for fjernbart medium «%s»"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "tar fjernbar enhet som «%s»"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
"Mediet «%s» er et ISO-avtrykk og vil bli montert mens operasjonen utføres"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "bruker forskjellige fjernbare enheter [%s] for «%s»"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "kunne ikke motta sti for fjernbart medium «%s»"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "skriv oppsettfil [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Kan ikke bruke parallell-modus med use-distrib-modus"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "bruker assosiert medie for parallellmodus: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -831,145 +836,145 @@ msgstr ""
"--synthesis kan ikke brukes med --media, excludemedia, --sortmedia, --update "
"eller --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Søk start: %s slutt: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "utfører andre rundgang for å beregne avhengigheter\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "hopper over pakke %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ville installert i stedet for å oppgradere pakke %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medium «%s» eksisterer allerede"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuelt medium trenger å være lokalt"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "leser hoder fra medium «%s»"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "fjerner medium «%s»"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "kan ikke få tilgang til første installasjonsmedium"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denne urlen ser ikke ut til å inneholde noen distrib"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "mottar media.cfg-fil..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "klarte ikke å lese media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"kan ikke få adgang til første installasjonsmedium (ingen hdlistefiler funnet)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "prøver å velge ikke-eksisterende medium «%s»"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "velger flere medier: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "fjerner medium «%s»"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "setter opp urpmi for medier «%s» på nytt"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...oppsett på nytt mislyktes"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "oppsett på nytt fullført"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Feil ved generering av navnefil: avhengighet %d ikke funnet"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Feil ved generering av navnefil: Kan ikke skrive til fil (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium «%s» er ikke valgt"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "sjekker hdlistefil [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sjekker syntesefil [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger hdliste [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -978,77 +983,77 @@ msgstr ""
"Ikke i stand til å bygge syntesefil for medium «%s». Din hdlistefil kan være "
"korrupt."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem med å lese syntesefil av medium «%s»"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiering mislyktes"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierer beskrivelsesfil av «%s»..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiering ferdig"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skriver listefil for medium «%s»"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering av [%s] mislyktes (fil er mistenkelig liten)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "regner ut md5sum til kopierte kildehdliste (eller syntese)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiering av [%s] mislyktes (md5sum stemmer ikke)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "regner ut md5sum av mottatt kildehdliste (eller syntese)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...mottak mislyktes: md5sum stemmer ikke overens"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ingen rpm-filer funnet fra [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "leser rpm-filer fra [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kunne ikke lese rpm-filer fra [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "ingen rpm'er lest"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1059,78 +1064,78 @@ msgstr ""
"dette kan ha skjedd hvis du monterte katalogen manuelt når mediumet ble "
"opprettet."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ingen hdlistefil funnet for medium «%s»"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "mottar kildehdliste (eller syntese) av «%s»..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "fant testet hdliste (eller syntese) som %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ingen hdlistefil funnet for medium «%s»"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersøker fil med offentlig nøkkel til «%s»..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importerer nøkkel %s fra fil med offentlig nøkkell til «%s»"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunne ikke importere fil med offentlig nøkkel til «%s»"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skriver listefil for medium «%s»"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "lagt til medium %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ikke i stand til å tolke hdlistefil til «%s»"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem med å lese syntese-fil av medium «%s»"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "leser hoder fra medium «%s»"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "JjYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Beklager, ugyldig valg, prøv igjen\n"
@@ -1166,8 +1171,8 @@ msgid "unmounting %s"
msgstr "avmonterer %s"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "medium «%s» er ikke valgt"
#: ../urpm/removable.pm:143
@@ -1185,47 +1190,47 @@ msgstr "usammenhengende medium «%s» merket fjernbart, men er det ikke"
msgid "unable to access medium \"%s\""
msgstr "kunne ikke nå medium «%s»"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ingen pakke kalt %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Følgende pakker inneholder %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "pga. manglende %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "pga. utilfredsstilt %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "prøver å promotere %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "for å kunne beholde %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "for å kunne installere %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "pga. konflikter med %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "ikke forespurt"
@@ -1371,24 +1376,34 @@ msgstr "Ingenting å fjerne"
msgid "Checking to remove the following packages"
msgstr "Sjekker fjerning av følgende pakker"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"For å tilfredsstille avhengigheter vil følgende %d pakker bli fjernet (%d MB)"
+msgstr[1] ""
"For å tilfredsstille avhengigheter vil følgende %d pakker bli fjernet (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "Remove %d packages?"
-msgstr "Fjern %d pakker?"
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
+#, fuzzy, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "Fjern %d pakker?"
+msgstr[1] "Fjern %d pakker?"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Fjerning mislyktes"
@@ -1646,7 +1661,7 @@ msgstr " --vendor - leverandør\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - mediet i hvilken pakke som ble funnet\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - vis versjon, utgivelse og arkitektur med navn.\n"
@@ -1656,12 +1671,12 @@ msgstr " -f - vis versjon, utgivelse og arkitektur med navn.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: du kan bare bruke flerverdietiketter"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "bruker spesifikt miljø på %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1670,7 +1685,7 @@ msgstr ""
"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Det kan være at du ønsker å bruke --name for å søke etter pakkenavn.\n"
@@ -1971,7 +1986,7 @@ msgstr " --nolock - ikke lås rpm-database.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - bare oppgrader pakker med samme arkitektur.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - velg alle treff på kommandolinjen.\n"
@@ -2043,58 +2058,61 @@ msgstr ""
"Feil: %s ser ut til å være montert skrivebeskyttet.\n"
"Bruk --allow-force for å tvinge operasjonen."
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr "Oppdaterer medie...\n"
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (Ã¥ oppgradere)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (Ã¥ oppgradere)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (Ã¥ installere)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (Ã¥ installere)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Hva er ditt valg? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"De følgende pakkene kan ikke bli installert fordi de er avhengige av pakker\n"
"som er eldre enn de som er installert:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"De følgende pakkene kan ikke bli installert fordi de er avhengige av pakker\n"
"som er eldre enn de som er installert:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2103,7 +2121,7 @@ msgstr ""
"\n"
"Fortsett installasjon likevel?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (J/n) "
@@ -2113,56 +2131,65 @@ msgstr " (J/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Noen av de forespurte pakkene kan ikke installeres:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"Noen av de forespurte pakkene kan ikke installeres:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"Installasjonen kan ikke fortsette på grunn av at følgende pakker\n"
"må fjernes for at andre skal bli oppgradert:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"Installasjonen kan ikke fortsette på grunn av at følgende pakker\n"
"må fjernes for at andre skal bli oppgradert:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"Følgende pakker må fjernes for at andre skal bli oppgradert:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr "(kun test, fjerning vil egentlig ikke bli gjennomført)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2171,100 +2198,111 @@ msgstr ""
"Du må være root for å installere følgende avhengigheter:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr "(kun test, installasjon vil egentlig ikke bli gjennomført)"
-#: ../urpmi:594
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsett installasjonen med de %d pakkene? (%d MB)"
msgstr[1] "Fortsett installasjonen med de %d pakkene? (%d MB)"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Trykk Enter når det er klart..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Følgende pakker har ugyldige signaturer"
-msgstr[1] "Følgende pakker har ugyldige signaturer"
+msgstr "Følgende pakker har ugyldige signaturer"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Følgende pakker har ugyldige signaturer"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ønsker du å fortsette installasjonen ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Installasjon mislyktes"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuerer %s"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "installerer %s fra %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "installerer %s"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "Installasjon mislyktes:"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prøv å installere uten å sjekke avhengigheter? (j/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prøv enda hardere å installere (--force)? (j/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installasjonstransjaksjon mislyktes"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installasjonstransjaksjon mislyktes"
+msgstr[1] "%d installasjonstransjaksjon mislyktes"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Installasjon er mulig"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Pakken(e) er allerede installert"
-msgstr[1] "Pakken(e) er allerede installert"
+msgstr "Pakken(e) er allerede installert"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "Pakken(e) er allerede installert"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Pakken(e) er allerede installert"
-msgstr[1] "Pakken(e) er allerede installert"
+msgstr "Pakken(e) er allerede installert"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "Pakken(e) er allerede installert"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "starter urpmi på nytt"
@@ -2375,17 +2413,17 @@ msgstr ""
" --raw - legg til medie i oppsettet, men ikke oppdater det.\n"
".\n"
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - rengjør mellomlagerkatalog for filhoder.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - stillemodus.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - informativt modus.\n"
@@ -2524,9 +2562,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Rensker opp gjenpakkingskatalog [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d filer fjernet\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d filer fjernet\n"
+msgstr[1] "%d filer fjernet\n"
#: ../urpmi.recover:82
#, c-format
@@ -2584,12 +2624,12 @@ msgid "Disabling repackaging\n"
msgstr "Deaktiverer gjenpakking\n"
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"bruk: urpmi.removemedia [-a] <navn> ...\n"
+"bruk: urpmi.removemedia (-a | <navn> ...)\n"
"hvor <navn> er et mediumnavn som skal fjernes.\n"
#: ../urpmi.removemedia:41
@@ -2651,26 +2691,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - ikke oppdater, marker medie som aktivert.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - ikke prøv å finn noen syntese- eller\n"
+" hdlistefil.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - velg alle ikke-fjernbare medier.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - tving generasjon av hdlstefiler.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "Bare superbruker har adgang til å oppdatere medier"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ingenting å oppdatere (bruk urpmi.addmedia for å legge til et medie)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2679,17 +2727,17 @@ msgstr ""
"oppføringen til oppdatering mangler\n"
"(en av %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "«%s»"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "ignorerer medie %s"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "aktiverer medie %s"
@@ -2792,67 +2840,70 @@ msgstr " --changelog - vis changelog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary, -S - vis sammendrag.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - reversert søk til hva som krever pakke.\n"
+
#: ../urpmq:88
#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+" --whatrequires-recursive\n"
+" - utvidet reversert søk (inkluderer virtuell pakker).\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - søk i tilbud for å finne pakke.\n"
+
+#: ../urpmq:93
+#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - fullstendig utskrift med pakke som skal bli fjernet.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - utvid forespørsel til pakkeavhengigheter.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - vis grupper også med navn.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - vis verdigfull informasjon i menneskelig lesbart format.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - list opp filer i pakke.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -P - ikke søk i tilbud for å finne pakke.\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - søk i tilbud for å finne pakke.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - stillemodus.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - vis versjon og utgivelse også med navn.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - reversert søk til hva som krever pakke.\n"
-
-#: ../urpmq:98
-#, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr ""
-" -RR - utvidet reversert søk (inkluderer virtuell pakker).\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - neste pakke er en kildepakke (samme som --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2861,53 +2912,88 @@ msgstr ""
" -u - fjerner pakke hvis en nyere versjon allerede er "
"installert.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - pålegg uklart søk (samme som --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - som -y, men tvinger samvsvar med store og små bokstaver.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " navn eller rpm-filer gitt på kommandolinjem er forespurt.\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan bare brukes med --parallel"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
+"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ingen filliste funnet\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Merk: siden inget medie som er blitt søkt gjennom bruker hdlister, så var "
+"ikke urpmf i stand til å returnere noe resultat\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ingen changelog funnet\n"
#, fuzzy
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Fortsett installasjonen med de %d pakkene? (%d MB)"
+#~ msgstr[1] "Fortsett installasjonen med de %d pakkene? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Ingen filliste funnet\n"
+
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d pakker, %d MB)"
+
+#, fuzzy
+#~ msgid "Proceed with the installation of 1 package? (%2$d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Fortsett installasjonen med de %d pakkene? (%d MB)"
+#~ msgstr[1] "Fortsett installasjonen med de %d pakkene? (%d MB)"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr " -P - ikke søk i tilbud for å finne pakke.\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - reversert søk til hva som krever pakke.\n"
+
+#~ msgid ""
+#~ " -RR - extended reverse search (includes virtual packages).\n"
+#~ msgstr ""
+#~ " -RR - utvidet reversert søk (inkluderer virtuell pakker).\n"
+
+#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
#~ msgid_plural ""
diff --git a/po/nn.po b/po/nn.po
index 76ab3081..a73887e9 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-03-10 23:31+0100\n"
"Last-Translator: Karl Ove Hufthammer <karl@huftis.org>\n"
"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
@@ -104,12 +104,12 @@ msgstr "_Avbryt"
msgid "Choose location to save file"
msgstr "Vel plassering av lagra fil."
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Ukjent val: «%s»."
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ingen pakkar valde"
@@ -140,7 +140,7 @@ msgstr ""
msgid "Warning"
msgstr "Ã…tvaring"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "OK"
@@ -183,12 +183,14 @@ msgstr ""
#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Grunna avhengnader vert denne pakken installert:"
#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
msgstr "Grunna avhengnader vert desse pakkane installerte:"
#: ../gurpmi2:219 ../urpmi:583
@@ -232,7 +234,7 @@ msgstr ""
"\n"
"Vil du likevel halda fram med å installera?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -243,7 +245,7 @@ msgstr ""
"%s\n"
"Du bør oppdatera urpmi-databasen."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "Fjernar «%s»."
@@ -263,10 +265,10 @@ msgstr "Installerer pakken «%s» (%s/%s) ..."
msgid "_Done"
msgstr "_Ferdig"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Feil ved installering"
+msgid "Installation failed:"
+msgstr "Feil ved installering:"
#: ../gurpmi2:344
#, c-format
@@ -322,63 +324,63 @@ msgstr "Berre superbrukaren kan installera pakkar."
msgid "Running urpmi in restricted mode..."
msgstr "Køyrer urpmi i avgrensa modus ..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "Klarte ikkje opna «rpmdb»."
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "Fann %d RPM-hovudlinjer i mellomlageret. Fjernar %d utdaterte."
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "Ugyldig rpm-filnamn [%s]."
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Mottek rpm-fil [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "... ferdig motteken."
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "... ikkje motteken: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "Klarte ikkje lesa rpm-fil [%s]."
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Klarte ikkje tolka spec-fila «%s» [%s]."
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "Klarte ikkje registrera rpm-fil."
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur for rpm [%s]."
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "Klarte ikkje registrera lokale pakkar."
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Du kan ikkje køyra denne operasjonen i avgrensa modus."
@@ -418,7 +420,7 @@ msgstr "Kan ikkje bruka «%s» med «%s»."
msgid "Too many arguments\n"
msgstr "For mange argument.\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Fullført bygging av «hdlist»-syntesefil for mediet «%s»."
@@ -443,7 +445,7 @@ msgstr "Klarte ikkje lesa oppsettfila [%s]."
msgid "medium `%s' is defined twice, aborting"
msgstr "Mediet «%s» er definert to gongar. Avbryt."
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "Klarte ikkje skriva oppsettfila [%s]."
@@ -573,7 +575,7 @@ msgstr "Det finst fleire pakkar med same rpm-filnamnet «%s»."
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "Klarte ikkje tolka [%s] på verdien «%s»."
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "Klarte ikkje opna «list»-fila til «%s». Hoppar over mediet."
@@ -619,7 +621,8 @@ msgstr "[pakkar om att]"
#: ../urpm/install.pm:110
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
msgstr ""
"Laga transaksjon for installering på «%s» (remove: %d – install: %d – "
"upgrade: %d)"
@@ -709,7 +712,7 @@ msgstr "Åtvaring: md5summen for «%s» er ikkje tilgjengeleg i MD5SUM-fila."
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "Reknar ut md5sum av gammal kjelde-«hdlist» (eller -«syntese») [%s]."
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -718,104 +721,106 @@ msgstr ""
"Det virtuellet mediet «%s» kan ikkje ha definert noko «hdlist»- eller «list»-"
"fil. Hoppar over mediet."
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
+msgstr ""
+"Det virtuelle mediet «%s» må ha ei eintydig adresse. Hoppar over medium."
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "Ugyldig «hdlist»-namn."
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "Fann ikkje noko «list»-fil for «%s». Hoppar over mediet."
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "«synthesis» må ikkje vera vald (mediet «%s»)."
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "«synthesis» må vera vald (mediet «%s»)."
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "Klarte ikkje opna «hdlist»-fila til «%s». Hoppar over mediet."
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "Klarte ikkje opna listefila til «%s»."
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"Mediet «%s» prøver å bruka ei allereie brukt «hdlist»-fil. Hoppar over "
"mediet."
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
+msgstr ""
+"Mediet «%s» prøver å bruka ei allereie brukt «list»-fil. Hoppar over mediet."
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "Prøver å hoppa over eksisterande medium «%s». Hoppar over."
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "For mange monteringspunkt for det flyttbare mediet «%s»."
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "Brukar flyttbar eining som «%s»."
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Mediet «%s» er eit ISO-bilete, og vert montert direkte."
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "Brukar forskjellig flyttbar eining [%s] for «%s»."
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "Fann ikkje adresse til det flyttbare mediet «%s»."
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "Skreiv %s."
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "Skriv oppsettfil [%s]."
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Kan ikkje bruka parallellmodus i «use-distrib»-modus."
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "Brukar tilknytta medium for parallellmodus: %s."
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -824,142 +829,144 @@ msgstr ""
"Kan ikkje bruka «--synthesis» saman med «--media», «--excludemedia», «--"
"sortmedia», «--update», «--use-distrib» eller «--parallel»."
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
-msgstr "Merk: Fann inga «hdlist» for mediet «%s», og kan soleis ikkje gje treff for dette mediet."
+msgstr ""
+"Merk: Fann inga «hdlist» for mediet «%s», og kan soleis ikkje gje treff for "
+"dette mediet."
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Søkjestart: %s. Søkjeslutt: %s."
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Går gjennom på nytt for å rekna ut avhengnader.\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "Hoppar over pakken «%s»."
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "Ville installert i staden for å oppgradera pakken «%s»."
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "Mediet «%s» finst allereie."
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "Virtuelle medium må vera lokale."
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(hoppa over som standard)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Legg til mediet «%s» før fjernmediet «%s»."
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "Legg til mediet «%s»."
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "Klarte ikkje montera distribusjonsmediet."
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Denne adressea ser ikkje ut til å innehelda ein distribusjon."
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "Mottek «media.cfg»-fil ..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "Klarte ikkje tolka «media.cfg»."
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "Klarte ikkje lesa frå distribusjonsmediet (fann inga «media.cfg»-fil)."
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Prøver å velja ikkjeeksisterande medium «%s»."
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "Vel fleire medium: %s."
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "Fjernar mediet «%s»."
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Endrar oppsett for mediet «%s»."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "... klarte ikkje endra oppsett."
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "Fullført endring av oppsett."
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Feil ved generering av namnefil: Fann ikkje avhengnaden «%d»."
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Feil ved generering av namnefil: Kan ikkje skriva til fila (%s)."
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "Mediet «%s» er i nyaste versjon."
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "Les «hdlist»-fila [%s]."
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Les syntesefila [%s]."
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "Byggjer «hdlist» [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -968,77 +975,77 @@ msgstr ""
"Klarte ikkje byggja syntesefil for mediet «%s». hdlist-fila kan vera "
"øydelagt."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "Feil ved lesing av «hdlist» eller syntesefila til mediet «%s»."
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "... mislukka kopiering."
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Kopierer beskrivingsfila til «%s» ..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "... kopiering fullført."
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "Kopierer [%s] for mediet «%s»."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "Mislykka kopiering av [%s] (fila er mistenkeleg liten)."
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "Reknar ut md5sum av kopiert kjelde-«hdlist» (eller -syntese)."
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Mislykka kopiering av [%s] (md5summen stemmer ikkje)."
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "Reknar ut md5sum til motteken kjelde-«hdlist» (eller -syntese)."
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "... ikkje motteken: md5summen stemmer ikkje."
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "Fann ingen rpm-filer frå [%s]."
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Leser rpm-filer frå [%s]."
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "Klarte ikkje lesa rpm-filer frå [%s]: %s."
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "Det finst ingen rpm-ar å lesa."
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1048,78 +1055,78 @@ msgstr ""
"Fekk ikkje tilgang til mediet «%s».\n"
"Dette kan vera fordi du manuelt monterte mappa når du oppretta mediet."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "Ugyldig «hdlist»-fil [%s] for mediet «%s»."
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Mottek kjelde-«hdlist» (eller -syntese) for «%s» ..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "Fann undersøkt «hdlist» (eller -syntese) som «%s»."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Fann inga «hdlist»-fil for mediet «%s»."
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "Les offentlegnøkkelfila til «%s» ..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "... Importerer nøkkelen «%s» frå offentlegnøkkelfila til «%s»."
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "Klarte ikkje importera offentlegnøkkelfila til «%s»."
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "Lagrar listefil for mediet «%s»."
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "Oppdatert medium «%s»."
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "Klarte ikkje tolka «hdlist»-fila til «%s»."
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "Feil ved lesing av syntesefil til mediet «%s»."
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "Les mediumhovud til mediet «%s»."
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "JjYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Dårleg val. Prøv på nytt.\n"
@@ -1174,47 +1181,47 @@ msgstr "Det inkonsistente mediet «%s» er merkja fjerna, men er ikkje fjerna."
msgid "unable to access medium \"%s\""
msgstr "Klarte ikkje lesa mediet «%s»."
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Det finst ingen «%s»-pakke."
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Desse pakkane inneheld «%s»: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "då «%s» manglar"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "då «%s» ikkje er tilfredsstilt"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "Prøver å prioritera «%s»"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "for å kunna behalda «%s»"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "for å kunna installera «%s»"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "på grunn av konfliktar med «%s»"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "ikkje etterspurd"
@@ -1269,8 +1276,10 @@ msgstr " --test – kontroller at fjerninga kan fungera.\n"
#: ../urpme:47 ../urpmi:109 ../urpmq:67
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force – Tving gjennomføring sjølv om ikkje alle pakkar finst.\n"
#: ../urpme:48 ../urpmi:114 ../urpmq:69
#, c-format
@@ -1291,7 +1300,8 @@ msgstr " --root – Bruka anna rot for rpm-fjerning.\n"
#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
-msgstr " --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
+msgstr ""
+" --urpmi-root – Bruk anna rot for urpmi-database og rpm-installering.\n"
#: ../urpme:52
#, c-format
@@ -1357,24 +1367,32 @@ msgstr "Ingenting å fjerna."
msgid "Checking to remove the following packages"
msgstr "Kontrollerer fjerning av desse pakkane"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "PÃ¥ grunn av avhengnader vert desse %d pakkane fjerna (%d MiB)"
+msgstr[1] "PÃ¥ grunn av avhengnader vert desse %d pakkane fjerna (%d MiB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "PÃ¥ grunn av avhengnader vert desse %d pakkane fjerna (%d MiB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Vil du fjerna %d pakke?"
msgstr[1] "Vil du fjerna %d pakkar?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (J/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Klarte ikkje fjerna."
@@ -1404,7 +1422,8 @@ msgstr " --version – Vis versjonsnummeret til dette verktøyet.\n"
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
msgid " --env - use specific environment (typically a bug report).\n"
-msgstr " --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
+msgstr ""
+" --env – Bruk eigedefinert miljø (vanlegvis ein feilrapport).\n"
#: ../urpmf:38 ../urpmi:86 ../urpmq:52
#, c-format
@@ -1413,8 +1432,10 @@ msgstr " --excludemedia – Ikkje bruk gitt medium (kommadelt liste).\n"
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
-msgstr " --literal, -l – Ingen treff på mønster; bruk berre argument som tekst.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgstr ""
+" --literal, -l – Ingen treff på mønster; bruk berre argument som tekst.\n"
#: ../urpmf:41 ../urpmi:85 ../urpmq:50
#, c-format
@@ -1423,8 +1444,10 @@ msgstr " --media – Bruk berre gitt medium (kommadelt liste).\n"
#: ../urpmf:42 ../urpmi:89 ../urpmq:53
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
-msgstr " --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
+msgstr ""
+" --sortmedia – Sorter medium etter delstrengar (kommadelt liste).\n"
#: ../urpmf:43 ../urpmi:90 ../urpmq:54
#, c-format
@@ -1623,7 +1646,7 @@ msgstr " --vendor – Leverandør.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m – Mediet som pakken vart funnen i.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f – Vis versjon-, utgåve og arkitekturinformasjon.\n"
@@ -1633,19 +1656,20 @@ msgstr " -f – Vis versjon-, utgåve og arkitekturinformasjon.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Ugyldig format: Du kan berre bruka éin fleirverdi-merkelapp."
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "Brukar eigedefinert miljø på «%s»\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
-msgstr "Merk: urpmf fann ingen treff sidan ingen av media brukar «hdlist»-er.\n"
+msgstr ""
+"Merk: urpmf fann ingen treff sidan ingen av media brukar «hdlist»-er.\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Du kan bruka «--name» for å søkja etter pakkenamn.\n"
@@ -1669,7 +1693,8 @@ msgstr ""
#: ../urpmi:88
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr " --searchmedia – Berre sjå etter pakkar i dette mediet.\n"
#: ../urpmi:91
@@ -1683,7 +1708,8 @@ msgstr ""
#: ../urpmi:92 ../urpmq:55
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr " --auto-select – Vel automatisk alle pakkar som kan oppdaterast.\n"
#: ../urpmi:93
@@ -1910,7 +1936,8 @@ msgstr ""
#: ../urpmi:144
#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillèt å installera pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillèt å installera pakkar for andre arkitekturar.\n"
#: ../urpmi:145
#, c-format
@@ -1927,7 +1954,8 @@ msgstr " --skip – Pakkar som installasjonen skal hoppa over.\n"
msgid ""
" --more-choices - when several packages are found, propose more choices\n"
" than the default.\n"
-msgstr " --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
+msgstr ""
+" --more-choices – Vis fleire val enn standard ved treff på fleire pakkar.\n"
#: ../urpmi:150
#, c-format
@@ -1939,7 +1967,7 @@ msgstr " --nolock – Ikkje lås pakkedatabasen.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch – Berre oppgrader pakkar med same arkitektur.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a – Vel alle treff på kommandolinja.\n"
@@ -2156,109 +2184,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(Berre ein test. Pakkane vert ikkje installerte.)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Vil du halda fram med installeringa av pakken? (%d MB)"
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Vil du halda fram med installeringa av den %d pakken? (%d MB)"
-msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane? (%d MB)"
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Vil du halda fram med installeringa av pakken? (%d MB)"
+msgstr[1] "Vil du halda fram med installeringa av pakken? (%d MB)"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Trykk så «Enter» ..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "Denne pakken har ugyldig signatur"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Desse pakkane har ugyldige signaturar"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vil du halda fram med å installera?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Feil ved installering"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "Fordeler %s."
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "Installerer %s frå %s."
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "Installerer %s."
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Feil ved installering:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Vil du installera utan å kontrollera avhengnader? (J/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Vil du prøva endå sterkare å installera («--force»)? (J/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d mislykka installasjonstransaksjon."
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d mislykka installasjonstransaksjon."
+msgstr[1] "%d mislykka installasjonstransaksjon."
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Det går an å installera."
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Pakkane er i nyaste versjon"
-#: ../urpmi:847
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "Pakken «%s» er alt installert."
-#: ../urpmi:848
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Pakkane «%s» er alt installerte."
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "Pakken «%s» kan ikkje installerast."
-#: ../urpmi:852
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Pakkane «%s» kan ikkje installerast."
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "Startar urpmi på nytt."
@@ -2323,7 +2348,8 @@ msgstr ""
#: ../urpmi.addmedia:63
#, c-format
msgid " --interactive - with --distrib, ask confirmation for each media\n"
-msgstr " --interactive – med «--distrib»: Spør om stadfesting for kvart medium.\n"
+msgstr ""
+" --interactive – med «--distrib»: Spør om stadfesting for kvart medium.\n"
#: ../urpmi.addmedia:64
#, c-format
@@ -2361,7 +2387,8 @@ msgstr " --nopubkey – Ikkje importer offentlegnøkkel til nytt medium.\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
+msgstr ""
+" --raw – Legg mediet til oppsettet, men ikkje oppdater det.\n"
#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2461,13 +2488,15 @@ msgstr " --noclean – Ikkje tøm ompakkingsmappe ved kontrollpunkt.\n"
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr " --list – Vis transaksjonar frå vald dato/lengd-argument.\n"
#: ../urpmi.recover:38
#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-all – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
+msgstr ""
+" --list-all – Vis oversikt over alle transaksjonar i rpmdb (lang).\n"
#: ../urpmi.recover:39
#, c-format
@@ -2511,9 +2540,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Ryddar opp i ompakkingsmappa [%s] ...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d filer fjerna.\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d filer fjerna.\n"
+msgstr[1] "%d filer fjerna.\n"
#: ../urpmi.recover:82
#, c-format
@@ -2641,8 +2672,10 @@ msgstr " --no-ignore – Ikkje oppdater, og bruk mediet i framtida.\n"
#: ../urpmi.update:47
#, c-format
-msgid " --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr " --probe-rpms – Ikkje bruk «synthesis»/«hdlist»; bruk rpm-filer direkte.\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --probe-rpms – Ikkje bruk «synthesis»/«hdlist»; bruk rpm-filer direkte.\n"
#: ../urpmi.update:48
#, c-format
@@ -2732,7 +2765,8 @@ msgstr " --list-media – Vis oversikt over tilgjengelege medium.\n"
#: ../urpmq:61
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url – Vis oversikt over tilgjengelge medium, med adresser.\n"
+msgstr ""
+" --list-url – Vis oversikt over tilgjengelge medium, med adresser.\n"
#: ../urpmq:62
#, c-format
@@ -2746,7 +2780,8 @@ msgstr " --list-aliases – Vis oversikt over tilgjengelege parallellalias.\n"
#: ../urpmq:64
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config – Dump oppsettet på same form som «urpmi.addmedia»-"
"argument.\n"
@@ -2758,7 +2793,8 @@ msgstr " --src – Neste pakke er ein kjeldepakke (same som «-s»).\n
#: ../urpmq:66
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources – Gi alle kjeldepakkar før nedlasting (berre for «root»-"
"brukar).\n"
@@ -2766,7 +2802,8 @@ msgstr ""
#: ../urpmq:68
#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --ignorearch – Tillèt førespurnad etter pakkar for andre arkitekturar.\n"
+msgstr ""
+" --ignorearch – Tillèt førespurnad etter pakkar for andre arkitekturar.\n"
#: ../urpmq:72
#, c-format
@@ -2801,52 +2838,56 @@ msgstr ""
" --whatrequires-recursive\n"
" – Utvida omvendt søk (òg virtuelle pakkar).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p – Tillèt søk i tilbod for å finna pakke.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
-msgstr " -c – Fullstendig oversikt over pakken som skal fjernast.\n"
+msgstr ""
+" -c – Fullstendig oversikt over pakken som skal fjernast.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d – Utvid spørjing til pakkeavhengnader.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g – Vis òg grupper med namnet.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i – Vis nyttig informasjon i lettlesbart format.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l – Vis oversikt over filer i pakken.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m – Det same som «-du».\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p – Tillèt søk i tilbod for å finna pakke.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r – Vis òg versjonsinformasjon med namnet.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s – Neste pakke er ein kjeldepakke (same som «--src»).\n"
+msgstr ""
+" -s – Neste pakke er ein kjeldepakke (same som «--src»).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2855,56 +2896,63 @@ msgstr ""
" -u – Fjern pakkar viss nyare versjonar allereie er "
"installerte.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y – Bruk òg ikkje-ordrett søk (same som «-fuzzy»).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y – som «-y», men ikkje skil mellom store og små bokstavar.\n"
+msgstr ""
+" -Y – som «-y», men ikkje skil mellom store og små bokstavar.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " namn og rpm-filer gitt på kommandolinja vert førespurd.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "Kan berre bruka «--list-nodes« saman med «--parallel»."
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "Inga «hdlist» for mediet «%s». Berre delvis resultat for pakken «%s»."
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "Inga «hdlist» for mediet «%s». Berre delvis resultat for pakkane «%s»."
-#: ../urpmq:364
-#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgstr "Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
-
#: ../urpmq:365
#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr "Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
+msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
+msgstr ""
+"Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakken «%s»."
-#: ../urpmq:416
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "Fann ikkje filliste.\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"Inga «hdlist» for mediet «%s». Kan ikkje visa resultat for pakkane «%s»."
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Fann ikkje endringslogg.\n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Vil du halda fram med installeringa av den %d pakken? (%d MB)"
+#~ msgstr[1] "Vil du halda fram med installeringa av dei %d pakkane? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Fann ikkje filliste.\n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d pakkar – %d MB)"
@@ -3077,4 +3125,3 @@ msgstr "Fann ikkje endringslogg.\n"
#~ msgid "The following package names were assumed: %s"
#~ msgstr "Antok desse pakkenamna: %s"
-
diff --git a/po/pa_IN.po b/po/pa_IN.po
index cd4734c8..b6256437 100644
--- a/po/pa_IN.po
+++ b/po/pa_IN.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-03-23 21:55+0530\n"
"Last-Translator: Kanwaljeet Singh Brar <kanwaljeetbrar@yahoo.co.in>\n"
"Language-Team: Panjabi <fedora-trans-pa@redhat.com>\n"
@@ -17,7 +17,7 @@ msgstr ""
"X-Generator: KBabel 1.9.1\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
@@ -27,7 +27,7 @@ msgstr "RPM ਇੰਸਟਾਲੇਸ਼ਨ"
msgid "Error: unable to find file %s, will cancel operation"
msgstr ""
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "ਠੀਕ ਹੈ(_O)"
@@ -93,7 +93,7 @@ msgstr "ਇੰਸਟਾਲ(_I)"
msgid "_Save"
msgstr "ਸੰਭਾਲੋ(_S)"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "ਰੱਦ(_C)"
@@ -103,29 +103,29 @@ msgstr "ਰੱਦ(_C)"
msgid "Choose location to save file"
msgstr "ਫਾਇਲ਼ ਸੰਭਾਲਣ ਲਈ ਟਿਕਾਣਾ ਦਿਓ"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"ਅਣਜਾਣ ਚੋਣ '%s' ਹੈ\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਇੰਤਜ਼ਾਰ ਕਰੋ..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "ਪà©à¨°à¨¬à©°à¨§à¨• (root) ਬਣਨਾ ਪਵੇਗਾ"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, fuzzy, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -136,42 +136,42 @@ msgstr ""
"%s\n"
"ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "ਚੇਤਾਵਨੀ"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "ਠੀਕ ਹੈ"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
msgstr ""
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਦੀ ਲੋੜ ਹੈ:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "ਛੱਡੋ(_A)"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, fuzzy, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -182,41 +182,48 @@ msgstr ""
"%s\n"
"ਕੀ ਜਾਰੀ ਰੱਖਣਾ ਹੈ?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, fuzzy, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, fuzzy, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
-msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ ਕਰਨ ਲਈ, ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ (%d ਮੈਬਾ)"
+msgstr ""
+"ਨਿਰਭਰਤਾ ਸਮਾਪਤ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ:\n"
+"%s\n"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr ""
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] ""
+msgstr[1] ""
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "ਪੈਕੇਜ ਇੰਸਟਾਲੇਸ਼ਨ..."
-#: ../gurpmi2:219 ../urpmi:608
+#: ../gurpmi2:227 ../urpmi:613
#, c-format
msgid "unable to get source packages, aborting"
msgstr "ਸਰੋਤ ਪੈਕੇਜ ਪà©à¨°à¨¾à¨ªà¨¤ ਕਰਨ ਤੋਂ ਅਸਫਲ, ਅਧੂਰਾ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "ਕਿਪਾ ਕਰਕੇ \"%s\" ਨਾਂ ਮਾਧਿਅਮ [%s] ਜੰਤਰ ਵਿੱਚ ਪਾਓ"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "`%s' ਪੈਕੇਜ ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -228,7 +235,7 @@ msgstr ""
"%s\n"
"ਕੀ ਤà©à¨¸à©€à¨‚ ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਰੱਖਣੀ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -239,37 +246,37 @@ msgstr ""
"%s\n"
"ਤà©à¨¸à©€à¨‚ ਆਪਣੇ urpmi ਡਾਟਾਬੇਸ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰ ਸਕਦੇ ਹੋ"
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "ਤਿਆਰ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ...."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "`%s' (%s/%s) ਪੈਕੇਜ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "ਸਮਾਪਤ(_D)"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "ਇੰਸਟਾਲੇਸ਼ ਸਮਾਪਤ"
@@ -318,63 +325,63 @@ msgstr "ਸਿਰਫ਼ ਪà©à¨°à¨¬à©°à¨§à¨• ਨੂੰ ਪੈਕੇਜ ਇੰਸà¨
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rpm ਫਾਇਲ [%s] ਪà©à¨°à¨¾à¨ªà¨¤ ਕਰਨ ਲਈ ਅਸਫਲ..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...ਪà©à¨°à¨¾à¨ªà¨¤à©€ ਹੋਈ"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...ਪà©à¨°à¨¾à¨ªà¨¤à©€ ਅਸਫਲ: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm ਫਾਇਲ [%s] ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:149
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ਫਾਇਲ [%s] ਵਿੱਚ \"%s\" ਨੂੰ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "rpm ਫਾਇਲ ਰਜਿਸਟਰ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "ਸਥਾਨਕ ਪੈਕੇਜ ਰਜਿਸਟਰ ਕਰਨ ਦੌਰਾਨ ਗਲਤੀ"
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -394,27 +401,27 @@ msgstr ""
msgid "You need to be root to use --use-distrib"
msgstr "ਤà©à¨¹à¨¾à¨¨à©‚à©° ਇਸ ਕਮਾਂਡ ਚਲਾਉਣ ਲਈ ਰੂਟ(root) ਬਣਨਾ ਪਵੇਗਾ !\n"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: rpm ਫਾਇਲ \"%s\" ਪੜੀ ਨਹੀਂ ਜਾ ਸਕਦੀ\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
msgstr ""
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
msgstr ""
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
@@ -439,7 +446,7 @@ msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ਸੰਰਚਨਾ ਫਾਇਲ [%s] ਲਿਖਣ ਤੋਂ ਅਸਫਲ"
@@ -452,12 +459,12 @@ msgstr ""
#: ../urpm/download.pm:112
#, c-format
msgid "User name:"
-msgstr ""
+msgstr "ਉਪਭੋਗਤਾ ਨਾਂ:"
#: ../urpm/download.pm:112
#, c-format
msgid "Password:"
-msgstr ""
+msgstr "ਗà©à¨ªà¨¤-ਕੋਡ:"
#: ../urpm/download.pm:185
#, c-format
@@ -569,7 +576,7 @@ msgstr "ਇੱਕੋ rpm ਫਾਇਲ ਨਾਂ \"%s\" ਨਾਲ ਕਈ ਪੈà¨
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ਮà©à©±à¨² \"%s\" ਤੇ [%s] ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "\"%s\" ਦੀ list ਫਾਇਲ ਲਈ ਪਹà©à©°à¨š ਤੋਂ ਅਸਫਲ ਹੈ, ਮਾਧਿਅਮ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
@@ -681,7 +688,7 @@ msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
@@ -704,7 +711,7 @@ msgstr "ਚੇਤਾਵਨੀ: %s ਲਈ md5sum MD5SUM ਫਾਇਲ ਉਪਲੱ
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "ਮੌਜੂਦਾ ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਦਾ md5sum ਕੱਢਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -712,102 +719,102 @@ msgid ""
msgstr ""
"ਵà©à¨°à¨šà©à¨…ਲ ਜੰਤਰ \"%s\" ਲਈ ਪà©à¨°à¨­à¨¾à¨¶à¨¤ hdlist ਜਾਂ list ਫਾਇਲ ਨਹੀਂ ਹੋਣੀ ਚਾਹੀਦੀ, ਮਾਧਿਅਮ ਅਣਡਿੱਠਾ"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "ਵà©à¨°à¨šà©à¨…ਲ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਠੀਕ url ਚਾਹੀਦਾ ਹੈ, ਮਾਧਿਅਣ ਅਣਡਿੱਠਾ"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "ਗਲਤ rpm ਫਾਇਲ ਨਾਂ [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "\"%s\" ਲਈ ਫਾਇਲ ਸੂਚੀ ਲੱਭਣ ਤੋਂ ਅਸਫਲ ਹੈ, ਮਾਧਿਅਮ ਅਧੂਰਾ ਛੱਡਿਆ"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "ਨਾ-ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਚà©à¨£à¨¨ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਸੰਸਲੇਸ਼ਕ ਫਾਇਲ ਬਣਾਈ"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" ਦੀ hdlist ਫਾਇਲ ਲਈ ਪਹà©à©°à¨š ਤੋਂ ਅਸਫਲ ਹੈ, ਮਾਧਿਅਮ ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "\"%s\" ਦੀ hdlist ਫਾਇਲ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ਼"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "ਮਾਧਿਅਮ \"%s\" ਪਹਿਲਾਂ ਹੀ hdlist ਰਾਹੀਂ ਵਰਤੋਂ ਅਧੀਨ ਹੈ, ਮਾਧਿਅਮ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "ਮਾਧਿਅਮ \"%s\" ਪਹਿਲਾਂ ਹੀ list ਰਾਹੀਂ ਵਰਤੋਂ ਅਧੀਨ ਹੈ, ਮਾਧਿਅਮ ਛੱਡਿਆ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਬਚਣ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਜਾਦੀ ਹੈ, ਅਧੂਰਾ ਛੱਡਿਆ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ \"%s\" ਲਈ ਕਈ ਮਾਊਟ ਥਾਂਵਾਂ ਹਨ"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "\"%s\" ਨੂੰ ਹਟਾਉਣਯੋਗ ਜੰਤਰ ਵਾਂਗ ਲਵੋ"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "ਮਾਧਿਅਮ \"%s\" ਇੱਕ ISO ਪà©à¨°à¨¤à©€à¨¬à¨¿à©°à¨¬ ਹੈ, ਮਾਊਟ on-the-fly ਦੇ ਤੌਰ ਤੇ ਕੀਤਾ ਜਾਵੇਗਾ"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "\"%s\" ਲਈ ਵੱਖਰੇ ਹਟਾਉਣਯੋਗ ਜੰਤਰ [%s] ਵਰਤ ਕੇ"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ਹਟਾਉਣਯੋਗ ਮਾਧਿਅਮ \"%s\" ਲਈ ਮਾਰਗ-ਨਾਂ ਪà©à¨°à¨¾à¨ªà¨¤ ਕਰਨ ਤੋਂ ਅਸਫਲ"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "ਸੰਰਚਨਾ ਫਾਇਲ਼ [%s] ਲਿਖੋ"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "use-distrib ਢੰਗ ਨਾਲ ਸਮਾਂਤਰ ਢੰਗ ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ ਹੈ"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "ਸਮਾਂਤਰ ਢੰਗ ਲਈ ਸਬੰਧਤ ਮਾਧਿਅਮ ਵਰਤ ਕੇ: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -816,144 +823,144 @@ msgstr ""
"--synthesis ਨੂੰ --media, --excludemedia, --sortmedia, --update ਜਾਂ --parallel "
"ਨਹੀਂ ਵਰਤਿਆ ਜਾ ਸਕਦਾ"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "ਖੋਜ ਸ਼à©à¨°à©‚: %s ਅੰਤ: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ਨਿਰਭਰਤਾ ਦੇ ਦੂਜੇ ਪੜਾ ਲਈ ਜਾਂਚ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "ਪੈਕੇਜ %s ਛੱਡਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ਪੈਕੇਜ %s ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੀ ਬਜਾਠਇੰਸਟਾਲ ਕੀਤਾ ਜਾਵੇਗਾ"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "ਮਾਧਿਅਮ \"%s\" ਪਹਿਲਾਂ ਹੀ ਮੌਜੂਦ ਹੈ"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "ਵà©à¨°à¨šà©à¨…ਲ ਮਾਧਿਅਮ ਸਥਾਨਕ ਹੋਣਾ ਚਾਹੀਦਾ ਹੈ"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਸਿਰਲੇਖ ਵੇਖੇ ਜਾ ਰਹੇ ਹਨ"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਖੋਲਣ ਲ਼ਈ ਅਸਫਲੇ"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hdlists ਫਾਇਲ ਪà©à¨°à¨¾à¨ªà¨¤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb ਖੋਲਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ਪਹਿਲੇ ਇੰਸਟਾਲੇਸ਼ਨ ਮਾਧਿਅਮ ਨੂੰ ਕੋਲਣ ਲ਼ਈ ਅਸਫਲ (ਕੋਈ hdlists ਫਾਇਲ ਨਹੀਂ ਲੱਭੀ)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "ਨਾ-ਮੌਜੂਦ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਚà©à¨£à¨¨ ਦੀ ਕੋਸ਼ਿਸ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "ਕਈ ਮਾਧਿਅਮ ਚà©à¨£à©‡ ਜਾ ਰਹੇ ਹਨ: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ urpmi ਮà©à©œ-ਸੰਰਚਨਾ"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...ਮà©à©œ-ਸੰਰਚਨਾ ਅਸਫਲ"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "ਮà©à©œ ਸੰਰਚਨਾ ਹੋਈ"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "ਮਾਧਿਅਮ \"%s\" ਚà©à¨£à¨¿à¨† ਨਹੀਂ ਜਾ ਸਕਿਆ"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ਸ਼ੰਸਲੇਸ਼ਨ ਫਾਇਲ [%s] ਪੜਤਾਲ ਜਾਰੀ"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "hdlist [%s] ਨਿਰਮਾਣ ਜਾਰੀ"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -962,77 +969,77 @@ msgstr ""
"ਮਾਧਿਅਮ \"%s\" ਲਈ ਸੰਸਲੇਸ਼ਣ ਫਾਇਲ ਬਣਾਉਣ ਲਈ ਅਸਫਲ ਹੈ। ਤà©à¨¹à¨¾à¨¡à©€ hdlist ਫਾਇਲ ਨਿਕਾਰਾ ਹੋ ਸਕਦੀ "
"ਹੈ।"
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਜਾਂ ਸੰਸਲੇਸ਼ਣ ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...ਨਕਲ ਅਸਫਲ"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਵੇਰਵਾ ਫਾਇਲ ਦੀ ਨਕਲ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...ਨਕਲ ਹੋਈ"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (ਫਾਇਲ ਸ਼ੱਕੀ ਰੂਪ ਵਿੱਚ ਛੋਟੀ ਹੈ)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਨਕਲਾਂ ਦੇ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] ਦੀ ਨਕਲ ਅਸਫਲ (md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "ਪà©à¨°à¨¾à¨ªà¨¤ ਸਰੋਤ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਣ) ਦਾ md5sum ਕੱਢਿਆ ਜਾਦਾ ਹੈ"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...ਪà©à¨°à¨¾à¨ªà¨¤à©€ ਅਸਫਲ: md5sum ਮੇਲ ਨਹੀਂ ਖਾਂਦਾ"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] ਤੇ ਕੋਈ rpm ਫਾਇਲਾਂ ਨਹੀਂ ਲੱਭੀਆਂ ਹਨ"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "[%s] ਤੋਂ rpm ਫਾਇਲਾਂ ਪੜੀਆਂ ਜਾ ਰਹੀਆਂ ਹਨ"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s] ਲਈ rpm ਫਾਇਲਾਂ ਪà©à¨°à¨¾à¨ªà¨¤ ਕਰਨ ਲਈ ਅਸਫਲ: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "ਕੋਈ rpm ਨਹੀਂ ਪੜਿਆ"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1042,78 +1049,78 @@ msgstr ""
"ਮਾਧਿਅਮ \"%s\" ਲਈ ਪਹà©à©°à¨š ਆਯੋਗ,\n"
"ਇਹ ਤਾਂ ਹੋ ਸਕਦਾ ਹੈ, ਜੇਕਰ ਤà©à¨¸à©€à¨‚ ਮਾਧਿਅਮ ਬਣਾਉਣ ਦੌਰਾਨ ਡਾਇਰੈਕਟਰੀ ਖà©à¨¦ ਮਾਊਟ ਕੀਤੀ ਹੈ।"
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" ਲਈ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਪà©à¨°à¨¾à¨ªà¨¤ ਕੀਤੀ ਜਾ ਰਹੀ ਹੈ..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "%s ਵਾਂਗ hdlist (ਜਾਂ ਸੰਸਲੇਸ਼ਨ) ਖੋਜੀ ਗਈ"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਲਈ hdlist ਫਾਇਲ ਨਹੀਂ ਮਿਲੀ"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕà©à©°à¨œà©€ ਫਾਇਲ ਵੇਖੀ ਜਾਦੀ ਹੈ..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...\"%s\" ਦੀ ਸਰਵਜਨਕ ਕà©à©°à¨œà©€ ਤੋਂ %s ਕà©à©°à¨œà©€ ਆਯਾਤੀ ਕੀਤੀ"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" ਦੀ ਸਵਰਜਨਕ ਕà©à©°à¨œà©€ ਆਯਾਤ ਕਰਨੀ ਅਸਫਲ"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਲਈ list ਫਾਇਲ ਲਿਖੀ ਜਾ ਰਹੀ ਹੈ"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "ਮਾਧਿਅਮ %s ਸ਼ਾਮਲ"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" ਦੀ hdlist ਫਾਇਲ ਪਾਰਸ ਕਰਨ ਲਈ ਅਸਫਲ਼"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" ਮਾਧਿਅਮ ਦੀ ਸੰਸਲੇਸ਼ਨ ਫਾਇਲ ਪੜਨ ਦੌਰਾਨ ਸਮੱਸਿਆ"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਤੋਂ ਸਿਰਲੇਖ ਵੇਖੇ ਜਾ ਰਹੇ ਹਨ"
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "ਮà©à¨†à¨«à©€, ਗਲਤ ਚੋਣ, ਮà©à©œ ਕੋਸ਼ਿਸ ਕਰੋ\n"
@@ -1149,8 +1156,8 @@ msgid "unmounting %s"
msgstr "%s ਅਨਮਾਊਟ ਕੀਤਾ ਜਾਦਾ ਹੈ"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
-#, c-format
-msgid "medium \"%s\" is not selected"
+#, fuzzy, c-format
+msgid "medium \"%s\" is not available"
msgstr "ਮਾਧਿਅਮ \"%s\" ਚà©à¨£à¨¿à¨† ਨਹੀਂ ਜਾ ਸਕਿਆ"
#: ../urpm/removable.pm:143
@@ -1168,47 +1175,47 @@ msgstr "ਨਾ-ਠੀਕ ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਹਟਾਉਣਯà
msgid "unable to access medium \"%s\""
msgstr "ਮਾਧਿਅਮ \"%s\" ਨੂੰ ਵਰਤਣ ਲਈ ਅਸਫਲ"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "ਕੋਈ ਪੈਕੇਜ %s ਨਾਂ ਨਾਲ ਨਹੀਂ"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਵਿੱਚ %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "ਗà©à©°à¨® %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "ਨਾ-ਪੂਰਾ %s ਹੋਣ ਕਰਕੇ"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "%s ਨੂੰ ਵਧਾਉਣ ਦੀ ਕੋਸ਼ਿਸ ਦੌਰਾਨ"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s ਰੱਖਣ ਲਈ"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s ਨੂੰ ਇੰਸਟਾਲ ਕਰਨ ਲਈ"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s ਨਾਲ ਅਪਵਾਦ ਕਰਕੇ"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "ਨਾ-ਮੰਗੇ"
@@ -1352,23 +1359,32 @@ msgstr "ਹਟਾਉਣ ਲਈ ਕà©à¨ ਨਹੀਂ"
msgid "Checking to remove the following packages"
msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਹਟਾਉਣ ਲਈ ਪੜਤਾਲ ਜਾਰੀ ਹੈ"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਠਜਾਣਗੇ (%d ਮੈਬਾ)"
+msgstr[1] "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਠਜਾਣਗੇ (%d ਮੈਬਾ)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ, %d ਪੈਕੇਜ ਹਟਾਠਜਾਣਗੇ (%d ਮੈਬਾ)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
-msgid "Remove %d packages?"
-msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+msgstr[1] "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "ਹਟਾਉਣਾ ਅਸਫਲ"
@@ -1623,7 +1639,7 @@ msgstr " --verbose - verbose mode.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - list files in package.\n"
-#: ../urpmf:82 ../urpmq:90
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - print version, release and arch with name.\n"
@@ -1633,12 +1649,12 @@ msgstr " -f - print version, release and arch with name.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s ਤੇ ਖਾਸ ਵਾਤਾਵਰਣ ਦੀ ਵਰਤੋਂ ਕਰਕੇ\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1647,7 +1663,7 @@ msgstr ""
"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
"ਨਹੀਂ\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "ਤà©à¨¸à©€à¨‚ ਪੈਕੇਜ ਨਾਂ ਖੋਜਣ ਲਈ --name ਵਰਤ ਸਕਦੇ ਹੋ।\n"
@@ -1946,7 +1962,7 @@ msgstr " --noclean - keep rpm not used in cache.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - upgrade only packages with the same architecture.\n"
-#: ../urpmi:152 ../urpmq:87
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - select all matches on command line.\n"
@@ -2016,65 +2032,68 @@ msgstr ""
"ਗਲਤੀ: %s ਸ਼ਾਇਦ ਪੜਨ ਲਈ ਹੀ ਮਾਊਟ ਕੀਤੀ ਗਈ ਹੈ।\n"
"ਧੱਕੇ ਕਰਨ ਲਈ --allow-force ਵਰਤੋਂ।"
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
msgstr ""
-#: ../urpmi:439
+#: ../urpmi:437
#, fuzzy, c-format
msgid "%s: %s (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, fuzzy, c-format
msgid "%s (to upgrade)"
msgstr " (ਨਵੀਨੀਕਰਨ ਕਰਨ ਲਈ)"
-#: ../urpmi:443
+#: ../urpmi:441
#, fuzzy, c-format
msgid "%s: %s (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, fuzzy, c-format
msgid "%s (to install)"
msgstr " (ਇੰਸਟਾਲ ਕਰਨ ਲਈ)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "ਤà©à¨¹à¨¾à¨¡à©€ ਚੋਣ ਕੀ ਹੈ? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, fuzzy, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
-"The following packages can't be installed because they depend on packages\n"
-"that are older than the installed ones:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ, ਕਿਉਕਿ ਇਹ ਪੈਕੇਜਾਂ ਤੇ ਨਿਰਭਰ ਹਨ, ਜੋ ਕਿ\n"
"ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪà©à¨°à¨¾à¨£à©‡ ਹਨ:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:483
+#, c-format
+msgid ""
+"The following packages can't be installed because they depend on packages\n"
+"that are older than the installed ones:\n"
+"%s"
+msgstr ""
"ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ, ਕਿਉਕਿ ਇਹ ਪੈਕੇਜਾਂ ਤੇ ਨਿਰਭਰ ਹਨ, ਜੋ ਕਿ\n"
"ਇੰਸਟਾਲ ਕੀਤਿਆਂ ਤੋਂ ਪà©à¨°à¨¾à¨£à©‡ ਹਨ:\n"
"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, fuzzy, c-format
msgid ""
"\n"
"Continue installation anyway?"
msgstr "ਕਿਸੇ ਤਰਾਂ ਜਾਰੀ ਰਹੋ?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Y/n) "
@@ -2084,56 +2103,65 @@ msgstr " (Y/n) "
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"ਮੰਗੇ ਕà©à¨ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
+"%s"
+msgstr ""
"ਮੰਗੇ ਕà©à¨ ਪੈਕੇਜ ਇੰਸਟਾਲ ਨਹੀਂ ਕੀਤੇ ਜਾ ਸਕਦੇ ਹਨ:\n"
"%s"
-#: ../urpmi:534
+#: ../urpmi:535
#, fuzzy, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
-"The installation cannot continue because the following packages\n"
-"have to be removed for others to be upgraded:\n"
-"%s\n"
-msgstr[0] ""
+msgstr ""
"ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਨਹੀਂ ਰਹਿ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਨੂੰ\n"
"ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
"%s\n"
-msgstr[1] ""
+
+#: ../urpmi:537
+#, c-format
+msgid ""
+"The installation cannot continue because the following packages\n"
+"have to be removed for others to be upgraded:\n"
+"%s\n"
+msgstr ""
"ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ ਨਹੀਂ ਰਹਿ ਸਕਦੀ ਹੈ, ਕਿਉਕਿ ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਨੂੰ\n"
"ਹੋਰਾਂ ਦੇ ਨਵੀਨੀਕਰਨ ਲਈ ਹਟਾ ਦਿੱਤਾ ਗਿਆ ਹੈ:\n"
"%s\n"
-#: ../urpmi:541
+#: ../urpmi:544
#, fuzzy, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
-"%s"
-msgstr[0] ""
+msgstr ""
"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
"%s"
-msgstr[1] ""
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
+"%s"
+msgstr ""
"ਹੋਰ ਪੈਕੇਜਾਂ ਦਾ ਨਵੀਨੀਕਰਨ ਕਰਨ ਦੌਰਾਨ ਇਹ ਪੈਕੇਜ ਹਟਾ ਦਿੱਤੇ ਜਾਣਗੇ:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
msgstr ""
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2142,100 +2170,111 @@ msgstr ""
"ਤà©à¨¹à¨¾à¨¨à©‚à©° ਇਹ ਨਿਰਭਰਤਾ ਹੱਲ਼ ਕਰਨ ਲਈ ਪà©à¨°à¨¬à©°à¨§à¨• (root) ਹੋਣਾ ਲਾਜ਼ਮੀ ਹੈ:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "ਕਿਰਪਾ ਕਰਕੇ ਤਿਆਰ ਹੋਣ ਤੇ Enter ਦਬਾਓ..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "ਰੱਦ ਕਰੋ"
-#: ../urpmi:666
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-msgstr[1] "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
+msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "ਹੇਠ ਦਿੱਤੇ ਪੈਕੇਜਾਂ ਤੇ ਗਲਤ ਦਸਤਖਤ ਹਨ"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "ਕੀ ਤà©à¨¸à©€à¨‚ ਇੰਸਟਾਲੇਸ਼ਨ ਨਾਲ ਜਾਰੀ ਰਹਿਣਾ ਚਾਹà©à©°à¨¦à©‡ ਹੋ?"
-#: ../urpmi:715
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "%s ਵੰਡਿਆ ਜਾਦਾ ਹ"
-#: ../urpmi:729
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "%s ਨੂੰ %s ਤੋਂ ਇੰਸਟਾਲ ਕੀਤਾ ਜਾਦਾ ਹੈ"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s ਇੰਸਟਾਲੇਸ਼ਨ ਜਾਰੀ"
-#: ../urpmi:756
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਅਸਫਲ ਹੋਈ"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ਬਿਨਾਂ ਨਿਰਭਰਤਾਂ ਦੇ ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਕੋਸ਼ਿਸ ਕਰਨੀ ਹੈ? (y/N) "
-#: ../urpmi:780
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਨੂੰ ਧੱਕੇ ਨਾਲ ਵਰਤਣਾ ਹੈ (--force)? (y/N) "
-#: ../urpmi:819
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
+msgstr[1] "%d ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਚਾਰ ਅਸਫਲ"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸੰਭਵ ਹੈ"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-msgstr[1] "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpmi:843
+#: ../urpmi:839
+#, fuzzy, c-format
+msgid "Packages %s are already installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-msgstr[1] "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
-#: ../urpmi:863
+#: ../urpmi:843
+#, fuzzy, c-format
+msgid "Packages %s can not be installed"
+msgstr "ਪੈਕੇਜ ਪਹਿਲਾਂ ਹੀ ਇੰਸਟਾਲ ਹਨ"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi ਮà©à©œ ਚਾਲੂ"
@@ -2344,17 +2383,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - clean headers cache directory.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - quiet mode.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - verbose mode.\n"
@@ -2487,8 +2526,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2546,12 +2587,12 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"ਵਰਤੋਂ: urpmi.removemedia [-a] <name> ...\n"
+"ਵਰਤੋਂ: urpmi.removemedia (-a | <name> ...)\n"
"ਜਿੱਥੇ ਕਿ <name> ਮਾਧਿਅਮਾ ਦਾ ਨਾਂ ਹੈ।\n"
#: ../urpmi.removemedia:41
@@ -2613,26 +2654,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr " --no-ignore - don't update, mark the media as enabled.\n"
#: ../urpmi.update:47
+#, fuzzy, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --no-probe - do not try to find any synthesis or\n"
+" hdlist file.\n"
+
+#: ../urpmi.update:48
#, c-format
msgid " -a - select all non-removable media.\n"
msgstr " -a - select all non-removable media.\n"
-#: ../urpmi.update:49
-#, c-format
-msgid " -f - force generation of hdlist files.\n"
+#: ../urpmi.update:50
+#, fuzzy, c-format
+msgid " -f - force updating synthesis/hdlist\n"
msgstr " -f - force generation of hdlist files.\n"
-#: ../urpmi.update:70
+#: ../urpmi.update:71
#, c-format
msgid "Only superuser is allowed to update media"
msgstr "ਸਿਰਫ਼ ਪà©à¨°à¨¬à©°à¨§à¨•à¨¾à¨‚ ਨੂੰ ਹੀ ਨਵੀਨੀਕਰਨ ਮਾਧਿਅਮ ਵਰਤਣ ਦੀ ਇਜ਼ਾਜਤ ਹੈ"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr "ਕà©à¨ ਵੀ ਨਵੀਨੀਕਰਨ ਨਹੀਂ (ਇੱਕ ਮਾਧਿਅਮ ਸ਼ਾਮਲ ਕਰਨ ਲਈ urpmi.addmedia ਵਰਤੋ)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2641,17 +2690,17 @@ msgstr ""
"ਨਵੀਨੀਕਰਨ ਲਈ ਇੰਦਰਾਜ਼ ਗà©à©°à¨® ਹੈ\n"
"(%s ਵਿੱਚੋਂ ਇੱਕ)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "ignoring media %s"
msgstr "ਮਾਧਿਅਮ %s ਅਣਡਿੱਠਾ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ"
-#: ../urpmi.update:101
+#: ../urpmi.update:102
#, c-format
msgid "enabling media %s"
msgstr "ਮਾਧਿਅਮ %s ਯੋਗ ਕੀਤਾ ਜਾਦਾ ਹੈ"
@@ -2754,65 +2803,66 @@ msgstr " --changelog - print changelog.\n"
msgid " --summary, -S - print summary.\n"
msgstr " --summary - print tag summary: summary.\n"
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr " --whatrequires - reverse search to what requires package.\n"
+
#: ../urpmq:88
+#, fuzzy, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr " -R - reverse search to what requires package.\n"
+
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - search in provides to find package.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - complete output with package to be removed.\n"
-#: ../urpmq:89
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extend query to package dependencies.\n"
-#: ../urpmq:91
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - print groups with name also.\n"
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - print useful information in human readable form.\n"
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - list files in package.\n"
-#: ../urpmq:94
-#, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr ""
-" -P - do not search in provides to find package (default).\n"
-
-#: ../urpmq:95
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - search in provides to find package.\n"
+#: ../urpmq:99
+#, fuzzy, c-format
+msgid " -m - equivalent to -du\n"
+msgstr " -q - quiet mode.\n"
-#: ../urpmq:96
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - print version and release with name also.\n"
-#: ../urpmq:97
-#, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -R - reverse search to what requires package.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -R - reverse search to what requires package.\n"
-
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - next package is a source package (same as --src).\n"
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2821,51 +2871,82 @@ msgstr ""
" -u - remove package if a more recent version is already "
"installed.\n"
-#: ../urpmq:101
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impose fuzzy search (same as --fuzzy).\n"
-#: ../urpmq:102
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - like -y, but forces to match case-insensitively.\n"
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " ਕਮਾਂਡ ਸਤਰ ਤੇ ਦਿੱਤੇ ਨਾਂ ਜਾਂ rpm ਫਾਇਲਾਂ ਬਾਰੇ ਖੋਜ ਕੀਤੀ ਜਾਦੀ ਹੈ।\n"
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ਨੂੰ --parallel ਨਾਲ ਹੀ ਵਰਤਿਆ ਜਾ ਸਕਦਾ"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, fuzzy, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
+"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
+"ਨਹੀਂ\n"
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
-#, c-format
-msgid "No filelist found\n"
-msgstr "ਕੋਈ filelist ਨਹੀਂ\n"
+#: ../urpmq:366
+#, fuzzy, c-format
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
+"ਸੂਚਨਾ: ਕਿਉਕਿ hdlists ਦੀ ਵਰਤੋਂ ਕਰਕੇ ਕੋਈ ਮਾਧਿਅਮ ਨਹੀਂ ਲੱਭਿਆ, ਇਸਕਰਕੇ urpmf ਵਲੋਂ ਕੋਈ ਨਤੀਜਾ "
+"ਨਹੀਂ\n"
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "ਕੋਈ changelog ਨਹੀਂ\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "ਕੋਈ filelist ਨਹੀਂ\n"
+
+#~ msgid "medium \"%s\" is not selected"
+#~ msgstr "ਮਾਧਿਅਮ \"%s\" ਚà©à¨£à¨¿à¨† ਨਹੀਂ ਜਾ ਸਕਿਆ"
+
+#, fuzzy
+#~ msgid "Remove %d packages?"
+#~ msgstr "ਪੈਕੇਜ %s ਹਟਾਇਆ ਜਾਦਾ ਹੈ"
+
+#~ msgid " -f - force generation of hdlist files.\n"
+#~ msgstr " -f - force generation of hdlist files.\n"
+
+#~ msgid ""
+#~ " -P - do not search in provides to find package (default).\n"
+#~ msgstr ""
+#~ " -P - do not search in provides to find package (default).\n"
+
+#~ msgid " -R - reverse search to what requires package.\n"
+#~ msgstr " -R - reverse search to what requires package.\n"
+
+#, fuzzy
+#~ msgid ""
+#~ " -RR - extended reverse search (includes virtual packages).\n"
+#~ msgstr " -R - reverse search to what requires package.\n"
+
#, fuzzy
#~ msgid ""
#~ "To satisfy dependencies, the following package is going to be installed"
diff --git a/po/pt.po b/po/pt.po
index 56507983..c3c17313 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -24,7 +24,7 @@ msgid ""
msgstr ""
"Project-Id-Version: pt\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-03-08 22:29+0000\n"
"Last-Translator: Zé <mmodem00@gmail.com>\n"
"Language-Team: Português <pt@li.org>\n"
@@ -121,12 +121,12 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolha a localização para gravar o ficheiro"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Opção desconhecida %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Nenhum pacote indicado"
@@ -157,7 +157,7 @@ msgstr ""
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -201,13 +201,16 @@ msgstr ""
#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
#, c-format
-msgid "To satisfy dependencies, the following package is going to be installed:"
+msgid ""
+"To satisfy dependencies, the following package is going to be installed:"
msgstr "Para satisfazer as dependências, o seguinte pacote irá ser instalado:"
#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
-msgid "To satisfy dependencies, the following packages are going to be installed:"
-msgstr "Para satisfazer as dependências, os seguintes pacotes irão ser instalados"
+msgid ""
+"To satisfy dependencies, the following packages are going to be installed:"
+msgstr ""
+"Para satisfazer as dependências, os seguintes pacotes irão ser instalados"
#: ../gurpmi2:219 ../urpmi:583
#, c-format
@@ -249,7 +252,7 @@ msgstr ""
"\n"
"Deseja prosseguir a instalação?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -260,7 +263,7 @@ msgstr ""
"%s\n"
"Talvez queira actualizar a sua base de dados urpmi."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "a remover %s"
@@ -280,10 +283,10 @@ msgstr "A instalar o pacote `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Terminado"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Instalação falhada"
+msgid "Installation failed:"
+msgstr "Instalação falhada:"
#: ../gurpmi2:344
#, c-format
@@ -339,63 +342,64 @@ msgstr "Apenas o superutilizador pode instalar pacotes"
msgid "Running urpmi in restricted mode..."
msgstr "A correr o urpmi em modo restrito..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "não é possível abrir rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
-msgstr "encontrados %d cabeçalhos rpm em cache, a remover %d cabeçalhos obsoletos"
+msgstr ""
+"encontrados %d cabeçalhos rpm em cache, a remover %d cabeçalhos obsoletos"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome do ficheiro rpm inválido [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "a transferir o ficheiro rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...transferência terminada."
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...transferência falhada: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "não é possível aceder ao ficheiro rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "não é possível analisar o ficheiro spec %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "não é possível registar o ficheiro rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitectura incompatível para o rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "erro ao registar os pacotes locais"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação é proibida enquanto correr em modo restrito"
@@ -435,7 +439,7 @@ msgstr "Não pode usar %s com %s"
msgid "Too many arguments\n"
msgstr "Demasiados argumentos\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "construir ficheiro de síntese hdlist para a média \"%s\""
@@ -460,7 +464,7 @@ msgstr "não é possível ler o ficheiro de configuração [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "média `%s' definida duas vezes, abortar"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "não é possível escrever o ficheiro de configuração [%s]"
@@ -590,7 +594,7 @@ msgstr "há vários pacotes com o mesmo nome do ficheiro rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "não é possível analisar correctamente [%s] no valor \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "não é possível aceder ao ficheiro lista de \"%s\", média ignorada"
@@ -636,8 +640,10 @@ msgstr "[reempacotamento]"
#: ../urpm/install.pm:110
#, c-format
-msgid "created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
-msgstr "transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
+msgid ""
+"created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)"
+msgstr ""
+"transacção criada para instalar em %s (remove=%d, instala=%d, actualiza=%d)"
#: ../urpm/install.pm:113
#, c-format
@@ -724,7 +730,7 @@ msgstr "aviso: md5sum para %s não disponível no ficheiro MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "a calcular md5sum da fonte hdlist (ou synthesis) existente [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -733,102 +739,102 @@ msgstr ""
"a média virtual \"%s\" não deve ter um hdlist ou um ficheiro lista definido, "
"média ignorada"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "a média virtual \"%s\" deve ter um url claro, média ignorada"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "nome hdlist inválido"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "não é possível encontrar o ficheiro lista para \"%s\", média ignorada"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "\"synthesis\" não deve ser definido (média \"%s\")"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" deve ser definido (média \"%s\")"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "não é possível aceder ao ficheiro hdlist de \"%s\", média ignorada"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "não é possível aceder ao ficheiro lista de \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "a média \"%s\" está a tentar usar um hdlist já usado, média ignorada"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "a média \"%s\" está a tentar usar uma lista já usada, média ignorada"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "a tentar sobrepor a média existente \"%s\", a ignorar"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "demasiados pontos de montagem da média removível \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "considerar o dispositivo removível como \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "A média \"%s\" é uma imagem ISO, irá ser agora montada"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "a usar um dispositivo removível diferente [%s] para \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "não é possível recuperar a localização da média removível \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "escrever %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "escrever ficheiro de configuração [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Não é possível usar o modo paralelo com o modo use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "a usar a média associada para modo paralelo: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -837,146 +843,147 @@ msgstr ""
"--synthesis não pode ser usado com --media, --excludemedia, --sortmedia, --"
"update, --use-distrib ou --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Nota: nenhum hdlist para a média \"%s\", não é possível devolver qualquer "
"resultado"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Inicio de procura: %s fim: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "a executar o segundo passo para calcular as dependências\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "a ignorar o pacote %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "instalaria em vez de actualizar o pacote %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "a média \"%s\" já existe"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "a média virtual precisa ser local"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(ignorado por predefinição)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "a adicionar média \"%s\" antes da média remota \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "a adicionar média \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "não é possível montar a média de distribuição"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "esta localização não parece conter uma distribuição"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "a transferir o ficheiro media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "não é possível analisar o ficheiro media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"não é possível aceder à média de distribuição (nenhum ficheiro media.cfg "
"encontrado)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "a tentar seleccionar uma média \"%s\" não existente"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "seleccionar várias médias: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "a remover a média \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "a reconfigurar urpmi para a média \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...reconfiguração falhada"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro ao gerar nomes do ficheiro: dependência %d não encontrada"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
-msgstr "Erro ao gerar nomes do ficheiro: Não é possível escrever no ficheiro (%s)"
+msgstr ""
+"Erro ao gerar nomes do ficheiro: Não é possível escrever no ficheiro (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "a média \"%s\" está actualizada"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "a examinar o ficheiro hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "a examinar o ficheiro synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "a construir hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -985,77 +992,77 @@ msgstr ""
"Não é possível construir um ficheiro synthesis para a média \"%s\". O seu "
"ficheiro hdlist pode estar corrompido."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema ao ler o ficheiro hdlist ou synthesis da média \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...copia falhada"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "a copiar o ficheiro de descrição de \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...copia terminada"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "a copiar [%s] para a média \"%s\"..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "cópia de [%s] falhada (o ficheiro é suspeitosamente pequeno)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "a calcular o md5sum da fonte hdlist copiada (ou synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copia de [%s] falhada (md5sum diferente)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "a calcular o md5sum da fonte hdlist transferida (ou synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...transferência corrompida: diferença no md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nenhum ficheiro rpm encontrado de [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "a ler os ficheiros rpm de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "não é possível ler os ficheiros rpm de [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "nenhum rpm lido"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1066,78 +1073,78 @@ msgstr ""
"isto pode acontecer se montou manualmente o directório enquanto criava a "
"média."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ficheiro hdlist %s inválido para a média \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "a transferir a fonte hdlist (ou synthesis) de \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist encontrada e testada (ou synthesis) como %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ficheiro hdlist não encontrado para a média \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "a examinar o ficheiro de chaves públicas de \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...chave %s importada do ficheiro de chaves públicas de \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "não é possível importar o ficheiro pubkey de \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "a escrever o ficheiro lista para a média \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "média actualizada \"%s\""
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "não é possível analisar o ficheiro hdlist de \"%s\" "
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ao ler o ficheiro synthesis da média \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "a ler os cabeçalhos da média \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Desculpe, escolha inválida, tente novamente\n"
@@ -1192,47 +1199,47 @@ msgstr "média incoerente \"%s\" marcada como removível mas de facto não é"
msgid "unable to access medium \"%s\""
msgstr "não é possível aceder à média \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nenhum pacote chamado %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes pacotes contêm %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "devido a faltar %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "devido a não satisfazer %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "a tentar promover %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "para guardar %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "devido a conflitos com %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "não pedido"
@@ -1277,22 +1284,27 @@ msgstr " --help - mostra esta mensagem de ajuda.\n"
#: ../urpme:45
#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto - selecciona automaticamente um pacote nas escolhas.\n"
+msgstr ""
+" --auto - selecciona automaticamente um pacote nas escolhas.\n"
#: ../urpme:46
#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - verifica se a remoção pode ser conseguida correctamente.\n"
+msgstr ""
+" --test - verifica se a remoção pode ser conseguida correctamente.\n"
#: ../urpme:47 ../urpmi:109 ../urpmq:67
#, c-format
-msgid " --force - force invocation even if some packages do not exist.\n"
-msgstr " --force - força a execução mesmo que alguns pacotes não existam.\n"
+msgid ""
+" --force - force invocation even if some packages do not exist.\n"
+msgstr ""
+" --force - força a execução mesmo que alguns pacotes não existam.\n"
#: ../urpme:48 ../urpmi:114 ../urpmq:69
#, c-format
msgid " --parallel - distributed urpmi across machines of alias.\n"
-msgstr " --parallel - urpmi distribuído através das máquinas dos apelidos.\n"
+msgstr ""
+" --parallel - urpmi distribuído através das máquinas dos apelidos.\n"
#: ../urpme:49 ../urpmi:146
#, c-format
@@ -1345,7 +1357,8 @@ msgstr " --verbose, -v - modo detalhado.\n"
#: ../urpme:58
#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - selecciona todos os pacotes correspondentes à expressão.\n"
+msgstr ""
+" -a - selecciona todos os pacotes correspondentes à expressão.\n"
#: ../urpme:75
#, c-format
@@ -1377,26 +1390,36 @@ msgstr "Nada a remover"
msgid "Checking to remove the following packages"
msgstr "A verificar para remover os seguintes pacotes"
-#: ../urpme:132
-#, c-format
-msgid "To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Para satisfazer as dependências, os seguintes %d pacotes serão removidos (%d "
+"MB)"
+msgstr[1] ""
"Para satisfazer as dependências, os seguintes %d pacotes serão removidos (%d "
"MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Remover %d pacote?"
msgstr[1] "Remover %d pacotes?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Remoção falhada"
@@ -1436,7 +1459,8 @@ msgstr " --excludemedia - não usa a média indicada, separada por vírgula.\n"
#: ../urpmf:39
#, c-format
-msgid " --literal, -l - don't match patterns, use argument as a literal string.\n"
+msgid ""
+" --literal, -l - don't match patterns, use argument as a literal string.\n"
msgstr ""
" --literal, -l - não combina médias padrões, usa o argumento como uma "
"string literal.\n"
@@ -1444,11 +1468,13 @@ msgstr ""
#: ../urpmf:41 ../urpmi:85 ../urpmq:50
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
-msgstr " --media - usa apenas a média indicada, separada por vírgula.\n"
+msgstr ""
+" --media - usa apenas a média indicada, separada por vírgula.\n"
#: ../urpmf:42 ../urpmi:89 ../urpmq:53
#, c-format
-msgid " --sortmedia - sort media according to substrings separated by comma.\n"
+msgid ""
+" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
" --sortmedia - organiza as médias de acordo com as substrings separadas "
"por vírgula.\n"
@@ -1656,22 +1682,23 @@ msgstr " --vendor - vendedor\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - a média onde o pacote foi encontrado\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -f - mostra a versão, a saída e a arquitectura com o nome.\n"
+msgstr ""
+" -f - mostra a versão, a saída e a arquitectura com o nome.\n"
#: ../urpmf:137
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Formato incorrecto: pode apenas usar uma marca multi-avaliada"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "a usar um ambiente específico em %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1680,7 +1707,7 @@ msgstr ""
"Nota: como nenhuma das médias procuradas usa hdlists, o urpmf não é capaz de "
"devolver qualquer resultado\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Pode querer usar --name para procurar nomes de pacotes.\n"
@@ -1703,7 +1730,8 @@ msgstr ""
#: ../urpmi:88
#, c-format
-msgid " --searchmedia - use only the given media to search requested packages.\n"
+msgid ""
+" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
" --searchmedia - usa apenas a média dada para procurar os pacotes "
"pedidos.\n"
@@ -1719,7 +1747,8 @@ msgstr ""
#: ../urpmi:92 ../urpmq:55
#, c-format
-msgid " --auto-select - automatically select packages to upgrade the system.\n"
+msgid ""
+" --auto-select - automatically select packages to upgrade the system.\n"
msgstr ""
" --auto-select - selecciona automaticamente os pacotes para actualizar o "
"sistema.\n"
@@ -1776,7 +1805,8 @@ msgstr ""
#: ../urpmi:103
#, c-format
msgid " --split-length - small transaction length, default is %d.\n"
-msgstr " --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
+msgstr ""
+" --split-length - pequeno comprimento de transacção, predefinido é %d.\n"
#: ../urpmi:104
#, c-format
@@ -1848,7 +1878,8 @@ msgstr " --curl - usa curl para transferir ficheiros distantes.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
#, c-format
msgid " --prozilla - use prozilla to retrieve distant files.\n"
-msgstr " --prozilla - usa o prozilla para transferir ficheiros distantes.\n"
+msgstr ""
+" --prozilla - usa o prozilla para transferir ficheiros distantes.\n"
#: ../urpmi:124
#, c-format
@@ -1945,7 +1976,8 @@ msgstr " --excludedocs - exclui os ficheiros de documentação.\n"
#: ../urpmi:143
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
-msgstr " --ignoresize - não verifica o espaço em disco antes da instalação\n"
+msgstr ""
+" --ignoresize - não verifica o espaço em disco antes da instalação\n"
#: ../urpmi:144
#, c-format
@@ -1981,12 +2013,14 @@ msgstr " --nolock - não tranca a base de dados rpm.\n"
#: ../urpmi:151
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
-msgstr " --strict-arch - apenas actualiza os pacotes com a mesma arquitectura.\n"
+msgstr ""
+" --strict-arch - apenas actualiza os pacotes com a mesma arquitectura.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - escolhe todas as correspondências na linha de comando.\n"
+msgstr ""
+" -a - escolhe todas as correspondências na linha de comando.\n"
#: ../urpmi:153
#, c-format
@@ -2207,109 +2241,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(testa apenas, a instalação não é executada)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Prosseguir com a instalação de 1 pacote? (%d MB)"
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Prosseguir com a instalação de %d pacote? (%d MB)"
-msgstr[1] "Prosseguir com a instalação dos %d pacotes? (%d MB)"
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Prosseguir com a instalação de 1 pacote? (%d MB)"
+msgstr[1] "Prosseguir com a instalação de 1 pacote? (%d MB)"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Prima Enter quando estiver pronto..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte pacote tem uma assinatura inválida"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes têm assinaturas inválidas"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Deseja continuar a instalação?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalação falhada"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "a distribuir %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "a instalar %s de %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "a instalar %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Instalação falhada:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tentar instalação sem verificar dependências? (s/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Tentar forçar a instalação (--force)? (s/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transacções de instalação falhadas"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transacções de instalação falhadas"
+msgstr[1] "%d transacções de instalação falhadas"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "A instalação é possível"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Os pacotes estão actualizados"
-#: ../urpmi:847
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "O pacote %s já se encontra instalado"
-#: ../urpmi:848
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Os pacote %s já se encontram instalados"
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "O pacote %s não pode ser instalado"
-#: ../urpmi:852
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Os pacotes %s não podem ser instalados"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "a reiniciar urpmi"
@@ -2414,7 +2445,8 @@ msgstr " --nopubkey - não importa a chave pública da média adicionada\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr " --raw - adiciona a média na configuração, mas não a actualiza.\n"
+msgstr ""
+" --raw - adiciona a média na configuração, mas não a actualiza.\n"
#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2439,7 +2471,8 @@ msgstr "não é possível actualizar a média \"%s\"\n"
#: ../urpmi.addmedia:115
#, c-format
msgid "bad <url> (for local directory, the path must be absolute)\n"
-msgstr "<url> inválido (para directório local, a localização precisa ser absoluta)\n"
+msgstr ""
+"<url> inválido (para directório local, a localização precisa ser absoluta)\n"
#: ../urpmi.addmedia:118
#, c-format
@@ -2459,7 +2492,8 @@ msgstr "Não pode criar o ficheiro de configuração [%s]"
#: ../urpmi.addmedia:129
#, c-format
msgid "no need to give <relative path of hdlist> with --distrib"
-msgstr "não é necessário indicar o <localização relativa do hdlist> com --distrib"
+msgstr ""
+"não é necessário indicar o <localização relativa do hdlist> com --distrib"
#: ../urpmi.addmedia:137
#, c-format
@@ -2515,7 +2549,8 @@ msgstr ""
#: ../urpmi.recover:37
#, c-format
-msgid " --list - list transactions since provided date/duration argument\n"
+msgid ""
+" --list - list transactions since provided date/duration argument\n"
msgstr ""
" --list - lista transacções desde que dado o argumento de data/"
"duração\n"
@@ -2567,9 +2602,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "A limpar o directório de reempacotamento [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d ficheiros removidos\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d ficheiros removidos\n"
+msgstr[1] "%d ficheiros removidos\n"
#: ../urpmi.recover:82
#, c-format
@@ -2695,8 +2732,11 @@ msgstr " --no-ignore - não actualiza, marca a média como activada.\n"
#: ../urpmi.update:47
#, c-format
-msgid " --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
-msgstr " --probe-rpms - não usa o ficheiro synthesis/hdlist, usa os ficheiros rpm directamente\n"
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+" --probe-rpms - não usa o ficheiro synthesis/hdlist, usa os ficheiros rpm "
+"directamente\n"
#: ../urpmi.update:48
#, c-format
@@ -2706,7 +2746,8 @@ msgstr " -a - selecciona todas as médias não removíveis.\n"
#: ../urpmi.update:50
#, c-format
msgid " -f - force updating synthesis/hdlist\n"
-msgstr " -f - força a actualização do ficheiros synthesis/hdlist.\n"
+msgstr ""
+" -f - força a actualização do ficheiros synthesis/hdlist.\n"
#: ../urpmi.update:71
#, c-format
@@ -2790,7 +2831,8 @@ msgstr " --list-url - lista as médias disponíveis e as suas url.\n"
#: ../urpmq:62
#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-nodes - lista os nós disponíveis quando a usar --parallel.\n"
+msgstr ""
+" --list-nodes - lista os nós disponíveis quando a usar --parallel.\n"
#: ../urpmq:63
#, c-format
@@ -2799,7 +2841,8 @@ msgstr " --list-aliases - lista as aliases paralelas disponíveis.\n"
#: ../urpmq:64
#, c-format
-msgid " --dump-config - dump the config in form of urpmi.addmedia argument.\n"
+msgid ""
+" --dump-config - dump the config in form of urpmi.addmedia argument.\n"
msgstr ""
" --dump-config - deixa a configuração na forma de argumento urpmi."
"addmedia.\n"
@@ -2807,11 +2850,13 @@ msgstr ""
#: ../urpmq:65
#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
+msgstr ""
+" --src - o próximo pacote é um pacote fonte (o mesmo que -s).\n"
#: ../urpmq:66
#, c-format
-msgid " --sources - give all source packages before downloading (root only).\n"
+msgid ""
+" --sources - give all source packages before downloading (root only).\n"
msgstr ""
" --sources - indica todos os pacotes fonte antes de transferir (apenas "
"root).\n"
@@ -2853,56 +2898,61 @@ msgstr " --whatrequires - reverte a procura para o que o pacote requer.\n"
msgid ""
" --whatrequires-recursive\n"
" - extended reverse search (includes virtual packages).\n"
-msgstr " -R - procura revertida extendida (inclui pacotes virtuais).\n"
+msgstr ""
+" -R - procura revertida extendida (inclui pacotes virtuais).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - procura nos fornecimentos (provides) para encontrar o "
+"pacote.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - listagem completa com os pacotes a ser removidos.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
-msgstr " -d - análise extendida para as dependências dos pacotes.\n"
+msgstr ""
+" -d - análise extendida para as dependências dos pacotes.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - mostra os grupos com o nome também.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - mostra as informações úteis de maneira legível.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista os ficheiros do pacote.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - equivalente a -du\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - procura nos fornecimentos (provides) para encontrar o "
-"pacote.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - mostra a versão e o lançamento com o nome também.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
-msgstr " -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
+msgstr ""
+" -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2911,57 +2961,65 @@ msgstr ""
" -u - remove o pacote se uma versão mais recente já estiver "
"instalada.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -y - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
+msgstr ""
+" -y - impõe uma procura aproximada (o mesmo que --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -Y - como -y, mas força para corresponder sem capitalização.\n"
+msgstr ""
+" -Y - como -y, mas força para corresponder sem capitalização.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
-msgstr " os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
+msgstr ""
+" os nomes ou os ficheiros rpm dados na linha de comando são verificados.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes pode apenas ser usado com --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgstr "nenhum hdlist para a média \"%s\", apenas um resultado parcial do pacote %s"
+msgstr ""
+"nenhum hdlist para a média \"%s\", apenas um resultado parcial do pacote %s"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr "nenhum hdlist para a média \"%s\", apenas um resultado parcial dos pacotes %s"
+msgstr ""
+"nenhum hdlist para a média \"%s\", apenas um resultado parcial dos pacotes %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"nenhum hdlist para a média \"%s\", não é possível devolver qualquer "
"resultado do pacote %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
-msgid "no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"nenhum hdlist para a média \"%s\", não é possível devolver qualquer "
"resultado dos pacotes %s"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nenhuma lista de ficheiros encontrada\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nenhum registo de mudanças (changelog) encontrado\n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Prosseguir com a instalação de %d pacote? (%d MB)"
+#~ msgstr[1] "Prosseguir com a instalação dos %d pacotes? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Nenhuma lista de ficheiros encontrada\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f0a71826..aaecd9cf 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -23,7 +23,7 @@ msgid ""
msgstr ""
"Project-Id-Version: laerte-urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-08-24 11:36-0300\n"
"Last-Translator: \n"
"Language-Team: <pt@li.org>\n"
@@ -122,12 +122,12 @@ msgstr "_Cancelar"
msgid "Choose location to save file"
msgstr "Escolha o local para salvar o arquivo"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Opção desconhecida %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Nenhum pacote especificado"
@@ -158,7 +158,7 @@ msgstr ""
msgid "Warning"
msgstr "Aviso"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -203,8 +203,7 @@ msgstr ""
#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgstr ""
-"Para satisfazer as dependências, o seguinte pacote será instalado:"
+msgstr "Para satisfazer as dependências, o seguinte pacote será instalado:"
#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
#, c-format
@@ -253,7 +252,7 @@ msgstr ""
"\n"
"Deseja continuar com a instalação?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -264,7 +263,7 @@ msgstr ""
"%s\n"
"Você deve atualizar a sua base de dados urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "removendo %s"
@@ -284,10 +283,10 @@ msgstr "Instalando pacote `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Pronto"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "A Instalação falhou"
+msgid "Installation failed:"
+msgstr "A Instalação falhou:"
#: ../gurpmi2:344
#, c-format
@@ -343,63 +342,63 @@ msgstr "Apenas o super-usuário tem permissão para instalar pacotes"
msgid "Running urpmi in restricted mode..."
msgstr "Executando o urpmi no modo restrito..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "incapaz de abrir rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "encontrados %d headers rpm no cache, removendo %d headers obsoletos"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nome rpm inválido [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "buscando o arquivo rpm [%s]...."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...busca completa"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...a busca falhou: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "incapaz de acessar o arquivo rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "incapaz de processar arquivo spec %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "incapaz de registrar arquivo rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Arquitetura incompatível para o rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "erro ao registrar pacotes locais"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Esta operação não é permitida no modo restrito"
@@ -439,7 +438,7 @@ msgstr "Não é possível usar %s com %s"
msgid "Too many arguments\n"
msgstr "Muitos parâmetros\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "construído arquivo de síntese de 'hdlist' para mídia \"%s\""
@@ -464,7 +463,7 @@ msgstr "incapaz de ler o arquivo de configuração [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "mídia `%s' está definida duas vezes, abortando"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "incapaz de gravar o arquivo de configuração [%s]"
@@ -594,7 +593,7 @@ msgstr "existem múltiplos pacotes com o mesmo nome rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "incapaz de ler corretamente [%s] no valor \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "incapaz de acessar a lista de arquivos de \"%s\", mídia ignorada."
@@ -731,7 +730,7 @@ msgstr "aviso: o arquivo MD5SUM não contém o md5sum para %s"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "computando md5sum de fonte 'hdlist' existente (ou síntese) [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -740,102 +739,102 @@ msgstr ""
"mídia virtual \"%s\" não contém o arquivo 'hdlist' ou lista de arquivos; "
"mídia ignorada."
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "mídia virtual \"%s\" precisa ter uma url limpa, mídia ignorada."
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "nome do hdlist inválido"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "incapaz de encontrar a lista para \"%s\", mídia ignorada."
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "\"synthesis\" não deve estar configurado (mídia \"%s\")"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"synthesis\" deve estar configurado (mídia \"%s\")"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "incapaz de acessar a arquivo 'hdlist' de \"%s\", mídia ignorada"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "incapaz de acessar lista de \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "mídia \"%s\" tentou usar um 'hdlist' já usado, mídia ignorada"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "mídia \"%s\" tentou usar uma lista já usada, mídia ignorada."
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "tentando contornar mídia existente \"%s\", evitando"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "muitos pontos de montagem para a mídia removível \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "considerando dispositivos removíveis como \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "A mídia \"%s\" é uma imagem ISO e poderá ser montada automaticamente"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "usando diferentes dispositivos removíveis [%s] para \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "incapaz de buscar caminhos para mídia removível \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "escrito %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "grava o arquivo de configuração [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Não pode usar o modo paralelo com modo 'use-distrib'"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "usando mídias associadas para o modo paralelo: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -844,143 +843,145 @@ msgstr ""
"--synthesis não pode ser usada com --media, -excludemedia, -sortmedia, --"
"update, --use-distrib ou --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
-msgstr "Nota: sem hdlist para a mídia \"%s\", incapaz de retornar qualquer resultado"
+msgstr ""
+"Nota: sem hdlist para a mídia \"%s\", incapaz de retornar qualquer resultado"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Procura inicia em %s e termina em %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "fazendo segundo passo para calcular dependências\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "pulando o pacote %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "é necessário instalar ao invés de atualizar o pacote %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "mídia \"%s\" já existe"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "mídia virtual precisar ser local"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(ignorado por default)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "adicionando mídia \"%s\" antes da mídia remota \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "adicionando a mídia \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "incapaz de montar a mídia da distribuição"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "não foi encontrada uma distribuinão nesta localização"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "recuperando o arquivo media.cfg"
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "incapaz de analisar media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
+msgstr ""
+"incapaz de acessar as mídias da distribuição (media.cfg não encontrado)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tentando selecionar mídia inexistente \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "selecionando múltiplas mídias: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "removendo a mídia \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurando o urpmi para as mídias \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...falha na reconfiguração"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "reconfiguração terminada"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Erro gerando arquivo de nomes: dependência %d não encontrada"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Erro gerando arquivo de nomes: Não foi possível escrever no arquivo (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mídia \"%s\" está atualizada"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinando arquivo hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinando arquivo de síntese [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "Construindo 'hdlist' [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -989,77 +990,77 @@ msgstr ""
"Não foi possível construir o arquivo synthesis para a mídia \"%s\". O "
"arquivo hdlist pode estar corrompido."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema lendo arquivo hdlist ou síntese da mídia \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...falha na cópia"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "Copiando o arquivo de descrição de \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "..cópia terminada"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "copiando [%s] para a mídia \"%s\"..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "cópia de [%s] falhou (arquivo é suspeitamente pequeno)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "computando o md5sum de uma fonte 'hdlist' copiada (ou síntese)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "cópia de [%s] falhou (md5sum não é igual)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "computando o md5sum de uma fonte 'hdlist' recuperada (ou síntese)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr " A aquisição falhou: assinatura md5sum diferente"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nenhum arquivo rpm encontrado em [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lendo arquivos rpms de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "incapaz de ler os arquivos rpm de: [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "nenhum rpm lido"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1070,78 +1071,78 @@ msgstr ""
"verifique se não é necessário montar manualmente o diretório no qual ela foi "
"criada."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "hdlist inválido %s para a mídia \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "Adquirindo a fonte 'hdlist' (ou a síntese) de \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "encontrado 'hdlist' (ou síntese) em %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "Nenhum arquivo 'hdlist' encontrado para a mídia \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinando arquivo de chave pública em \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importando chave %s do arquivo de chaves públicas de \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "incapaz de importar arquivo de chave pública de \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "gravando a lista de arquivos para a mídia \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "mídia atualizada \"%s\""
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "incapaz de atualizar o arquivo hdlist de \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema ao ler arquivo síntese da mídia \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "lendo cabeçalhos da mídia \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "SsYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Desculpe, má escolha, tente novamente\n"
@@ -1196,47 +1197,47 @@ msgstr "mídia inconsistente \"%s\" marcada como removível, porém não é"
msgid "unable to access medium \"%s\""
msgstr "incapaz de acessar a mídia \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nenhum nome de pacote %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Os seguintes pacotes contém %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "devido estar faltando %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "devido a não satisfazer %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "tentando promover %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "para manter %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "para instalar %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "devido a conflitos com %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "não requisitado"
@@ -1383,25 +1384,34 @@ msgstr "Nada para remover"
msgid "Checking to remove the following packages"
msgstr "Verificando para remover os seguintes pacotes"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Para satisfazer as dependências, os pacotes %d serão removidos (%d MB)"
+msgstr[1] ""
+"Para satisfazer as dependências, os pacotes %d serão removidos (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Para satisfazer as dependências, os pacotes %d serão removidos (%d MB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Remover %d pacote?"
msgstr[1] "Remover %d pacotes?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (s/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "A remoção falhou"
@@ -1663,7 +1673,7 @@ msgstr " --vendor - fabricante\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - a mídia onde o pacote foi encontrado\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1675,12 +1685,12 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Formato incorreto: você deve utilizar somente uma opção com múltiplos valores"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "usando o ambiente específico em %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1689,7 +1699,7 @@ msgstr ""
"Nota: se nenhuma mídia encontrada usando hdlists, o urpmf é incapaz de "
"retornar qualquer resultado\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Você poderá usar --name para procurar pelo nome pacote.\n"
@@ -1993,7 +2003,7 @@ msgstr " --nolock - não bloqueia o banco de dados rpm.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - só atualiza os pacotes com a mesma arquitectura.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - seleciona todos os listados na linha de comando.\n"
@@ -2213,109 +2223,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(somente teste, instalações não serão efetivadas)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Proceder a instalação de 1 pacote? (%d MB)"
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Proceder a instalação de %d pacote? (%d MB)"
-msgstr[1] "Proceder a instalação de %d pacotes? (%d MB)"
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Proceder a instalação de 1 pacote? (%d MB)"
+msgstr[1] "Proceder a instalação de 1 pacote? (%d MB)"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Tecle Enter quando estiver pronto..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Cancelar"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "O seguinte pacote contém assinaturas erradas"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Os seguintes pacotes contêm assinaturas erradas"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Você deseja continuar a instalação?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "A Instalação falhou"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuindo %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "instalando %s a partir de %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalando %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "A Instalação falhou:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tentar instalar sem checar as dependências? (s/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Forçar instalação (--force)? (s/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instalação falhou"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instalação falhou"
+msgstr[1] "%d instalação falhou"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalação é possível"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Pacotes estão atualizados"
-#: ../urpmi:847
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "Pacote %s já está instalado"
-#: ../urpmi:848
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Pacotes %s já estão instalados"
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "Pacotes %s já estão instalados"
-#: ../urpmi:852
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Pacotes %s não podem ser instalados"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "reiniciando urpmi"
@@ -2366,7 +2373,8 @@ msgstr " --probe-rpms - use arquivos rpm (ao invés de synthesis/hdlist).\n"
#: ../urpmi.addmedia:59
#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
-msgstr " --no-probe - não tentar procurar qualquer arquivo de síntese\n"
+msgstr ""
+" --no-probe - não tentar procurar qualquer arquivo de síntese\n"
" ou arquivo 'hdlist'.\n"
#: ../urpmi.addmedia:61
@@ -2420,8 +2428,7 @@ msgstr " --nopubkey - não importa chave pública da mídia adicionada\n"
#: ../urpmi.addmedia:71
#, c-format
msgid " --raw - add the media in config, but don't update it.\n"
-msgstr ""
-" --raw - adiciona a mídia à configuração, sem atualizá-la.\n"
+msgstr " --raw - adiciona a mídia à configuração, sem atualizá-la.\n"
#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
@@ -2570,9 +2577,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Limpando diretório de reempacotamento [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d arquivos removidos\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d arquivos removidos\n"
+msgstr[1] "%d arquivos removidos\n"
#: ../urpmi.recover:82
#, c-format
@@ -2701,7 +2710,8 @@ msgstr " --no-ignore - não atualizar, marcar a mídia como habilitada.\n"
msgid ""
" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
msgstr ""
-" --probe-rpms - não usar synthesis/hdlist, usando arquivos rpm diretamente\n"
+" --probe-rpms - não usar synthesis/hdlist, usando arquivos rpm "
+"diretamente\n"
#: ../urpmi.update:48
#, c-format
@@ -2866,57 +2876,59 @@ msgstr ""
" --whatrequires-recursive\n"
" - busca reversa extendida (inclui pacotes virtuais).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - permite a busca em 'repositórios para encontrar o "
+"pacote.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - lista completa dos pacotes a remover.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - estende a consulta para as dependências dos pacotes.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - imprime grupos, com nome também.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - imprime informações úteis em formato que pode ser lido\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista os arquivos do pacote.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - equivalente a -du\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - permite a busca em 'repositórios para encontrar o "
-"pacote.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - imprime versão e 'release' com nome também.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - o próximo pacote é um pacote fonte (o mesmo que --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2925,59 +2937,65 @@ msgstr ""
" -u - remove um pacote se uma versão mais atual\n"
" já estiver instalada.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impõe uma busca aproximada (igual a --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - como -y, ignorando a distinção de maiúscula/minúscula.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " nomes ou arquivos rpm dados na linha de comando são consultados \n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes só pode ser usado com --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr "sem hdlist para a mídia \"%s\", resultado parcial para o pacote %s"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr "sem hdlist para a mídia \"%s\", resultado parcial para os pacotes %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgstr "sem hdlist para a mídia \"%s\", incapaz de retornar resultados para os pacote %s"
+msgstr ""
+"sem hdlist para a mídia \"%s\", incapaz de retornar resultados para os "
+"pacote %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-"sem hdlist para a mídia \"%s\", incapaz de retornar resultados para os pacotes %s"
-
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Lista de arquivos não encontrada \n"
+"sem hdlist para a mídia \"%s\", incapaz de retornar resultados para os "
+"pacotes %s"
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Arquivo com as alterações não foi encontrado \n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Proceder a instalação de %d pacote? (%d MB)"
+#~ msgstr[1] "Proceder a instalação de %d pacotes? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Lista de arquivos não encontrada \n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d pacotes, %d MB)"
diff --git a/po/ro.po b/po/ro.po
index 7a552110..9871e99e 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-ro\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-10-17 14:38+0300\n"
"Last-Translator: Ovidiu Constantin <ovidiusoft@gmail.com>\n"
"Language-Team: Romanian <rtfs-project@lists.sourceforge.net>\n"
@@ -114,14 +114,14 @@ msgstr "_Renunţă"
msgid "Choose location to save file"
msgstr "Alegeţi locul unde salvez fişierul"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"opţiuni necunoscute '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nu a fost specificată nici o comandă"
@@ -151,7 +151,7 @@ msgstr ""
msgid "Warning"
msgstr "Avertisment"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "OK"
@@ -247,7 +247,7 @@ msgstr ""
"\n"
"Doriţi să continuaţi?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -258,7 +258,7 @@ msgstr ""
"%s\n"
"Probabil ar trebui să actualizaţi baza de date urpmi."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "elimin %s"
@@ -278,9 +278,9 @@ msgstr "Instalarea pachetului `%s' (%s/%s)..."
msgid "_Done"
msgstr "Gata"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalarea a eÅŸuat"
#: ../gurpmi2:344
@@ -337,63 +337,63 @@ msgstr "Doar superutilizatorul poate instala pachete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "nu pot deschide rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nume de fiÅŸier rpm invalid [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "copiere fiÅŸier rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...copierea este terminată"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...copierea eşuată: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nu pot accesa fiÅŸierul rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nu pot parcurge \"%s\" în fişierul [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "nu pot înregistra fişierul rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "eroare la înregistrarea pachetelor locale"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -433,7 +433,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "am construit fiÅŸierul synthesis pentru mediul \"%s\""
@@ -458,7 +458,7 @@ msgstr "nu pot scrie în fişierul de configurare [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "nu pot scrie în fişierul de configurare [%s]"
@@ -588,7 +588,7 @@ msgstr "există pachete multiple cu acelaşi nume de fişier rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "nu pot parcurge corect [%s] pentru valoarea \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "nu pot accesa fişierul listă pentru \"%s\", ignor mediul"
@@ -725,7 +725,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "calculez md5sum pentru fişierul sursă hdlist (sau synthesis) existent"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -734,107 +734,107 @@ msgstr ""
"mediul virtual \"%s\" nu ar trebui să folosească un hdlist deja definit, "
"mediul este ignorat"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"mediul virtual \"%s\" ar trebui să aibă un URL clar, mediul este ignorat"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nume de fiÅŸier rpm invalid [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "nu pot să găsesc fişierul listă pentru \"%s\", mediul a fost ignorat"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "am construit fiÅŸierul synthesis pentru mediul \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "nu pot accesa fiÅŸierul hdlist pentru \"%s\", ignor mediul"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "nu pot percurge fiÅŸierul hdlist pentru \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"mediul \"%s\" încearcă să folosească un hdlist deja folosit, mediul este "
"ignorat"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"mediul \"%s\" încearcă să folosească o listă deja folosită, mediul este "
"ignorat"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "încerc să sar pentru mediul existent \"%s\", evitare"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "prea multe puncte de montare pentru mediul \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "consider dispozitivul mobil ca \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "folosesc dispozitive mobile diferite [%s] pentru \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "nu pot obţine calea pentru mediul \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "scriere fiÅŸier de configurare [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Nu pot utiliza modul paralel in modul use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "utilizez mediile asociate pentru modul paralel: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -843,144 +843,144 @@ msgstr ""
"--synthesis nu poate fi folosit cu --media, --excludemedia, sortmedia, --"
"update sau --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Caută fonturi instalate"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "efectuez a doua parcurgere pentru a calcula dependenţele\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "salt peste pachetul %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ar fi instalat în loc de actualizare pt. pachetul %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "mediul \"%s\" deja există"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "mediul virtual trebuie să fir local"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "citest antetele de pe mediul \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "elimin mediul \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "nu pot accesa primul mediu de instalare"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "obţin fişierul hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "nu pot deschide rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "nu pot accesa primul mediu de instalare (nu am găsit fişierul hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "se încearcă selectarea unui mediu inexistent \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "selectez medii multiple: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "elimin mediul \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "reconfigurez urpmi pentru mediul \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...reconfigurarea a eÅŸuat"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "reconfigurarea s-a încheiat"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediul \"%s\" nu este selectat"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "examinez fiÅŸierul hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "examinez fiÅŸierul synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "creez hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -989,77 +989,77 @@ msgstr ""
"Nu pot genera fiÅŸierul synthesis pentru mediul \"%s\". FiÅŸierul "
"dumneavoastră hdlist ar putea fi corupt."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problemă la citirea fişierului hdlist/synthesis al mediului \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...copierea a eÅŸuat"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiez fiÅŸierul cu descrieri pentru \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...copierea s-a terminat"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "scriu fişierul listă pentru mediul \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "copierea fiÅŸierului [%s] a eÅŸuat (fiÅŸier suspect de mic)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "calculez ms5sum pt. fişierul sursă hdlist/synthesis copiat"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "copierea [%s] a eÅŸuat (eroare md5sum)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "calculez md5sum a fişierului sursă hdlist/synthesis descărcat"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...copierea eşuată: nepotrivire md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nu a fost găsit nici un fişier rpm de la [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "citesc fiÅŸierele rpm de la [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "nu pot citi fiÅŸierele rpm din [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1070,78 +1070,78 @@ msgstr ""
"asta se poate întampla dacă aţi montat manual directorul când aţi creat "
"mediul."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "copiez hdlist (sau synthesis) sursă pentru \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "am găsit hdlist (sau synthesis) verificat ca %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nu a fost găsit nici un fişier hdlist pentru mediul \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "examinez fişierul cheie publică pentru \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...cheia importată %s din fişierul cheie publică pentru \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nu pot importa fişierul cheie publică pentru \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "scriu fişierul listă pentru mediul \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "am adăugat mediul %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nu pot percurge fiÅŸierul hdlist pentru \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problemă la citirea fişierului synthesis al mediului \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "citest antetele de pe mediul \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "DdYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Aţi ales greşit, încercaţi din nou\n"
@@ -1196,47 +1196,47 @@ msgstr "mediu incoerent \"%s\" marcat ca mobil dar nu este aÅŸa"
msgid "unable to access medium \"%s\""
msgstr "nu pot accesa mediul \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nici un pachet numit %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Următoarele pachete conţin %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "datorită %s lipsă"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "datorită %s nesatisfăcute"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "încerc să promovez %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "pentru a păstra %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "pentru a instala %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "datorita conflictelor cu %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "necerute"
@@ -1387,14 +1387,24 @@ msgstr "Nimic de ÅŸters"
msgid "Checking to remove the following packages"
msgstr "Verific pt. ştergerea următoarelor pachete"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
+msgstr[1] ""
+"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
+msgstr[2] ""
+"Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1402,12 +1412,12 @@ msgstr[0] "ÅŸterg pachetul %s"
msgstr[1] "ÅŸterg pachetul %s"
msgstr[2] "ÅŸterg pachetul %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (D/n) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Ştergere nereuşită"
@@ -1669,7 +1679,7 @@ msgstr " --verbose - mod detaliat.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - listează fişierele din pachet.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - afişează versiune, ediţie şi arhitectură cu nume.\n"
@@ -1679,12 +1689,12 @@ msgstr " -f - afişează versiune, ediţie şi arhitectură cu nume
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "folosind mediul specific pe %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1693,7 +1703,7 @@ msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Puteţi folosi --name pentru a căuta în numele pachetelor.\n"
@@ -2010,7 +2020,7 @@ msgstr " --noclean - păstreză rpm-urile nefolosite în cache.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - selectează toate potrivirile în linia de comandă.\n"
@@ -2218,15 +2228,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2236,92 +2241,95 @@ msgstr[2] ""
msgid "Press Enter when ready..."
msgstr "Apăsaţi Enter când e gata..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Renunţă"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Următoarele pachete au semnături greşite"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Următoarele pachete au semnături greşite"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Doriţi să continuaţi instalarea?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalarea a eÅŸuat"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribui %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalez %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalez %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalarea a eÅŸuat"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Să încerc instalarea fără verificarea dependenţelor? (d/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Încearcă instalarea încă şi mai dur (--force)? (d/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d tranzacţii de instalarea eşuate"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d tranzacţii de instalarea eşuate"
+msgstr[1] "%d tranzacţii de instalarea eşuate"
+msgstr[2] "%d tranzacţii de instalarea eşuate"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalarea este posibilă"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "totul este deja instalat"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "totul este deja instalat"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "totul este deja instalat"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "totul este deja instalat"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "repornesc urpmi"
@@ -2575,8 +2583,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2870,55 +2881,57 @@ msgid ""
msgstr ""
" -R - căutare inversă în lista de dependenţe a pachetului.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - permite căutarea în Provides pentru a găsi pachetul.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - ieşire completă cu pachetul ce va fi şters.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - extinde interogarea la dependenţele pachetelor.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - arată grupurile şi cu nume.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - afişează informaţii utile pentru utilizatorul uman.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - listează fişierele din pachet.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - mod silenţios.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - permite căutarea în Provides pentru a găsi pachetul.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - afişează versiunea şi ediţia cu nume.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - pachetul următor este un pachet sursă (identic cu -src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2927,46 +2940,46 @@ msgstr ""
" -u - şterge pachetul dacă o versiune mai recentă este deja "
"instalată.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - impune căutarea fuzzy (identic cu --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - ca şi -y, dar forţează căutarea ignorând litere mari sau "
"mici.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " numele sau fişierele rpm date în linia de comandă sunt interogate.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes poate fi folosit numai cu --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2974,16 +2987,20 @@ msgstr ""
"Notă: din moment ce nici un mediu căutat foloseşte hdlist, urpmf nu a putut "
"întoarce nici un rezultat\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nu s-a găsit lista de fisiere (filelist)\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nu s-a gasit changelog\n"
+#, fuzzy
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr ""
+#~ "Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Nu s-a găsit lista de fisiere (filelist)\n"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "mediul \"%s\" nu este selectat"
@@ -3371,11 +3388,6 @@ msgstr "Nu s-a gasit changelog\n"
#~ msgstr "nici o intrare relocată în depslist"
#~ msgid ""
-#~ "To satisfy dependencies, the following packages will be removed (%d MB)"
-#~ msgstr ""
-#~ "Pentru a satisface dependenţele, următoarele pachete vor fi şterse (%d MB)"
-
-#~ msgid ""
#~ " --best-output - choose best interface according to the environment:\n"
#~ " X or text mode.\n"
#~ msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 65722498..91af3da8 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-01-22 01:24+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian <ru@li.org>\n"
@@ -106,12 +106,12 @@ msgstr "_Отмена"
msgid "Choose location to save file"
msgstr "Укажите меÑтоположение, где Ñохранить файл"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "ÐеизвеÑÑ‚Ð½Ð°Ñ Ð¾Ð¿Ñ†Ð¸Ñ %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Пакеты не указаны"
@@ -142,7 +142,7 @@ msgstr ""
msgid "Warning"
msgstr "Внимание"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "ОК"
@@ -235,7 +235,7 @@ msgstr ""
"\n"
"Хотите продолжить уÑтановку?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -246,7 +246,7 @@ msgstr ""
"%s\n"
"Возможно вам необходимо обновить базу данных urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "удалÑетÑÑ %s"
@@ -266,10 +266,10 @@ msgstr "УÑтанавливаетÑÑ Ð¿Ð°ÐºÐµÑ‚ `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Готово"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "УÑтановка не удалаÑÑŒ"
+msgid "Installation failed:"
+msgstr "УÑтановка не удалаÑÑŒ:"
#: ../gurpmi2:344
#, c-format
@@ -325,63 +325,63 @@ msgstr "Только Ñуперпользователю разрешаетÑÑ Ñ
msgid "Running urpmi in restricted mode..."
msgstr "ЗапуÑк urpmi в ограниченном режиме..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "невозможно открыть базу данных RPM"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr "в кÑше найдено %d заголовков rpm; удалÑетÑÑ %d уÑтаревших заголовков"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "неверное Ð¸Ð¼Ñ rpm-файла [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "извлекаетÑÑ rpm-файл [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...извлечение выполнено"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...извлечение не удалоÑÑŒ: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "нет доÑтупа к rpm-файлу [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "невозможно разобрать spec-файл %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "невозможно зарегиÑтрировать rpm-файл"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "ÐеÑовмеÑÑ‚Ð¸Ð¼Ð°Ñ Ð°Ñ€Ñ…Ð¸Ñ‚ÐµÐºÑ‚ÑƒÑ€Ð° Ð´Ð»Ñ [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "ошибка региÑтрации локальных пакетов"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Эта Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ Ð·Ð°Ð¿Ñ€ÐµÑ‰ÐµÐ½Ð° при работе в ограниченном режиме"
@@ -421,7 +421,7 @@ msgstr "%s Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать без %s"
msgid "Too many arguments\n"
msgstr "Слишком много аргументов\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "Ñоздан файл hdlist synthesis Ð´Ð»Ñ Ð¸Ñточника \"%s\""
@@ -446,7 +446,7 @@ msgstr "невозможно прочитать конфигурационный
msgid "medium `%s' is defined twice, aborting"
msgstr "иÑточник '%s' определён дважды; оÑтанов"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "невозможно запиÑать конфигурационный файл [%s]"
@@ -576,7 +576,7 @@ msgstr "ÑущеÑтвует неÑколько пакетов Ñ Ð¾Ð´Ð¸Ð½Ð°ÐºÐ¾
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "невозможно корректно разобрать [%s] в \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "нет доÑтупа к файлу ÑпиÑка иÑточника \"%s\"; иÑточник проигнорирован"
@@ -714,7 +714,7 @@ msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr ""
"вычиÑлÑетÑÑ md5-Ñумма ÑущеÑтвующего hdlist (или synthesis) иÑточника [%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -723,108 +723,108 @@ msgstr ""
"виртуальный иÑточник \"%s\" не должен иметь определённый файл hdlist или "
"файл ÑпиÑка; иÑточник проигнорирован"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"виртуальный иÑточник \"%s\" должен Ñодержать пуÑтой url; иÑточник "
"проигнорирован"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "неверное Ð¸Ð¼Ñ hdlist'а"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "невозможно найти файл ÑпиÑка Ð´Ð»Ñ \"%s\"; иÑточник проигнорирован"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "не Ñледует иÑпользовать \"synthesis\" (иÑточник \"%s\")"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "Ñледует иÑпользовать \"synthesis\" (иÑточник \"%s\")"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "нет доÑтупа к файлу hdlist Ð´Ð»Ñ \"%s\"; иÑточник проигнорирован"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "нет доÑтупа к файлу list Ð´Ð»Ñ \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"иÑточник \"%s\" пытаетÑÑ Ð¸Ñпользовать уже иÑпользуемый hdlist; иÑточник "
"проигнорирован"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"иÑточник \"%s\" пытаетÑÑ Ð¸Ñпользовать уже иÑпользуемый ÑпиÑок; иÑточник "
"проигнорирован"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "попытка переопределить ÑущеÑтвующий иÑточник \"%s\"; пропуÑкаетÑÑ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "Ñлишком много точек Ð¼Ð¾Ð½Ñ‚Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð´Ð»Ñ Ñъёмного иÑточника \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "Ñъёмное уÑтройÑтво принимаетÑÑ ÐºÐ°Ðº \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "ИÑточник \"%s\" ÑвлÑетÑÑ ISO образом, будет примонтирован на лету"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "иÑпользуетÑÑ Ð´Ñ€ÑƒÐ³Ð¾Ðµ Ñъёмное уÑтройÑтво [%s] Ð´Ð»Ñ \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "невозможно получить путь к Ñъёмному иÑточнику \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "запиÑан %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "запиÑан конфигурационный файл [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ðевозможно одновременно иÑпользовать режимы parallel и use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "иÑпользуетÑÑ ÑвÑзанный иÑточник Ð´Ð»Ñ Ñ€ÐµÐ¶Ð¸Ð¼Ð° parallel: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -833,144 +833,144 @@ msgstr ""
"опцию --synthesis Ð½ÐµÐ»ÑŒÐ·Ñ Ð¸Ñпользовать Ñ --media, --excludemedia, --"
"sortmedia, --update или --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Примечание: Ð´Ð»Ñ Ð¸Ñточника \"%s\" отÑутÑтвует hdlist; невозможно возвратить "
"какой-либо результат"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "ПоиÑк: начало - %s, конец - %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "выполнÑетÑÑ Ð²Ñ‚Ð¾Ñ€Ð¾Ð¹ проход Ð´Ð»Ñ Ð²Ñ‹Ñ‡Ð¸ÑÐ»ÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑтей\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "пропуÑкаетÑÑ Ð¿Ð°ÐºÐµÑ‚ %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "будет произведена уÑтановка вмеÑто Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð°ÐºÐµÑ‚Ð° %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "иÑточник \"%s\" уже ÑущеÑтвует"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "виртуальный иÑточник должен быть локальным"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(игнорируетÑÑ Ð¿Ð¾ умолчанию)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "добавлÑетÑÑ Ð¸Ñточник \"%s\" (перед удалённым иÑточником \"%s\")"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "добавлÑетÑÑ Ð¸Ñточник \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "невозможно промонтировать иÑточник Ñ Ð´Ð¸Ñтрибутивом"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "невозможно найти диÑтрибутив по Ñтому адреÑу"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "загружаетÑÑ Ñ„Ð°Ð¹Ð» media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "невозможно обработать файл media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "нет доÑтупа к иÑточнику Ñ Ð´Ð¸Ñтрибутивом (не найден файл media.cfg)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "был выбран неÑущеÑтвующий иÑточник \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "выбираетÑÑ ÑоÑтавной иÑточник: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "удалÑетÑÑ Ð¸Ñточник \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "перенаÑтраиваетÑÑ urpmi Ð´Ð»Ñ Ð¸Ñточника \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...перенаÑтройка не удалаÑÑŒ"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "перенаÑтройка выполнена"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° имён: не найдена завиÑимоÑÑ‚ÑŒ %d"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Ошибка ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° имён: невозможно запиÑать в файл (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "иÑточник \"%s\" уже обновлён"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "изучаетÑÑ Ñ„Ð°Ð¹Ð» hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "изучаетÑÑ Ñ„Ð°Ð¹Ð» synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "ÑоздаётÑÑ hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -979,77 +979,77 @@ msgstr ""
"невозможно Ñоздать файл synthesis Ð´Ð»Ñ Ð¸Ñточника \"%s\". Возможно файл hdlist "
"повреждён."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "проблема Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° hdlist или synthesis иÑточника \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...копирование не удалоÑÑŒ"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копируетÑÑ Ñ„Ð°Ð¹Ð» опиÑÐ°Ð½Ð¸Ñ Ð´Ð»Ñ \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...копирование выполнено"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "копируетÑÑ [%s] Ð´Ð»Ñ Ð¸Ñточника \"%s\"..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирование [%s] не удалоÑÑŒ (файл подозрительно короткий)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "вычиÑлÑетÑÑ md5-Ñумма Ñкопированного hdlist иÑточника (или synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копирование [%s] не удалоÑÑŒ (не Ñовпадает md5-Ñумма)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "вычиÑлÑетÑÑ md5-Ñумма полученного hdlist иÑточника (или synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...извлечение не удалоÑÑŒ: md5-Ñуммы не Ñовпадают"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "в [%s] rpm-файлы не найдены "
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читаютÑÑ rpm-файлы из [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "невозможно прочитать rpm-файлы из [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "rpm'ы не прочитаны"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1060,78 +1060,78 @@ msgstr ""
"Ñто могло произойти потому, что при Ñоздании иÑточника каталог был "
"примонтирован вручную."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "неверный файл hdlist %s Ð´Ð»Ñ Ð¸Ñточника \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "загружаетÑÑ hdlist (или synthesis) иÑточника из \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "найден иÑкомый hdlist (или synthesis): %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "не найден файл hdlist Ð´Ð»Ñ Ð¸Ñточника \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "проверÑетÑÑ Ñ„Ð°Ð¹Ð» открытого ключа Ð´Ð»Ñ \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...импортирован ключ %s из файла открытого ключа \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "невозможно импортировать файл открытого ключа \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "запиÑываетÑÑ Ñ„Ð°Ð¹Ð» ÑпиÑка Ð´Ð»Ñ Ð¸Ñточника \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "обновлён иÑточник \"%s\""
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "невозможно разобрать файл hdlist иÑточника \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ„Ð°Ð¹Ð»Ð° synthesis иÑточника \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "читаютÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ из иÑточника \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnÐн"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyДд"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Извините, плохой выбор, попробуйте ещё раз\n"
@@ -1186,47 +1186,47 @@ msgstr "непонÑтный иÑточник \"%s\" отмечен как ÑÑŠÑ
msgid "unable to access medium \"%s\""
msgstr "нет доÑтупа к иÑточнику \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ðет пакета Ñ Ð¸Ð¼ÐµÐ½ÐµÐ¼ %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следующие пакеты Ñодержат %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "из-за отÑутÑÑ‚Ð²Ð¸Ñ %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "из-за неудовлетворённоÑти %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "попытка активизировать %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "чтобы Ñохранить %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "чтобы уÑтановить %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "из-за конфликтов Ñ %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "не запрошенный"
@@ -1374,26 +1374,34 @@ msgstr "Ðечего удалÑÑ‚ÑŒ"
msgid "Checking to remove the following packages"
msgstr "ПроверÑетÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ ÑƒÐ´Ð°Ð»ÐµÐ½Ð¸Ñ Ñледующих пакетов"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Ð”Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑтей будут удалены Ñледующие %d пакетов (%d МБ)"
+msgstr[1] ""
+"Ð”Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑтей будут удалены Ñледующие %d пакетов (%d МБ)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid " (%d MB)"
msgstr ""
-"Ð”Ð»Ñ ÑƒÐ´Ð¾Ð²Ð»ÐµÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð¸Ñ Ð·Ð°Ð²Ð¸ÑимоÑтей будут удалены Ñледующие %d пакетов (%d МБ)"
-#: ../urpme:134
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Удалить пакет?"
msgstr[1] "Удалить %d пакетов?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Удаление не удалоÑÑŒ"
@@ -1654,7 +1662,7 @@ msgstr " --vendor - поÑтавщик\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - иÑточник, в котором был найден пакет\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - вывод верÑии, релиза и архитектуры Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼.\n"
@@ -1666,12 +1674,12 @@ msgstr ""
"Ðеверный формат: вы можете иÑпользовать только один тег Ñ Ð½ÐµÑколькими "
"значениÑми"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "иÑпользуетÑÑ ÑпецифичеÑкое окружение Ð´Ð»Ñ %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1680,7 +1688,7 @@ msgstr ""
"Примечание: Ñ‚.к. иÑÑледуемый иÑточник не иÑпользует hdlist'Ñ‹, urpmf был не в "
"ÑоÑтоÑнии возвратить какой-либо результат\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Ð’Ñ‹ можете иÑпользовать --name Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка пакетов по их именам.\n"
@@ -1986,7 +1994,7 @@ msgstr " --nolock - не блокировать базу данных rpm
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - обновить пакеты только Ñ Ñ‚Ð°ÐºÐ¾Ð¹ же архитектурой\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - выбрать вÑе ÑÐ¾Ð²Ð¿Ð°Ð´ÐµÐ½Ð¸Ñ Ð¸Ð· командной Ñтроки\n"
@@ -2206,109 +2214,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(только проверка, без уÑтановки)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "УÑтановить 1 пакет? (%d МБ)"
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "УÑтановить %d пакет? (%d МБ)"
-msgstr[1] "УÑтановить %d пакетов? (%d МБ)"
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "УÑтановить 1 пакет? (%d МБ)"
+msgstr[1] "УÑтановить 1 пакет? (%d МБ)"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Ðажмите Enter, когда будете готовы..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Отмена"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следующий пакет Ñодержит неверную подпиÑÑŒ"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следующие пакеты имеют неверные подпиÑи"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Продолжить уÑтановку?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "УÑтановка не удалаÑÑŒ"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "раÑпределÑетÑÑ %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "уÑтанавливаетÑÑ %s из %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "уÑтанавливаетÑÑ %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "УÑтановка не удалаÑÑŒ:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Попробовать уÑтановить без проверки завиÑимоÑтей? (y/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Попробовать принудительную уÑтановку (--force)? (y/N)"
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d уÑтановочных транзакций не удалиÑÑŒ"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d уÑтановочных транзакций не удалиÑÑŒ"
+msgstr[1] "%d уÑтановочных транзакций не удалиÑÑŒ"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "УÑтановка возможна."
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Пакеты находÑÑ‚ÑÑ Ð² актуальном ÑоÑтоÑнии"
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Пакет %s уже уÑтановлен"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Пакет %s уже уÑтановлен"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Пакет %s невозможно уÑтановить"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Пакет %s невозможно уÑтановить"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi перезапуÑкаетÑÑ"
@@ -2568,9 +2573,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "ОчищаетÑÑ ÐºÐ°Ñ‚Ð°Ð»Ð¾Ð³ повторной упаковки [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "Удалено %d файлов\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "Удалено %d файлов\n"
+msgstr[1] "Удалено %d файлов\n"
#: ../urpmi.recover:82
#, c-format
@@ -2863,54 +2870,56 @@ msgstr ""
" - раÑширенный реверÑивный поиÑк (Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ñ‹Ðµ "
"пакеты).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - поиÑк в provides Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка пакетов.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - полный вывод данных Ð´Ð»Ñ ÑƒÐ´Ð°Ð»Ñемого пакета.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - раÑширенный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ðº завиÑимоÑÑ‚Ñм пакета.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - вывод групп Ñ Ð¸Ð¼ÐµÐ½Ð°Ð¼Ð¸.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - вывод полезной информации в удобной Ð´Ð»Ñ Ñ‡Ñ‚ÐµÐ½Ð¸Ñ Ñ„Ð¾Ñ€Ð¼Ðµ.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - ÑпиÑок файлов в пакете.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - тихий режим (quiet)\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - поиÑк в provides Ð´Ð»Ñ Ð¿Ð¾Ð¸Ñка пакетов.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - вывод верÑии и релиза Ñ Ð½Ð°Ð·Ð²Ð°Ð½Ð¸ÐµÐ¼.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - Ñледующий пакет Ñодержит иÑходные коды (Ñквивалент -s).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2919,50 +2928,50 @@ msgstr ""
" -u - удаление пакета, еÑли уже уÑтановлена более Ð½Ð¾Ð²Ð°Ñ "
"верÑиÑ.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - уÑтановка поиÑка на оÑнове нечёткой логики\n"
" (Ñквивалент --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - Ñквивалент -y, но без учёта региÑтра.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " запрошены имена или rpm-файлы, указанные в командной Ñтроке.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes может иÑпользоватьÑÑ Ñ‚Ð¾Ð»ÑŒÐºÐ¾ Ñ --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"Ð´Ð»Ñ Ð¸Ñточника \"%s\" отÑутÑтвует hdlist; только чаÑтичный результат Ð´Ð»Ñ "
"пакета %s"
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Ð´Ð»Ñ Ð¸Ñточника \"%s\" отÑутÑтвует hdlist; только чаÑтичный результат Ð´Ð»Ñ "
"пакета %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"Ð´Ð»Ñ Ð¸Ñточника \"%s\" отÑутÑтвует hdlist; невозможно возвратить результат Ð´Ð»Ñ "
"пакета %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2970,16 +2979,19 @@ msgstr ""
"Ð´Ð»Ñ Ð¸Ñточника \"%s\" отÑутÑтвует hdlist; невозможно возвратить результат Ð´Ð»Ñ "
"пакета %s"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ðе найден ÑпиÑок файлов\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ðе найден журнал изменений\n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "УÑтановить %d пакет? (%d МБ)"
+#~ msgstr[1] "УÑтановить %d пакетов? (%d МБ)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Ðе найден ÑпиÑок файлов\n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d пакетов, %d МБ)"
diff --git a/po/sc.po b/po/sc.po
index d069e8e1..eeed1b41 100644
--- a/po/sc.po
+++ b/po/sc.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sc\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-09-07 15:57+0100\n"
"Last-Translator: Antoni Pistis <antonio.pistis@virgilio.it>\n"
"Language-Team: Sardu\n"
@@ -105,14 +105,14 @@ msgstr "A_nnudda"
msgid "Choose location to save file"
msgstr "Sçobera anca sarvai su file"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"sceras '%s' disconnotas\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "nisçunu pakitu nominau %s"
@@ -143,7 +143,7 @@ msgstr ""
msgid "Warning"
msgstr "Atentu"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Andat"
@@ -239,7 +239,7 @@ msgstr ""
"\n"
"Bolis sighiri a dus aposentai?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -250,7 +250,7 @@ msgstr ""
"%s\n"
"Forsis bolis ajorronai su database de urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "srèxinu %s"
@@ -270,9 +270,9 @@ msgstr "Aposentu su pakitu `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Fatu"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Aposentadura faddia"
#: ../gurpmi2:344
@@ -329,63 +329,63 @@ msgstr "Feti superuser podit aposentai pakitus"
msgid "Running urpmi in restricted mode..."
msgstr "Fatzu girai urpmi in modalidadi strinta..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "no potzu aberri su database rpm"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nòmini file rpm [%s] no bàlidu"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "agatu su file rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...agataus"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...no agataus: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "no potzu lompi a su file rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "no potzu analisai \"%s\" in su file [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "no potzu assentai su file rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "faddina assentendi is pakitus localis"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Custa cosa no fait a da fai candu ses in modalidadi strinta"
@@ -425,7 +425,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
@@ -450,7 +450,7 @@ msgstr "no potzu scriri su file de assètiu [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "no potzu scriri su file de assètiu [%s]"
@@ -580,7 +580,7 @@ msgstr "dui funt prus pakitus cun su pròpiu nòmini file rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "no potzu fai s'anàlisi lìmpia de [%s] po su balori \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "no potzu lompi a sa list de \"%s\", mèdiu innyorau"
@@ -717,7 +717,7 @@ msgstr "atentu: md5sum po %s no disponiditzu in su file MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "càrculu su md5sum de sa hdlist (o synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -725,104 +725,104 @@ msgid ""
msgstr ""
"su mèdiu virtuali \"%s\" no depit tenni hdlist o list inditadas, innyorau"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "su mèdiu virtuali \"%s\" iat a bolli cun url crara, innyorau"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nòmini file rpm [%s] no bàlidu"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "no potzu agatai sa list po \"%s\", innyorau"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "provu a sçoberai su mèdiu \"%s\" ki no esistit"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "apu fraigau sa hdlist synthesis po su mèdiu \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "no potzu lompi a sa hdlist de \"%s\", mèdiu innyorau"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "no potzu analisai sa hdlist de \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"su mèdiu \"%s\" est provendi a impreai una hdlist jai in impreu, innyorau"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"su mèdiu \"%s\" est provendi a impreai una list jai in impreu, innyorau"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "provu a fai de mancu de su mèdiu \"%s\", du lassu"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "tropu puntus de càrrigu po su mèdiui arremoviditzu \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "pigu su mèdiu arremoviditzu ke \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Su mèdiu \"%s\" est una màgini ISO, d'apu a carrigai a sa bolada"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "impreu un'atru mèdiu arremividitzu [%s] po \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "no potzu agatai su pathname po su mèdiu arremoviditzu \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "scrì su file de assètiu [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "No fait sa modalidadi parallela cun sa distribuia"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "impreu mèdius assotziaus po sa modalidadi parallela: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -831,144 +831,144 @@ msgstr ""
"--synthesis no fait a d'impreai cun --media, --excludemedia, --sortmedia, --"
"update o --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Sa circa cumentzat: %s e acabat: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "fatzu su segundu passu po carculai is dependèntzias\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "sartu su pakitu %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "iat a aposentai su pakitu %s in logu de d'ajorronai"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "su mèdiu \"%s\" esistit jai"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "su mèdiu virtuali bolit locali"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "liju is header de su mèdiu \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "burru su mèdiu \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "no potzu lompi a su primu mèdiu de aposentadura"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "agatu is file hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "no potzu aberri su database rpm"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "no potzu lompi a su primu mèdiu de aposentadura (no agatu hdlist)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "provu a sçoberai su mèdiu \"%s\" ki no esistit"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "sçoberu prus mèdius: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "burru su mèdiu \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "torru a assetiai urpmi po is mèdius \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...assètiu faddiu"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "assètiu fatu"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "su mèdiu \"%s\" no d'as sçoberau"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "controllu su file hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Controllu su file synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "fraigu sa hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -977,77 +977,77 @@ msgstr ""
"No potzu fraigai sa synthesis po su mèdiu \"%s\". Forsis sa hdlist est "
"pudesça."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "barrancu ligendi sa hdlist o sa synthesis de su mèdiu \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...còpia faddia"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "còpiu su file descriidori de \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...còpia fata"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "scriu sa llist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "còpia de [%s] faddia (est stranu ki unu file aici piticu)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "càrculu su md5sum de sa hdlist (o synthesis) copiada"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "còpia de [%s] faddia (su md5sum no cunsonat)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "càrculu su md5sum de sa hdlist (o synthesis) agatada"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...no agataus: dissonàntzia md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "no apu agatau rpm de [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "liju is file rpm de [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "no potzu ligi is file rpm de [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "no apu liju rpm"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1057,78 +1057,78 @@ msgstr ""
"no potzu lompi a su mèdiu \"%s\",\n"
"podit essi ki apas carrigau a manu sa directory candu as creau su mèdiu."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "agatu sa hdlist (o synthesis) de \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "apu agatau una hdlist (o synthesis) analisada ke %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "no apu agatau hdlist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "controllu sa crai pùbriga de \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...apu importau sa crai %s de sa crai pùbriga de \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "no potzu importai sa crai pùbriga de \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "scriu sa llist po su mèdiu \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "apu açuntu su mèdiu %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "no potzu analisai sa hdlist de \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "barrancu ligendi sa synthesis de su mèdiu \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "liju is header de su mèdiu \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Mi spraxit, sçoberu malu, torra a provai\n"
@@ -1183,47 +1183,47 @@ msgstr "mèdiu lòfiu \"%s\" marcau ke arremoviditzu ma no tali"
msgid "unable to access medium \"%s\""
msgstr "no potzu lompi a su mèdiu \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nisçunu pakitu nominau %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Is pakitus ki sighint cuntenint %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "ca amancat %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "ca no est satisfatu %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "provu a sçoberai %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "po podi apoderai %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "po podi aposentai %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "ca gherrat cun %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "no bòfiu"
@@ -1371,27 +1371,36 @@ msgstr "Nudda de srexinai"
msgid "Checking to remove the following packages"
msgstr "Controllu po srexinai is pakitus ki sighint"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
+"d MB)"
+msgstr[1] ""
"Po satisfai is dependèntzias, is %d pakitus ki sighint dus apu a srexinai (%"
"d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "srèxinu su pakitu %s"
msgstr[1] "srèxinu su pakitu %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Srexinadura faddia"
@@ -1653,7 +1662,7 @@ msgstr " --verbose - po ndi sciri de prus.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - allistra is file in su pakitu.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1665,12 +1674,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "impreu unu ambienti indidau in %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1679,7 +1688,7 @@ msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Forsis bolis impreai --name po circai is nòminis de is pakitus.\n"
@@ -1981,7 +1990,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - ajorrona feti is pakitus cun sa pròpiu arkidetura.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - sçobera totu su ki cunsonat in arraya de cumandu.\n"
@@ -2196,15 +2205,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "No fait a aposentai is pakitus (%s)!"
msgstr[1] "No fait a aposentai is pakitus (%s)!"
@@ -2213,92 +2217,94 @@ msgstr[1] "No fait a aposentai is pakitus (%s)!"
msgid "Press Enter when ready..."
msgstr "Craca Enter candu ses prontu..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Annudda"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Is pakitus ki sighint tenint firmas malas"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Is pakitus ki sighint tenint firmas malas"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Bolis sighiri a aposentai?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Aposentadura faddia"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "seu distribuendi %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "aposentu %s de %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "aposentu %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Aposentadura faddia"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Provu a aposentai sentza de controllai is dependèntzias? (y/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Provu a aposentai de manera finas prus forti (--force)? (y/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transatzionis de aposentadura faddias"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transatzionis de aposentadura faddias"
+msgstr[1] "%d transatzionis de aposentadura faddias"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Fait a aposentai"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Pakitu(s) jai aposentau(s)"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "torru a aberri urpmi"
@@ -2551,8 +2557,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2845,55 +2853,57 @@ msgstr ""
" - circa arretrogada manna (circa is pakitus virtualis "
"puru).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - circa in is tag provides po agatai unu pakitu.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - arresurtaus prenus, cun is pakitus de srexinai.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - allàdia sa circa a is dependèntzias de is pakitus.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - amosta is grupus cun su nòmini puru.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - amosta scedas utilosas de manera ligiditza.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - allistra is file in su pakitu.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - modalidadi citia.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - circa in is tag provides po agatai unu pakitu.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - amosta versioni e arrelasçu cun su nòmini puru.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - su pakitu ki benit est unu pakitu mitza (su pròpiu de --"
"src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2902,44 +2912,44 @@ msgstr ""
" -u - srèxina su pakitu ki una versioni prus noa est jai "
"aposentada.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - imponi una circa fuzzy (su pròpiu de --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - comenti e -y, ma no connoscit mannas e piticas.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " preguntu is nòminis o is file rpm scritus in arraya de cumandu.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes fait a d'impreai feti cun --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2947,16 +2957,14 @@ msgstr ""
"Noda: sendi ki is mèdius castiaus no tenint hdlist, urpmf no at pòtziu "
"torrai arresurtau\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "No apu agatau sa list\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "No apu agatau s'arrelata de is mudas\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "No apu agatau sa list\n"
+
#~ msgid ""
#~ " -P - do not search in provides to find package (default).\n"
#~ msgstr ""
diff --git a/po/sk.po b/po/sk.po
index 70dd028f..49011e78 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-09-07 16:34+0100\n"
"Last-Translator: Tibor Pittich <Tibor.Pittich@mandriva.org>\n"
"Language-Team: Slovak <i18n@mandrake.sk>\n"
@@ -103,14 +103,14 @@ msgstr "_Zrušiť"
msgid "Choose location to save file"
msgstr "Vyberte umiestnenie pre uloženie súboru"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"neznáma voľba '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "žiaden balík s menom %s"
@@ -141,7 +141,7 @@ msgstr ""
msgid "Warning"
msgstr "Varovanie"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -239,7 +239,7 @@ msgstr ""
"\n"
"Chcete pokraÄovaÅ¥ v inÅ¡talácii?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -250,7 +250,7 @@ msgstr ""
"%s\n"
"Možno budete chcieť aktualizovať Vašu urpmi databázu"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "odstraňovanie %s"
@@ -270,9 +270,9 @@ msgstr "Inštalácia balíka `%s' (%s/%s)..."
msgid "_Done"
msgstr "_Hotovo"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Inštalácia zlyhala"
#: ../gurpmi2:344
@@ -330,63 +330,63 @@ msgstr "Inštalovať balíky má dovolené len superužívateľ"
msgid "Running urpmi in restricted mode..."
msgstr "Beh urpmi v reštriktívnom režime..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "nemôžem otvoriť rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "nesprávne meno rpm súboru [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "sťahovanie rpm súboru [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...získavanie ukonÄené"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...získavanie zlyhalo: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "nie je možné pristúpiť k rpm súboru [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "nie je možné správne preÄítaÅ¥ \"%s\" v súbore [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "nie je možné zaregistrovať rpm súbor"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "chyba pri registrácii lokálnych balíkov"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Táto operácia nie je povolená ak program beží v reštriktívnom režime"
@@ -426,7 +426,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
@@ -451,7 +451,7 @@ msgstr "nie je možné zapísaÅ¥ konfiguraÄný súbor [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "nie je možné zapísaÅ¥ konfiguraÄný súbor [%s]"
@@ -582,7 +582,7 @@ msgstr "existuje viacero balíkov s rovnakým menom rpm súboru \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "nie je možné správne preÄítaÅ¥ [%s] s hodnotou \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -720,7 +720,7 @@ msgstr "varovanie: md5sum pre %s nie je prítomný v súbore MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "výpoÄet md5sum z existujúceho zdroja hdlist (alebo synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -729,105 +729,105 @@ msgstr ""
"virtuálny zdroj \"%s\" by nemal mať špecifikovaný hdlist súbor, zdroj je "
"ignorovaný"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"virtuálny zdroj \"%s\" by mal obsahovať prázdnu url, zdroj je ignorovaný"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "nesprávne meno rpm súboru [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "nie je možné nájsť súbor so zoznamom pre \"%s\", zdroj je ignorovaný"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "pokus o výber neexistujúceho zdroja \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "vytváranie hdlist synthesis súboru pre zdroj \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
"nie je možné pristúpiť k súboru hdlist pre \"%s\", zdroj bude ignorovaný"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "nie je možné správne preÄítaÅ¥ hdlist súbor pre \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "zdroj \"%s\" sa pokúša použiť už použitý hdlist, zdroj je ignorovaný"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"zdroj \"%s\" skúša použiť už používaný súbor so zoznamom, zdroj je ignorovaný"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "pokus o vynechanie existujúceho zdroja \"%s\", zrušené"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "príliš veľa bodov pripojenia pre vymeniteľný zdroj \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "výber vymeniteľného zariadenia ako \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Zdroj \"%s\" je ISO obraz, je možné ho pripojiť za behu"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "použitie rôznych vymeniteľných zariadení [%s] pre \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "nie je možné zistiť cestu pre vymeniteľný zdroj \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "zápis konfiguraÄného súboru [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Nie je možné používať paralelný režim pri use-distrib móde"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "použitie asociovaného zdroja pre paralelný režim: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -836,146 +836,146 @@ msgstr ""
"--synthesis nie je možné používať s --media, --excludemedia, --sortmedia, --"
"update alebo --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Spustenie vyhľadávania: %s ukonÄenie: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "druhý prechod pre výpoÄet závislostí\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "vynechávanie balíka %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "mala by byť vykonaná inštalácia namiesto aktualizácie balíka %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "zdroj \"%s\" už existuje"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtuálne médium musí byť lokálne"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "naÄitávanie hlaviÄiek pre zdroj \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "odstránenie zdroja \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "nie je možné pristúpiÅ¥ k prvému inÅ¡talaÄnému zdroju"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "získavanie hdlists súboru..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "nemôžem otvoriť rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"nie je možné pristúpiÅ¥ k prvému inÅ¡talaÄnému zdroju (nebol nájdený súbor "
"hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokus o výber neexistujúceho zdroja \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "výber viacerých zdrojov: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "odstránenie zdroja \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rekonfigurovanie urpmi pre zdroj \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...rekonfigurovanie zlyhalo"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "rekonfigoranie hotové"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "zdroj \"%s\" nebol zvolený"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "preverovanie hdlist súboru [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "preverovanie synthesis súboru [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "vytváranie hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -984,77 +984,77 @@ msgstr ""
"Nebolo možné vytvoriť súbor synthesis pre médium \"%s\". Súbor hdlist je "
"pravdepodobne poškodený."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problém s Äítaním hdlist alebo synthesis súboru pre zdroj \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopírovanie zlyhalo"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopírovanie súboru popisov pre \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopírovanie ukonÄené"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopírovanie [%s] zlyhalo (súbor je podozrivo malý)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "výpoÄet md5sum zo zdroja hdlist (alebo synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopírovanie [%s] zlyhalo zlyhalo (nesprávny md5sum)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "výpoÄet md5sum zo získaných súborov hdlist (alebo synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...získavanie zlyhalo: rozdielny md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "žiadné rpm súbory nájdené z [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Äítanie rpm súborov z [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "nie je možné ÄítaÅ¥ rpm súbory z [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "nenaÄítané žiadne rpm balíky"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1064,78 +1064,78 @@ msgstr ""
"nie je možné pristúpiť k zdroju \"%s\",\n"
"Äo sa môže staÅ¥ ak bol adresár pripojený poÄas vytvárania zdroja."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "získavanie zdrojového hdlist (alebo synthesis) pre \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "nájdený overený hdlist (alebo synthesis) ako %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nebol nájdený hdlist súbor pre zdroj \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "prehliada sa súbor s verejnými kľúÄmi \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importuje sa kÄ¾ÃºÄ %s zo súboru s verejnými kľúÄmi \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "nie je možné naimportovaÅ¥ súbor s verejnými kľúÄmi \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "zápis súboru so zoznamom pre zdroj \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "pridaný zdroj %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "nie je možné správne preÄítaÅ¥ hdlist súbor pre \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problém s Äítaním synthesis súboru pre zdroj \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "naÄitávanie hlaviÄiek pre zdroj \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyAaÃá"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "PrepáÄte, zlá voľba, skúste znova\n"
@@ -1191,47 +1191,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "nie je možné pristúpiť k zdroju \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Žiaden balík s menom %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Nasledujúce balíky obsahujú %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "kvôli chýbajucemu %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "kvôli neuspokojenému %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "pokus o povýšenie %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "pre zachovanie poradia %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "pre inštaláciu balíka %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "kvôli konfliktom s %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nepožadovaný"
@@ -1380,14 +1380,24 @@ msgstr "NiÄ na odstránenie"
msgid "Checking to remove the following packages"
msgstr "Kontrola odstraňovania týchto balíkov"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
+msgstr[1] ""
+"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
+msgstr[2] ""
+"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid " (%d MB)"
msgstr ""
-"Z dôvodu zachovania závislostí, balíky %d by mali byť odinštalované (%d MB)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1395,12 +1405,12 @@ msgstr[0] "odstraňovanie balíka %s"
msgstr[1] "odstraňovanie balíka %s"
msgstr[2] "odstraňovanie balíka %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (á/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Odstránenie neskonÄilo úspechom"
@@ -1658,7 +1668,7 @@ msgstr " --verbose - zobraziť podrobnosti.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - zoznam súborov v balíku.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1669,12 +1679,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "použitie špecifického prostredia na %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1683,7 +1693,7 @@ msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Môžete použiť --name na vyhľadanie názvu balíkov.\n"
@@ -1993,7 +2003,7 @@ msgstr " --noclean - nevymazaÅ¥ nepoužité rpm súbory z doÄasnej pamät
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - aktualizovať iba balíky s rovnakou architektúrou.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - vybrať všetky zhody na príkazovom riadku.\n"
@@ -2209,15 +2219,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2227,92 +2232,95 @@ msgstr[2] ""
msgid "Press Enter when ready..."
msgstr "StlaÄte Enter ak je možné pokraÄovaÅ¥..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Zrušiť"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Nasledujúce balíky obsahujú zle signatúry"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Nasledujúce balíky obsahujú zle signatúry"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Chcete pokraÄovaÅ¥ v inÅ¡talácii ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Inštalácia zlyhala"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuovanie %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "inštalácia %s z %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "inštalácia %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Inštalácia zlyhala"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Skúsiť inštaláciu bez kontroly závislostí? (á/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Skúsiť \"tvrdšiu\" inštaláciu (--force)? (á/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d inÅ¡talaÄná transakcia zlyhala"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d inÅ¡talaÄná transakcia zlyhala"
+msgstr[1] "%d inÅ¡talaÄná transakcia zlyhala"
+msgstr[2] "%d inÅ¡talaÄná transakcia zlyhala"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Inštalácia je možná"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Všetko je už nainštalované"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Všetko je už nainštalované"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Všetko je už nainštalované"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Všetko je už nainštalované"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "znovuspustenie urpmi"
@@ -2563,8 +2571,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2855,54 +2866,56 @@ msgstr ""
" - rozšírené reverzné vyhľadávanie (vrátane virtuálnych "
"balíkov.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - vyhľadať balík hľadaním v poskytovaných.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompletný výstup s balíkmi na odstránenie.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - rozšíriť dotaz o závislosti pre balík.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - zobraziť skupiny aj s menami.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - zobraziÅ¥ užitoÄné informácie v Äitateľnom formáte.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - zoznam súborov v balíku.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - zobrazovať minimum informácií.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - vyhľadať balík hľadaním v poskytovaných.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - zobraziÅ¥ verziu a vydanie spoloÄne s menom.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - nasledujúci balík je zdrojový balík (to isté ako --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2910,46 +2923,46 @@ msgid ""
msgstr ""
" -u - odstrániť balík ak už je nainštalovaná novšia verzia.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - fuzzy vyhľadávanie (to isté ako --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - ako -y, ale vnútiť vyhľadávanie bez rozlišovania veľkosti "
"písmen.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " mená alebo rpm súbory zadané na príkazovom riadku budú dotazované.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes nemôže byť použité len s --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2957,16 +2970,14 @@ msgstr ""
"Poznámka: Pretože nebol nájdený žiaden zdroj používajúci hdlists, urpmf "
"nemohol vrátiť žiaden výsledok\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nebol nájdený zoznam súborov\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nebol nájdený zoznam zmien\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Nebol nájdený zoznam súborov\n"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "zdroj \"%s\" nebol zvolený"
diff --git a/po/sl.po b/po/sl.po
index b847bf8f..fa63cbd5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2007-01-09 15:01+0100\n"
"Last-Translator: Matjaž Kaše <matjaz.kase@telemach.net>\n"
"Language-Team: slovenÅ¡ÄÄÄina <sl@li.org>\n"
@@ -113,12 +113,12 @@ msgstr "_PrekliÄi"
msgid "Choose location to save file"
msgstr "Izberite mesto za shranjevanje datoteke"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Neznana možnost %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "DoloÄen ni bil noben paket"
@@ -149,7 +149,7 @@ msgstr ""
msgid "Warning"
msgstr "Opozorilo"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "V redu"
@@ -244,7 +244,7 @@ msgstr ""
"\n"
"Želite nadaljevati namestitev?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -255,7 +255,7 @@ msgstr ""
"%s\n"
"MogoÄe bi morali obnoviti podatkovno bazo urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "odstranjevanje %s"
@@ -275,10 +275,10 @@ msgstr "NameÅ¡Äanje paketa `%s' (%s/%s)..."
msgid "_Done"
msgstr "_KonÄano"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Namestitev ni uspela"
+msgid "Installation failed:"
+msgstr "Namestitev ni uspela:"
#: ../gurpmi2:344
#, c-format
@@ -335,63 +335,63 @@ msgstr "Samo uporabniku root je dovoljeno nameÅ¡Äati pakete"
msgid "Running urpmi in restricted mode..."
msgstr "Poganjanje urpmi v omejenem naÄinu ..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "ni mogoÄe odpreti rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "napaÄno ime datoteke rpm [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "pridobivanje datoteke rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...pridobivanje je konÄano"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pridobivanje je spodletelo: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ni mogoÄe dostopati do datoteke rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ni mogoÄe razÄleniti %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ni mogoÄe registrirati datoteke rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Zgradba paketa ni združljiva z rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "napaka pri registraciji krajevnih paketov"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ta postopek ni dovoljen v omejenem naÄinu"
@@ -431,7 +431,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr "PrveÄ argumentov\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "zgrajena je bila hdlist synthesis datoteka za vir \"%s\""
@@ -456,7 +456,7 @@ msgstr "ni mogoÄe napisati nastavitvene datoteke [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ni mogoÄe napisati nastavitvene datoteke [%s]"
@@ -586,7 +586,7 @@ msgstr "obstaja veÄ paketov z istim imenom datoteke rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ni mogoÄe pravilno razÄleniti [%s] pri vrednosti \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -724,114 +724,114 @@ msgstr "opozorilo: vsote MD5 za %s ni v datoteki MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "raÄunanje md5sum obstojeÄega izvornega hdlist (ali synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "navidezni vir \"%s\" ne sme imeti seznama hdlist in je bil zato prezrt"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "navidezni vir \"%s\" mora imeti jasen url, vir je bil zato prezrt"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "napaÄno ime datoteke rpm [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ni mogoÄe najti seznama datotek za \"%s\", vir je bil zato prezrt"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "poskuÅ¡anje izbire neobstojeÄega vira \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "zgrajena je bila hdlist synthesis datoteka za vir \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
"ni mogoÄe dostopati do datoteke hdlist od \"%s\", vir je bil zato prezrt"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ni mogoÄe razÄleniti datoteke hdlist vira \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"vir \"%s\" poskuša uporabiti že uporabljen seznam hdlist in je bil zato "
"prezrt"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"vir \"%s\" poskuša uporabiti že uporabljen seznam in je bil zato prezrt"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "poskuÅ¡am obiti obstojeÄi vir, izpuÅ¡Äanje \"%s\""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "\"%s\" ima preveÄ priklopnih toÄk"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "izmenljiva naprava vzeta kot \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Vir \"%s\" je slika ISO, priklopljena bo sproti"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "uporaba druge izmenljive naprave [%s] za \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ni mogoÄe razreÅ¡iti poti za izmenljivi medij \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "konÄano pisanje nastavitvene datoteke [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ni mogoÄe uporabiti vzporednega naÄina z naÄinom use-distrib"
# kaj sploh je associated media?
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "uporaba združenega vira za vzporeden naÄin: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -840,7 +840,7 @@ msgstr ""
"--synthesis ni mogoÄe uporabiti z --media, --excludemedia, --sortmedia, --"
"update ali --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
@@ -848,138 +848,138 @@ msgstr ""
"vrniti nobenega rezultata\n"
# barabe
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Iskanje; zaÄetek: %s konec: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "izvajanje drugega prehoda (za izraÄun odvisnosti)\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "izpuÅ¡Äanje paketa %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "bi namestilo namesto nadgradilo paket %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "vir \"%s\" že obstaja"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "navidezni vir mora biti krajeven"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "branje zaglavja iz vira \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "odstranjevanje vira \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ni mogoÄe dostopati do prvega namestitvenega vira"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "Izgleda da naslov ne vsebuje paketov"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "pridobivanje datoteke cfg za vir"
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "ni mogoÄe razÄleniti media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ni mogoÄe dostopati do prvega namestitvenega vira (ni datoteke hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "poskuÅ¡anje izbire neobstojeÄega vira \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "izbiranje veÄ virov: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "odstranjevanje vira \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "ponovno nastavljanje urpmi za vir \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...ponovno nastavljanje je spodletelo"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "ponovno nastavljanje je konÄano"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Napaka pri ustvarjanju datoteke names: Odvisnost %d ni bila najdena"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Napaka pri ustvarjanju datoteke names: Datoteka (%s) ni zapisljiva"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "vir \"%s\" ni oznaÄen"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "preverjanje hdlist datoteke [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "preverjanje synthesis datoteke [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "gradnja hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -988,77 +988,77 @@ msgstr ""
"Ni mogoÄe zgraditi datoteke synthesis za vir \"%s\". MogoÄe je pokvarjena "
"datoteka hdlist."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "težava pri branju synthesis ali hdlist datoteke vira \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiranje je spodletelo"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiranje datoteke z opisi \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiranje konÄano"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "pisanje datoteke s seznamom za vir \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] je spodletelo (datoteka je sumljivo majhna)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "raÄunanje md5sum kopiranega izvornega hdlist (ali synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] je spodletelo (md5sum se ne ujema)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "raÄunanje md5sum izvorne datoteke hdlist (ali synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pridobivanje je spodletelo: md5sum se ne ujema"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "na [%s] ni nobene datoteke rpm"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "branje datotek rpm iz [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ni mogoÄe brati datotek rpm iz [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "noben paket rpm ni bil prebran"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1068,78 +1068,78 @@ msgstr ""
"Dostop do vira \"%s\" ni mogoÄ.\n"
"Do tega lahko pride, Äe ste med ustvarjanjem vira roÄno priklopili imenik"
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ni bilo mogoÄe najti hdlist datoteke za vir \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "pridobivanje izvorne datoteke hdlist (ali synthesis) od \"%s\" ..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "najdena je bila preverjena datoteka hdlist (ali synthesis) kot %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ni bilo mogoÄe najti hdlist datoteke za vir \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "preverjanje datoteke z javnimi kljuÄi od \"%s\" ..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...uvožen je kljuÄ %s iz datoteke javnih kljuÄev od \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ni mogoÄe uvoziti javnega kljuÄa od \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "pisanje datoteke s seznamom za vir \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodan je bil vir %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ni mogoÄe razÄleniti datoteke hdlist vira \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "težava pri branju synthesis datoteke vira \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "branje zaglavja iz vira \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Dd"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Oprostite, slaba izbira, poskusite znova\n"
@@ -1195,48 +1195,48 @@ msgstr "neurejen medij \"%s\" je oznaÄen kot izmenljiv, a to ne drži"
msgid "unable to access medium \"%s\""
msgstr "ni mogoÄe dostopati do vira \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ni paketa poimenovanega %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "SledeÄi paketi vsebujejo %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "zaradi manjkajoÄega %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "zaradi nezadovoljstva %s"
# promote vzet kot renice
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "poskus podpiranja %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "za ohranitev %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "za namestitev %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "zaradi konfliktov z/s %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nezahtevan"
@@ -1384,13 +1384,26 @@ msgstr "NiÄesar za odstraniti"
msgid "Checking to remove the following packages"
msgstr "Preverjanje za odstranitev sledeÄih paketov"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Za zadovoljitev odvisnosti bo odstranjenih sledeÄih %d paketov (%d MB)"
+msgstr[1] ""
+"Za zadovoljitev odvisnosti bo odstranjenih sledeÄih %d paketov (%d MB)"
+msgstr[2] ""
+"Za zadovoljitev odvisnosti bo odstranjenih sledeÄih %d paketov (%d MB)"
+msgstr[3] ""
+"Za zadovoljitev odvisnosti bo odstranjenih sledeÄih %d paketov (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Za zadovoljitev odvisnosti bo odstranjenih sledeÄih %d paketov (%d MB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1399,12 +1412,12 @@ msgstr[1] "Želite odstraniti paket %d ?"
msgstr[2] "Želite odstraniti paket %d ?"
msgstr[3] "Želite odstraniti paket %d ?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Odstranjevanje je spodletelo"
@@ -1660,7 +1673,7 @@ msgstr " --vendor - prodajalec\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - vir, kjer je bil paket najden\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1671,12 +1684,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Nepravilen format: Uporabite lahko samo eno oznako z veÄ vrednostmi"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "uporabljam specifiÄno okolje pri %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1685,7 +1698,7 @@ msgstr ""
"Opomba: ker noben preiskan medij ne uporablja hdlist-a, urpmf ni mogel "
"vrniti nobenega rezultata\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Morda želite uporabiti --name za iskanje po imenih paketov.\n"
@@ -1987,7 +2000,7 @@ msgstr " --nolock - ne zakleni podatkovne baze rpm.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - nadgradi samo pakete iste arhitekture.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - izberi vsa ujemanja v ukazni vrstici.\n"
@@ -2205,15 +2218,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(samo test, namestitev se ne bo izvedla)"
-#: ../urpmi:598
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
-
-#: ../urpmi:599
-#, fuzzy, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
msgstr[1] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
msgstr[2] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
@@ -2224,92 +2232,96 @@ msgstr[3] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
msgid "Press Enter when ready..."
msgstr "Pritisnite Enter ko boste pripravljeni ..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "PrekliÄi"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "SledeÄi paketi imajo slabe podpise"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "SledeÄi paketi imajo slabe podpise"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ali želite nadaljevati namestitev?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Namestitev ni uspela"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "porazdeljevanje %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "nameÅ¡Äanje %s iz %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "nameÅ¡Äanje %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Namestitev ni uspela:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Poskusi z namestitvijo brez preverjanj odvisnosti? (d/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Poskusi s prisilno namestitvijo(--force)? (d/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d namestitvenih transakcij je spodletelo"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d namestitvenih transakcij je spodletelo"
+msgstr[1] "%d namestitvenih transakcij je spodletelo"
+msgstr[2] "%d namestitvenih transakcij je spodletelo"
+msgstr[3] "%d namestitvenih transakcij je spodletelo"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Namestitev je mogoÄa"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Paketi so že nameÅ¡Äeni"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Paketi so že nameÅ¡Äeni"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Paketi so že nameÅ¡Äeni"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Paketi so že nameÅ¡Äeni"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "ponovno zaganjanje urpmi"
@@ -2567,9 +2579,13 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "ÄŒiÅ¡Äenje imenika za ponovno izgradnjo paketov [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "odstranjeno%d datotek\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "odstranjeno%d datotek\n"
+msgstr[1] "odstranjeno%d datotek\n"
+msgstr[2] "odstranjeno%d datotek\n"
+msgstr[3] "odstranjeno%d datotek\n"
#: ../urpmi.recover:82
#, c-format
@@ -2873,60 +2889,62 @@ msgstr ""
" - iskanje paketov, katerim je podan paket odvisnost (tudi "
"med navideznimi paketi).\n"
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - iÅ¡Äi paket po polju provides (kaj paket nudi).\n"
+
# kaj? man pravi: if maximal closure is used, assume that a package
# upgraded and may correct unresolved dependancies on the rpm database.
-#: ../urpmq:91
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - predvidevaj da se je paket nadgradil in popravi "
"nerazrešene odvisnosti v bazi rpm.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - razširi poizvedbo na paketove odvisnosti.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - izpiši skupine skupaj z imenom.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - izpiÅ¡i uporabne informacije v Äloveku razumljivem "
"zapisu.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - izpiši seznam datotek v paketu.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tihi naÄin.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - iÅ¡Äi paket po polju provides (kaj paket nudi).\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - izpiÅ¡i razliÄico in izdajo skupaj z imenom.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - naslednji paket je paket z izvorno kodo (isto kot --"
"src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2934,46 +2952,46 @@ msgid ""
msgstr ""
" -u - odstrani paket, Äe je že nameÅ¡Äena novejÅ¡a verzija.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - vsili ohlapno iskanje (isto kot --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - kot -y, a ujemanje ne razlikuje med velikimi in malimi "
"Ärkami.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " imena ali datoteke rpm podane preko ukazne vrstice so obdelane.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes je lahko uporabljeno samo s --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Opomba: ker noben preiskan medij ne uporablja hdlist-a, urpmf ni mogel "
"vrniti nobenega rezultata\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2981,16 +2999,22 @@ msgstr ""
"Opomba: ker noben preiskan medij ne uporablja hdlist-a, urpmf ni mogel "
"vrniti nobenega rezultata\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Filelist ni bil najden\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Dnevnik sprememb ni bil najden\n"
+#, fuzzy
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
+#~ msgstr[1] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
+#~ msgstr[2] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
+#~ msgstr[3] "Nadaljevanje z namestitvijo %d paketov? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Filelist ni bil najden\n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d paketov, %d MB)"
diff --git a/po/sq.po b/po/sq.po
index 7ac30b3d..980618d8 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2002-12-04 23:55+0200\n"
"Last-Translator: Naim Daka <naim70@freesurf.ch>\n"
"Language-Team: Albanian <LL@li.org>\n"
@@ -86,14 +86,14 @@ msgstr "_Anulo"
msgid "Choose location to save file"
msgstr "Zgjedhe një skedare"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"opcione të pa njoftura '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Asnjë urdhër i specifikuar"
@@ -123,7 +123,7 @@ msgstr ""
msgid "Warning"
msgstr "Kujdes"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -219,7 +219,7 @@ msgstr ""
"\n"
"A dëshironi të vazhdoni?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -230,7 +230,7 @@ msgstr ""
"%s\n"
"A dëshironi t'azhurnoni bazën e të dhënave urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "zhdukja e %s"
@@ -250,9 +250,9 @@ msgstr "Instalimi i pakove `%s' (%s/%s)..."
msgid "_Done"
msgstr "Përfundoi"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalimi dështio"
#: ../gurpmi2:344
@@ -311,63 +311,63 @@ msgstr "Vetëm administratori i sistemin ka mundësi të instalojë pakot"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "e pa mundur hapja e rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "emri i skedares rpm është invalid [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "rikuperimi i skedareve rpm [%s]..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...rikuperim i bërë"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...rikuperimi dështoi: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "e pa mundur hyrja në skedaren rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "analizimi i pa mundur i \"%s\" në skedaren [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "i pa mundur regjistrimi i skedares rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "gabim gjatë regjistrimit të pakove lokale"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -407,7 +407,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "krijimi i skedares sintezë për burimin \"%s\""
@@ -432,7 +432,7 @@ msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "i pa mundur shkrimi i skedares konfiguruese [%s]"
@@ -562,7 +562,7 @@ msgstr "ekzistojnë pako të shumta me emër të njëjtë skedareje në rpm \"%s
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "nuk mund të analizohet në mënyrë korrekte [%s] në vlerën \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "e pa mundur hyrja në skedaren e listës të \"%s\", burim i injoruar"
@@ -700,7 +700,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "llogaritja md5sum e burimit ekzistues në hdlist (ose sintezës)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -709,103 +709,103 @@ msgstr ""
"burimi virtuel \"%s\" nuk duhet të posedoj hdlist të përcaktuar apo skedaren "
"list, burim i injoruar"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"burimi virtuel \"%s\" duhet të posedoj një url të qartë, burim i injoruar"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "emri i skedares rpm është invalid [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "e pa mundur gjetja e skedares listës të \"%s\", burim i injoruar"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "krijimi i skedares sintezë për burimin \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "e pa mundur hyrja në skedaren hdlist të \"%s\", burim i injoruar"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "analizimi i hdlist është i pa mundur të \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "burimi \"%s\" përpiqet të përdorë hdlist përdoruese, burim i injoruar"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "burimi \"%s\" përpiqet ta përdorë listën përdoruese, burim i injoruar"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "tentim në kalimin e një burimit ekzistues \"%s\", ndërprerje"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "shumë pika montuese për burimin tërheqës \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "marrje e mjetit tërheqës si \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "përdorime të ndryshme të mjeteve tërheqëse [%s] për \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "e pa mundur hyrja në shtegun e burimit tërheqës \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "shkruaja e skedares konfiguruese [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "përdorimi i burimit të lidhur për modë paralel: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -814,221 +814,221 @@ msgstr ""
"--synthesis nuk mund të përdoret me --media, --excludemedia, --sortmedia, --"
"update or --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Hulumtoi polisat e instaluara"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ekzekutim i dytë për ti mbledhur mvarjet\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "kalimi i pakos %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "dëshiron ta instaloj në vend që t'azhurnoj pakon %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "burimi \"%s\" ekziston me heret"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "burimi virtuel duhet të jetë lokal"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "leximi i majës nga burimi \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "zhdukja e burimit \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "hyrja e pa mundur në burimin e parë instalues"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "rikuperimi i skedares hdlist..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "e pa mundur hapja e rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"hyrja e pa mundur në burimin e parë instalues (asnjë skedare e gjetur në "
"hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "tento zgjedhjen e një burimi jo ekzistues \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "zgjedhje të shumta burimesh: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "zhdukja e burimit \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rikuperimi i skedareve rpm nga burimi\"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Menyja e konfigurimit është regjistruar"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Konfigurimi i Serverit"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "burimi \"%s\" nuk është i zgjedhur"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "kontrollimi i skedares hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "kontrollimi i skedares sintezë [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "krijimi i hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem gjatë leximit të skedares hdlist po sintezë të burimit \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopjimi dështoi"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopjimi i skedares përshkruese të \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopjimi i bërë"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "shkruarja e skedares për listën e burimit \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopjimi i [%s] dështoi"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "llogaritja md5sum e kopjimit të burimit hdlist (ose sintezës)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopjimi i [%s] dështoi"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "llogaritja md5sum e rikuperimit të burimit hdlist (ose sintezës)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...rikuperimi dështoi: mos pajtim i md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "asnjë skedare rpm e gjetur nga [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lexim i skedareve rpm nga [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "leximi i skedares rpm është i pa mundur nga [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1039,78 +1039,78 @@ msgstr ""
"kjo mund të ndodhë nëse ju e montoni manualisht repetorin kur e krijoni atë "
"burim."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "rikuperim i burimit hdlist (ose sintezës) të \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlista tesntuese është gjetur (ose sintezuar) sikur %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "asnjë skedare e gjetur hdlist për burimin \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "verifimi i skedares pubkey të \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importimi i çelësit %s nga skedarja pubkey e \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "është e pa mundur importimi i skedares pubkey të \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "shkruarja e skedares për listën e burimit \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "shtuarja e burimit %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "analizimi i hdlist është i pa mundur të \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem gjatë leximit të skedares sitezë të burimit \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "leximi i majës nga burimi \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Kemi ndjesë, zgjedhje e gabuar, provoni edhe një herë\n"
@@ -1166,47 +1166,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "hyrje e pa mundur në burimin \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Asnjë pako e emruar %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Pakot e radhitura përmbajnë %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "ka arritur nga mungesa %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "ka arritur gjatë mosmarrëveshjes %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "tentim në gradimin e %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "në urdhër për ta mbajturë %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "në urdhër për instalim %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "ka arritur gjatë konflikteve me %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "i pa kërkuar"
@@ -1355,25 +1355,32 @@ msgstr "Mos zhduk asgjë"
msgid "Checking to remove the following packages"
msgstr "Verifikimi i zhdukjes së pakove të radhitura"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
+msgstr[1] "Për ta plotësuar mvarësin, pakotë me radhë do të zhduken (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "zhdukja e pakos %s"
msgstr[1] "zhdukja e pakos %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (p/J)"
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Zhdukja dështoi"
@@ -1633,7 +1640,7 @@ msgstr " --verbose - model oratori.\n"
msgid " -m - the media in which the package was found\n"
msgstr " --list - shpalosi pakotë lira.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1644,19 +1651,19 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "përdorim specifik i mjedisit në %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1962,7 +1969,7 @@ msgstr " --noclean - mbane rpm dhe mos e përdor në fshehje.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2168,15 +2175,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
@@ -2185,92 +2187,94 @@ msgstr[1] ""
msgid "Press Enter when ready..."
msgstr "Shtypni mbi Enter kur jeni i gatshëm..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Anulo"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Pakot a radhitura kanë nënshkrime të pa pranueshëm"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "A dëshironi të vazhdoni me instalimin e tyre ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalimi dështio"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "shpërndarje e %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "instalimi i %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "instalimi i %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalimi dështio"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Tento një instalim pa verifikimin e mvarësive? (p/J) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Tento një instalim më të forcuar (--force)? (p/J) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "Instalimi i transmetimit të %d dështio"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Instalimi i transmetimit të %d dështio"
+msgstr[1] "Instalimi i transmetimit të %d dështio"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalimi është i mundur"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Gjdo gjë është veçse e instaluar"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2524,8 +2528,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2813,54 +2819,56 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - lejon hulumtimet në pajisje për ta gjetur pakon.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - dalje komplete me pakon që duhet të zhduket.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - shtrirja e hetimeve në pakot e mvarura.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - çfaqi grupet njashtu dhe emrat.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -g - çfaqi grupet njashtu dhe emrat.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - shpalosi pakotë lira.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - model i qetë.\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - lejon hulumtimet në pajisjetë për ta gjetur pakon.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - çfaqe versionin me hollësi, njashtu dhe emrin.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - pakoja tjetër është një pako burimi (njëjtë si --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2869,60 +2877,59 @@ msgstr ""
" -u - zhduke pakon nëse një version më i ri është veçse i "
"instaluar.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - imponoje një hulumtim të paqartë (njëjtë si --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -a - zgjedhni të gjitha korrespondencat në linjën komanduese.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" emrat apo skedaret rpm të marra në linjën komanduese janë nën hetim.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--liste-nodes mund të përdoret vetëm me --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Asnjë mjet i gjetur"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Asnjë imazh i gjetur"
+#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Asnjë mjet i gjetur"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "burimi \"%s\" nuk është i zgjedhur"
diff --git a/po/sr.po b/po/sr.po
index 1f26d0cb..0ebc2337 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -95,14 +95,14 @@ msgstr "_Поништи"
msgid "Choose location to save file"
msgstr "Изаберите фајл"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"непознате опције '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Ðије одређена команда"
@@ -132,7 +132,7 @@ msgstr ""
msgid "Warning"
msgstr "Упозорење"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "У реду"
@@ -226,7 +226,7 @@ msgstr ""
"\n"
"да ли желите да наÑтавите инÑталацију?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -237,7 +237,7 @@ msgstr ""
"%s\n"
"Можда желите да ажурирате вашу urpmi базу података."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "уклањам %s"
@@ -257,9 +257,9 @@ msgstr "ИнÑталирам пакет `%s' (%s/%s)..."
msgid "_Done"
msgstr "Урађено"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "ИнÑталација није уÑпела"
#: ../gurpmi2:344
@@ -315,63 +315,63 @@ msgstr "Само админиÑтратор може да инÑталира пÐ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "не могу да отворим rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "погрешно име rpm датотеке [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "добављам rpm фајл [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "... добављање завршено"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...повраћај неуÑпео: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "не могу да приÑтупим rpm датотеци [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Ðе могу да парÑирам \"%s\" у фајл [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "не могу да региÑтрујем rpm фајл"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "грешка при региÑтровању локалних пакета"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "креирам hdlist Ñимтезну датотеку за медиј \"%s\""
@@ -436,7 +436,7 @@ msgstr "не могу да извршим ÑƒÐ¿Ð¸Ñ Ñƒ конфигурацион
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "не могу да извршим ÑƒÐ¿Ð¸Ñ Ñƒ конфигурациону датотеку [%s]"
@@ -566,7 +566,7 @@ msgstr "поÑтоји више пакета Ñа иÑтим именом rpm д
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "не могу да иÑправно парÑирам [%s] за вредноÑÑ‚ \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "не могу да приÑтупим фајлу лиÑте за \"%s\", медиј игнориÑан"
@@ -703,7 +703,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "прорачунавам md5sum поÑтојеће source hdlist (или synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -712,106 +712,106 @@ msgstr ""
"виртуални медиј \"%s\" не би требао да има дефиниÑиану hdlist или лиÑту "
"фајлова, игноришем медиј"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "виртулени медиј \"%s\" би требао да има чиÑÑ‚ url, игноришем медиј"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "погрешно име rpm датотеке [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "немогу да пронађем датотеку лиÑте за \"%s\", медијум је игнориÑан"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "покушавам да Ñелектујем непоÑтојећи медиј \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "креирам hdlist Ñимтезну датотеку за медиј \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "не могу да приÑтупим hdlist фајлу за \"%s\", медиј је игнориÑан"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "не могу да парÑирам hdlist датотеку за \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"медиј \"%s\" покушава да кориÑти hdlist која је већ коришћена, медиј ће бити "
"игнориÑан"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"медиј \"%s\" покушава да кориÑти лиÑту која је већ употребљена, медиј је "
"игнориÑан"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "покушавам да премоÑтим поÑтојећи медиј \"%s\", избегавам"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "превише тачака монтирања за преноÑни медиј \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "узимам преноÑни уређај као \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "кориÑтећи различит преноÑни уређај или [%s] за \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "не могу да добавим путању за преноÑни медиј \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "упиÑујем у конфигурациону датотеку [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ðе могу да кориÑтим паралелни мод Ñа use-distrib модом"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "кориÑтим додељени медиј за паралелни мод: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -820,220 +820,220 @@ msgstr ""
"--synthesis Ñе не може кориÑтити Ñа --media, --excludemedia, --sortmedia, --"
"update или --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Тражи инÑталиране фонтове"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "Ñада Ñе проверавају међузавиÑноÑти пакета\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "преÑкачем пакет %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ће инÑталирати умеÑто ажурирати пакет %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "медиј \"%s\" већ поÑтоји"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "виртуални медиј мора да буде локални"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "читам хедере Ñа медија \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "уклањам медиј \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "не могу да приÑтупим првом инÑталационом медију"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "добављам hdlists фајл..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "не могу да отворим rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"не могу да приÑтупим првом инÑталационом медију (није пронађен hdlists фајл)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "покушавам да Ñелектујем непоÑтојећи медиј \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "покушавам да Ñелектујем вишеÑтруки медиј: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "уклањам медиј \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "добављам rpm фајлове ѕа медиј \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Конфигурација менија Ñачувана"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Подешавање Ñервера"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "медиј \"%s\" није изабран"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "иÑпитујем hdlist фајл [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "иÑпитујем synthesis фајл [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "креирам hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "проблем Ñа читањем hdlist или synthesis фајла за медиј \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...копирање није уÑпело"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копирам опиÑни фајл за \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...копирање завршено"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "упиÑујем лиÑту фајлова за медиј \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "копирање [%s] неуÑпело"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "прорачунавам md5sum копиране source hdlist (или synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "копирање [%s] неуÑпело"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "прорачунавам md5sum копиране source hdlist (или synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...повраћај неуÑпео: md5sum не одговара"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "нема rpm датотека на [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читам rpm фајлове Ñа [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "не могу да прочитам rpm фајлове Ñа [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1044,78 +1044,78 @@ msgstr ""
"ово Ñе може деÑити уколико Ñте ручно монтирали директоријум приликом "
"креирања медија."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "добављам изорни hdlist (или synthesis) за \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "пронађена теÑтирана hdlist (или synthesis) као %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "није пронађена hdlist датотека за медиј \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "иÑпитукем фајл Ñа јавним кључем за \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..импортовани кључ %s од јавног кључа за \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "не могу да импортујем јавни кључ за \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "упиÑујем лиÑту фајлова за медиј \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додани медиј %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "не могу да парÑирам hdlist датотеку за \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблем Ñа читањем synthesis фајла за медиј \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "читам хедере Ñа медија \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "ÐнNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "ДдDdYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Погрешан избор, пробајте поново\n"
@@ -1171,47 +1171,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "не могу да приÑтупим медију \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ðема пакета Ñа именом %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Следећи пакети Ñадрже %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "због не поÑтојања %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "због не задовољеног %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "покушавам да прикажем %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "да бих задржао %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "да би инÑталирао %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "због конфликта Ñа %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "незахтевано"
@@ -1357,13 +1357,21 @@ msgstr "Ðема ничега што би Ñе могло уклонити"
msgid "Checking to remove the following packages"
msgstr "Проверавам како бих уклонио Ñледеће пакете"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Ради задовољења завиÑноÑти, Ñледећи пакети ће бити уклоњени (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Ради задовољења завиÑноÑти, Ñледећи пакети ће бити уклоњени (%d MB)"
+msgstr[1] "Ради задовољења завиÑноÑти, Ñледећи пакети ће бити уклоњени (%d MB)"
+msgstr[2] "Ради задовољења завиÑноÑти, Ñледећи пакети ће бити уклоњени (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1371,12 +1379,12 @@ msgstr[0] "уклањам пакет %s"
msgstr[1] "уклањам пакет %s"
msgstr[2] "уклањам пакет %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (д/Ð) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Уклањање није уÑпело"
@@ -1629,7 +1637,7 @@ msgstr " -verbose - verbose режим.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - приказује фајлове у пакету.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1641,19 +1649,19 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "кориÑтим дато окружење на %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1953,7 +1961,7 @@ msgstr " --noclean - чува rpm који ниÑу коришћени у
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - бира Ñва поклапања у командној линији.\n"
@@ -2161,15 +2169,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2179,92 +2182,95 @@ msgstr[2] ""
msgid "Press Enter when ready..."
msgstr "ПритиÑните enter када будете Ñпремни..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "ОдуÑтани"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Следећи пакети имају неиÑправне потпиÑе"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Следећи пакети имају неиÑправне потпиÑе"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Да ли желите да наÑтавите конфигурацију ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "ИнÑталација није уÑпела"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "диÑтрибуирам %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ИнÑталирам %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "ИнÑталирам %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "ИнÑталација није уÑпела"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ИнÑталиација без провере завиÑноÑти (да/Ðе)? "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "ПриÑилна инÑталација (--force)? (да/Ðе) ?"
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d инÑтлациона транÑакција није уÑпела"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d инÑтлациона транÑакција није уÑпела"
+msgstr[1] "%d инÑтлациона транÑакција није уÑпела"
+msgstr[2] "%d инÑтлациона транÑакција није уÑпела"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "ИнÑталација је могућа"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Ñве је већ инÑталирано"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Ñве је већ инÑталирано"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Ñве је већ инÑталирано"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Ñве је већ инÑталирано"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "реÑтартујем urpmi"
@@ -2514,8 +2520,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2801,56 +2810,58 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - претрага уназад за оним што захтева пакет.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - дозвољава претраживање по пружању ради налажења пакета.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - потпун излаз Ñа пакетом који треба да Ñе уклони.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - проширује претрагу на завиÑноÑÑ‚ пакета.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - приказује групе укључујући и име.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - приказје кориÑне информације у, за људе читљивном "
"облику.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - приказује фајлове у пакету.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - тихи режим (мало порука).\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - дозвољава претраживање по пружању ради налажења пакета.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - приказује верзију укључујући и име.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - Ñледећи пакет је изворни пакет (иÑто као и --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2858,58 +2869,57 @@ msgid ""
msgstr ""
" -u - уклања пакете уколико је новија верзија већ инÑталирана.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - узрокује fuzzy претрагу (као и --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - бира Ñва поклапања у командној линији.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" имена или rpm фајлови који Ñу дати у командној линији Ñе проверавају.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --list-nodes Ñе може кориÑтити Ñамо Ñа опцијом --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Слике ниÑу пронађене"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "ÐИје пронађен image"
+#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Слике ниÑу пронађене"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "медиј \"%s\" није изабран"
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index fccdd3d4..53691dfe 100644
--- a/po/sr@Latn.po
+++ b/po/sr@Latn.po
@@ -14,7 +14,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-02-01 19:27+0100\n"
"Last-Translator: Toma Jankovic <webmaster@mandrake.co.yu>\n"
"Language-Team: serbian <mdk@linux.rs.sr>\n"
@@ -95,14 +95,14 @@ msgstr "_Poništi"
msgid "Choose location to save file"
msgstr "Izaberite fajl"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"nepoznate opcije '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Nije određena komanda"
@@ -132,7 +132,7 @@ msgstr ""
msgid "Warning"
msgstr "Upozorenje"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "U redu"
@@ -226,7 +226,7 @@ msgstr ""
"\n"
"da li želite da nastavite instalaciju?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -237,7 +237,7 @@ msgstr ""
"%s\n"
"Možda želite da ažurirate vašu urpmi bazu podataka."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "uklanjam %s"
@@ -257,9 +257,9 @@ msgstr "Instaliram paket `%s' (%s/%s)..."
msgid "_Done"
msgstr "Urađeno"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Instalacija nije uspela"
#: ../gurpmi2:344
@@ -315,63 +315,63 @@ msgstr "Samo administrator može da instalira pakete"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "pogrešno ime rpm datoteke [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "dobavljam rpm fajl [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "... dobavljanje završeno"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...povraćaj neuspeo: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ne mogu da pristupim rpm datoteci [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "Ne mogu da parsiram \"%s\" u fajl [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "ne mogu da registrujem rpm fajl"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "greška pri registrovanju lokalnih paketa"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -411,7 +411,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
@@ -436,7 +436,7 @@ msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ne mogu da izvršim upis u konfiguracionu datoteku [%s]"
@@ -566,7 +566,7 @@ msgstr "postoji više paketa sa istim imenom rpm datoteke \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ne mogu da ispravno parsiram [%s] za vrednost \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ne mogu da pristupim fajlu liste za \"%s\", medij ignorisan"
@@ -703,7 +703,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "proraÄunavam md5sum postojeće source hdlist (ili synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -712,106 +712,106 @@ msgstr ""
"virtualni medij \"%s\" ne bi trebao da ima definisianu hdlist ili listu "
"fajlova, ignorišem medij"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuleni medij \"%s\" bi trebao da ima Äist url, ignoriÅ¡em medij"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "pogrešno ime rpm datoteke [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "nemogu da pronađem datoteku liste za \"%s\", medijum je ignorisan"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "kreiram hdlist simteznu datoteku za medij \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ne mogu da pristupim hdlist fajlu za \"%s\", medij je ignorisan"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"medij \"%s\" pokušava da koristi hdlist koja je već korišćena, medij će biti "
"ignorisan"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"medij \"%s\" pokušava da koristi listu koja je već upotrebljena, medij je "
"ignorisan"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "pokušavam da premostim postojeći medij \"%s\", izbegavam"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "previÅ¡e taÄaka montiranja za prenosni medij \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "uzimam prenosni uređaj kao \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "koristeći razliÄit prenosni ureÄ‘aj ili [%s] za \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ne mogu da dobavim putanju za prenosni medij \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "upisujem u konfiguracionu datoteku [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ne mogu da koristim paralelni mod sa use-distrib modom"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "koristim dodeljeni medij za paralelni mod: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -820,220 +820,220 @@ msgstr ""
"--synthesis se ne može koristiti sa --media, --excludemedia, --sortmedia, --"
"update ili --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Traži instalirane fontove"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "sada se proveravaju međuzavisnosti paketa\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "preskaÄem paket %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "će instalirati umesto ažurirati paket %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medij \"%s\" već postoji"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtualni medij mora da bude lokalni"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Äitam hedere sa medija \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ne mogu da pristupim prvom instalacionom mediju"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "dobavljam hdlists fajl..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ne mogu da otvorim rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"ne mogu da pristupim prvom instalacionom mediju (nije pronađen hdlists fajl)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "pokušavam da selektujem nepostojeći medij \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "pokušavam da selektujem višestruki medij: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "uklanjam medij \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "dobavljam rpm fajlove dza medij \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Konfiguracija menija saÄuvana"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Podešavanje servera"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medij \"%s\" nije izabran"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "ispitujem hdlist fajl [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "ispitujem synthesis fajl [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "kreiram hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem sa Äitanjem hdlist ili synthesis fajla za medij \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiranje nije uspelo"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopiram opisni fajl za \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiranje završeno"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "proraÄunavam md5sum kopirane source hdlist (ili synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiranje [%s] neuspelo"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "proraÄunavam md5sum kopirane source hdlist (ili synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...povraćaj neuspeo: md5sum ne odgovara"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nema rpm datoteka na [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Äitam rpm fajlove sa [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ne mogu da proÄitam rpm fajlove sa [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1044,78 +1044,78 @@ msgstr ""
"ovo se može desiti ukoliko ste ruÄno montirali direktorijum prilikom "
"kreiranja medija."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "dobavljam izorni hdlist (ili synthesis) za \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "pronađena testirana hdlist (ili synthesis) kao %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nije pronađena hdlist datoteka za medij \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "ispitukem fajl sa javnim kljuÄem za \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "..importovani kljuÄ %s od javnog kljuÄa za \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ne mogu da importujem javni kljuÄ za \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "upisujem listu fajlova za medij \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "dodani medij %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ne mogu da parsiram hdlist datoteku za \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem sa Äitanjem synthesis fajla za medij \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "Äitam hedere sa medija \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "DdDdYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Pogrešan izbor, probajte ponovo\n"
@@ -1171,47 +1171,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "ne mogu da pristupim mediju \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nema paketa sa imenom %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Sledeći paketi sadrže %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "zbog ne postojanja %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "zbog ne zadovoljenog %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "pokušavam da prikažem %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "da bih zadržao %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "da bi instalirao %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "zbog konflikta sa %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nezahtevano"
@@ -1357,13 +1357,24 @@ msgstr "Nema niÄega Å¡to bi se moglo ukloniti"
msgid "Checking to remove the following packages"
msgstr "Proveravam kako bih uklonio sledeće pakete"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
+msgstr[1] ""
+"Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
+msgstr[2] ""
+"Radi zadovoljenja zavisnosti, sledeći paketi će biti uklonjeni (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1371,12 +1382,12 @@ msgstr[0] "uklanjam paket %s"
msgstr[1] "uklanjam paket %s"
msgstr[2] "uklanjam paket %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (d/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Uklanjanje nije uspelo"
@@ -1630,7 +1641,7 @@ msgstr " -verbose - verbose režim.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - prikazuje fajlove u paketu.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1642,19 +1653,19 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "koristim dato okruženje na %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1954,7 +1965,7 @@ msgstr " --noclean - Äuva rpm koji nisu korišćeni u keÅ¡u.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - bira sva poklapanja u komandnoj liniji.\n"
@@ -2163,15 +2174,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2181,92 +2187,95 @@ msgstr[2] ""
msgid "Press Enter when ready..."
msgstr "Pritisnite enter kada budete spremni..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Odustani"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sledeći paketi imaju neispravne potpise"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sledeći paketi imaju neispravne potpise"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Da li želite da nastavite konfiguraciju ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Instalacija nije uspela"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuiram %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "Instaliram %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "Instaliram %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Instalacija nije uspela"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Instaliacija bez provere zavisnosti (da/Ne)? "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Prisilna instalacija (--force)? (da/Ne) ?"
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d instlaciona transakcija nije uspela"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d instlaciona transakcija nije uspela"
+msgstr[1] "%d instlaciona transakcija nije uspela"
+msgstr[2] "%d instlaciona transakcija nije uspela"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Instalacija je moguća"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "sve je već instalirano"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "sve je već instalirano"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "sve je već instalirano"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "sve je već instalirano"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "restartujem urpmi"
@@ -2516,8 +2525,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2804,57 +2816,59 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - pretraga unazad za onim Å¡to zahteva paket.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - dozvoljava pretraživanje po pružanju radi nalaženja "
+"paketa.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - potpun izlaz sa paketom koji treba da se ukloni.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - proširuje pretragu na zavisnost paketa.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - prikazuje grupe ukljuÄujući i ime.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - prikazje korisne informacije u, za ljude Äitljivnom "
"obliku.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - prikazuje fajlove u paketu.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tihi režim (malo poruka).\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - dozvoljava pretraživanje po pružanju radi nalaženja "
-"paketa.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - prikazuje verziju ukljuÄujući i ime.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - sledeći paket je izvorni paket (isto kao i --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2863,58 +2877,57 @@ msgstr ""
" -u - uklanja pakete ukoliko je novija verzija već "
"instalirana.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - uzrokuje fuzzy pretragu (kao i --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - bira sva poklapanja u komandnoj liniji.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" imena ili rpm fajlovi koji su dati u komandnoj liniji se proveravaju.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr " --list-nodes se može koristiti samo sa opcijom --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Slike nisu pronađene"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "NIje pronađen image"
+#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Slike nisu pronađene"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "medij \"%s\" nije izabran"
diff --git a/po/sv.po b/po/sv.po
index a9d3abf8..e2ec51d5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -18,7 +18,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-sv - Mandriva 2007 Release\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-08-28 20:45+0300\n"
"Last-Translator: Thomas Backlund <tmb@mandriva.org>\n"
"Language-Team: Swedish <sv@li.org>\n"
@@ -114,12 +114,12 @@ msgstr "Av_bryt"
msgid "Choose location to save file"
msgstr "Välj var filen ska sparas"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Okända flagga %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Inga paket specifierade"
@@ -150,7 +150,7 @@ msgstr ""
msgid "Warning"
msgstr "Varning"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "OK"
@@ -244,7 +244,7 @@ msgstr ""
"\n"
"Vill du fortsätta med installationen?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -255,7 +255,7 @@ msgstr ""
"%s\n"
"Du bör försöka uppdatera urpmi-databasen."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "tar bort %s"
@@ -275,10 +275,10 @@ msgstr "Installerar paket \"%s\" (%s/%s)..."
msgid "_Done"
msgstr "_Klar"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Installationen misslyckades"
+msgid "Installation failed:"
+msgstr "Installationen misslyckades:"
#: ../gurpmi2:344
#, c-format
@@ -334,63 +334,63 @@ msgstr "Endast systemadministratörer får installera paket"
msgid "Running urpmi in restricted mode..."
msgstr "Kör urpmi i begränsat läge"
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "kunde inte öppna RPM-db"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ogiltigt RPM-filnamn [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "hämtar RPM-fil [%s]..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...hämtning klar"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...hämtning misslyckades: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "kan inte läsa rpm-fil [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "kan inte tyda spec-fil %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "kan inte registrera RPM-fil"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Inkompatibel arkitektur för rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "fel vid registrering av lokala paket"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Denna operation är inte tillåten i begränsat läge"
@@ -430,7 +430,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr "För många argument\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "bygg hdlist synthesis fil för media \"%s\""
@@ -455,7 +455,7 @@ msgstr "kan inte skriva inställningsfil [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "kan inte skriva inställningsfil [%s]"
@@ -585,7 +585,7 @@ msgstr "det finns flera paket med samma RPM-filnamn \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "kunde inte tyda [%s] på värde \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "kunde inte komma åt listfil för \"%s\", media ignorerat"
@@ -722,7 +722,7 @@ msgstr "varning: md5sum för %s finns ej i MD5SUM filen"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "Beräknar MD5-summa för existerande hdlist- (eller synthesis) källa"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -731,105 +731,105 @@ msgstr ""
"virutellt media \"%s\" bör inte ha en hdlist eller listfil definierad, media "
"ignorerat"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "virtuellt media \"%s\" bör ha en tydlig URL, media ignorerat"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "ogiltigt RPM-filnamn [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "kunde inte hitta listfil för \"%s\", media ignorerat"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "försöker välja media som inte finns \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "bygg hdlist synthesis fil för media \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "kunde inte komma åt hdlist-fil för \"%s\", media ignorerat"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "kunde ej tyda hdlist-fil för \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"media \"%s\" försöker använda en hdlist som redan används, media ignorerat"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"media \"%s\" försöker använda en lista som redan används, media ignorerat"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "försöker gå förbi befintligt media \"%s\", hoppar över"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "för många monteringspunkter för flyttbar media \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "tar flyttbar enhet som \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
"Meia \"%s\" är en ISO avbild, den kommer att monteras automatiskt vid behov."
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "använder annan flyttbar enhet [%s] för \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "Kunde inte hämta sökväg för flyttbart media \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "skriv inställningsfil [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Kan ej använda parallellt läge med use-distrib läge"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "använder associerad media för parallelläge: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -838,145 +838,145 @@ msgstr ""
"--synthesis kan inte användas med --media, --excludemedia, --sortmedia, -- "
"update eller --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Sök början: %s slut: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "utför andra passet för att räkna ut beroenden\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "hoppar över paket %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "skulle installera istället för att uppdatera paket %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "media \"%s\" finns redan"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "Virtuellt media måste vara tillgängligt lokalt"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "läser huvuden från media \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "tar bort media \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "kan inte komma åt det första installationsmediat"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "denna sökväg verkar inte innehålla någon distribution"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "hämtar media.cfg fil..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "kan inte tyda media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"kan inte läsa det första installationsmediumet (hittade ingen hdlists-fil)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "försöker välja media som inte finns \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "väljer flera media: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "tar bort media \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "omkonfigurerar urpmi för media \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...omkonfigurering misslyckades"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "omkonfigurering utförd"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Fel vid generering av namnfil: beroende %d kan inte hittas"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "Fel vid skrivning av namnfil: Kan inte skriva till filen (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "mediat \"%s\" är inte valt"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "undersöker hdlist-fil [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "undersöker synthesis-fil [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "bygger hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -985,77 +985,77 @@ msgstr ""
"Kan inte bygga synthesis fil för medium \"%s\". Din hdlist fil kan vara "
"skadad."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problem med att läsa hdlist- eller synthesis-fil för media \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopiering misslyckades"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kopierar beskrivningsfil för \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopiering klar"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "skriver listfil för media \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "kopiering av [%s] misslyckades (filen är misstänkligt liten)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "Beräknar MD5-summa för kopierad käll-hdlist (eller synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "kopiering av [%s] misslyckades (md5sum stämmer inte)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "beräknar MD5-summa för hämtade hdlist- (eller syntheses) källor"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...hämtning misslyckades: felaktig MD5-summa"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "inga RPM-filer hittade från [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "läser RPM-filer från [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "kan inte läsa RPM-filer från [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "inga rpms lästa"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1066,78 +1066,78 @@ msgstr ""
"detta kan hända om du manuellt monterade katalogen när du skapade detta "
"media."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ingen hdlist-fil hittad för media \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "hämtar käll-hdlist (eller synthesis) för \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hittat undersökt hdlist (eller synthesis) som %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ingen hdlist-fil hittad för media \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "undersöker \"pubkey\"-fil för \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...importerarde nyckel %s från \"pubkey\"-fil av \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "kunde inte importera \"pubkey\"-fil för \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "skriver listfil för media \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "lade till media %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "kunde ej tyda hdlist-fil för \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problem med att läsa synthesis-fil för media \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "läser huvuden från media \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "JjYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Felaktigt val, försök igen.\n"
@@ -1192,47 +1192,47 @@ msgstr "Felkonfigurerat media \"%s\" är markerat som flyttbart men är inte det
msgid "unable to access medium \"%s\""
msgstr "kunde inte komma åt media \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Inget paket med namn %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Följande paket innehåller %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "för att %s saknas"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "på grund av otillräckliga %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "försöker befordra %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "för att behålla %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "för att installera %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "på grund av konflikter med %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "obegärd"
@@ -1376,27 +1376,36 @@ msgstr "Ingenting att ta bort"
msgid "Checking to remove the following packages"
msgstr "Kontrollerar för att ta bort följande paket"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
"För att tillfredsställa beroenden kommer följande %d paket att tas bort (%d "
"MB)"
+msgstr[1] ""
+"För att tillfredsställa beroenden kommer följande %d paket att tas bort (%d "
+"MB)"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Ta bort %d paket?"
msgstr[1] "Ta bort %d paket?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (j/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Borttagning misslyckades"
@@ -1652,7 +1661,7 @@ msgstr " --vendor - visa distributör\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - visa källan paketet finns i\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - visa version, utgåva och arkitektur med namn.\n"
@@ -1662,12 +1671,12 @@ msgstr " -f - visa version, utgåva och arkitektur med namn.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "Felaktigt format: du kan endast använda en flervals-tagg"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "använder specifik miljö på %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1676,7 +1685,7 @@ msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Du kanske vill använda --name för att söka efter paketnamn.\n"
@@ -1979,7 +1988,7 @@ msgstr " --nolock - lås inte rpm db.\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - uppdatera endast paket med samma arkitektur.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - välj alla träffar på kommandoraden.\n"
@@ -2197,15 +2206,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(endast test, installation kommer inte att utföras)"
-#: ../urpmi:598
+#: ../urpmi:597
#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Fortsätt installationen av %d paket? (%d MB)"
-
-#: ../urpmi:599
-#, fuzzy, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] "Fortsätt installationen av %d paket? (%d MB)"
msgstr[1] "Fortsätt installationen av %d paket? (%d MB)"
@@ -2214,92 +2218,94 @@ msgstr[1] "Fortsätt installationen av %d paket? (%d MB)"
msgid "Press Enter when ready..."
msgstr "Tryck \"Enter\" vid klart..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Avbryt"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Följande paket har felaktiga signaturer"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Följande paket har felaktiga signaturer"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Vill du fortsätta installationen?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Installationen misslyckades"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "distribuerar %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "installerar %s från %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "installerar %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "Installationen misslyckades:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Prova att installera utan att kontrollera behov av andra filer? (j/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Försök ännu hårdare att installera (--force)? (j/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d installationstransaktioner misslyckades"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d installationstransaktioner misslyckades"
+msgstr[1] "%d installationstransaktioner misslyckades"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Installation är möjlig"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Allt är redan installerat"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Allt är redan installerat"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Allt är redan installerat"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Allt är redan installerat"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "startar om urpmi"
@@ -2558,9 +2564,11 @@ msgid "Cleaning up repackage directory [%s]...\n"
msgstr "Rensar upp ompaketeringskatalogen [%s]...\n"
#: ../urpmi.recover:72
-#, c-format
-msgid "%d files removed\n"
-msgstr "%d filer borttagna\n"
+#, fuzzy, c-format
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d filer borttagna\n"
+msgstr[1] "%d filer borttagna\n"
#: ../urpmi.recover:82
#, c-format
@@ -2851,56 +2859,58 @@ msgstr ""
" --whatrequires-recursive\n"
" - utökad omvänd sökning (inkluderar virtuella paket).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - sök i \"provides\" för att hitta paket.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
" -c - fullständig utmatning med paketet som ska tas bort.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - utöka förfrågning till att omfatta paketberoenden.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - visa grupper med namn.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - visa användbar information i en för människan läsbar "
"form.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - lista filerna i paketet.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tyst läge.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - sök i \"provides\" för att hitta paket.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - visa version och utgåva med namn.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - nästa paket är ett källpaket (samma som --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2908,46 +2918,46 @@ msgid ""
msgstr ""
" -u - ta bort paket om en nyare version redan är installerad.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - kräv luddig sökning (samma som --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - som -y, fast tvingar matchning av stora och små "
"bokstäver.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " namn eller rpm-filer som anges på kommandoraden förfrågas.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes kan endast användas med --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2955,16 +2965,20 @@ msgstr ""
"Notera: eftersom inget genomsökt media använder hdlists, kunde inte urpmf "
"ge resultat tillbaka\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ingen fillista hittades\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ingen ändringslogg hittades\n"
+#, fuzzy
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Fortsätt installationen av %d paket? (%d MB)"
+#~ msgstr[1] "Fortsätt installationen av %d paket? (%d MB)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Ingen fillista hittades\n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d paket, %d MB)"
diff --git a/po/tg.po b/po/tg.po
index dd2947eb..615eb8c9 100644
--- a/po/tg.po
+++ b/po/tg.po
@@ -16,7 +16,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tg\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-09-17 16:34+0500\n"
"Last-Translator: Victor Ibragimov <youth_opportunities@tajikngo.org>\n"
"Language-Team: Tajik\n"
@@ -114,14 +114,14 @@ msgstr "_Бекор кардан"
msgid "Choose location to save file"
msgstr "Барои захиракунии файл ҷойгиршавиро интихоб кунед"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"интихоби номуаÑйн '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "қуттии бо номи %s неÑÑ‚"
@@ -151,7 +151,7 @@ msgstr ""
msgid "Warning"
msgstr "Огоҳӣ"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
@@ -247,7 +247,7 @@ msgstr ""
"\n"
"Давом додан гирем?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -258,7 +258,7 @@ msgstr ""
"%s\n"
"Мумкин шумо додаҳои urpmi-ро нав мекунед"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "хориҷи қуттии %s "
@@ -278,9 +278,9 @@ msgstr "Барномаи коромодаи `%s' (%s/%s) коргузорӣ ме
msgid "_Done"
msgstr "_Шуд"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Коргузорӣ нагузашт"
#: ../gurpmi2:344
@@ -337,63 +337,63 @@ msgstr "Танҳо фавқулкорванд барои коргузоштанÐ
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "кушодани rpmdb номумкин"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "номи файли rpm-и нодуруÑти [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "барқароркунии файли rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...барқароркунӣ шуд"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...барқароркунӣ нагузашт: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "дохилшавии файли rpm-и [%s] номумкин"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "таҷзиÑи \"%s\" дар файли [%s] номумкин"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "бақайдгирии файли rpm номумкин"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "хатогии ба қайдгирии қуттиҳои маҳаллӣ"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -433,7 +433,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "файли Ñунъии офаридаи hdlist барои муҳити \"%s\""
@@ -458,7 +458,7 @@ msgstr "навиштани файли танзимдарории [%s] номум
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "навиштани файли танзимдарории [%s] номумкин"
@@ -588,7 +588,7 @@ msgstr "қуттиҳои зиёде бо чунин номи файли rpm \"%s
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "таҷзиÑи дурÑти [%s] дар қиммати \"%s\" номумкин"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "дохилшавии файли рӯйхати \"%s\" номумкин, муҳит рад шуд"
@@ -723,7 +723,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "ҳиÑоби md5sum-и Ñарчашмаи вуҷуд доштаи hdlist (Ñ‘ ин ки synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -732,107 +732,107 @@ msgstr ""
"Ñарчашмаи маҷозӣ \"%s\"на боÑд файли муайÑни hdlist Ñ‘ файли рӯйхатиродошта "
"бошад, Ñарчашма ба Ñътибор гирифта намешавад"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"Ñарчашмаи маҷозӣ \"%s\" боÑд url-и холӣ дошта бошад, Ñарчашма Ñътиборнадорад"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "номи файли rpm-и нодуруÑти [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "дарёфти файли рӯйхат барои \"%s\" номумкин, муҳит рад шуд"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "файли Ñунъии офаридаи hdlist барои муҳити \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "дохилшавии файли hdlist-и \"%s\" номумкин, муҳит рад шуд"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "таҷзиÑи файли hdlist - и \"%s\" номумкин"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"миёнаи \"%s\" кӯшиши иÑтифодаи hdlist-и аллакай иÑтифодашуда дорад, миёна "
"рад шуд"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"миёнаи \"%s\" кӯшиши иÑтифодаи рӯйхати аллакай иÑтифодашуда дорад, миёна рад "
"шуд"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "кӯшиши гузаштани муҳити вуҷуддоштаи \"%s\", кандашавӣ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "нуқтаи ваÑлкунии хеле зиёд барои миёнаи хориҷшаванда \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "қабули даÑтгоҳи хориҷшаванда ҳамчун \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "иÑтифодаи дигар даÑтгоҳи хориҷшавандаи [%s] барои \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "барқарори номироҳ барои миёнаи хориҷшаванда \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "файли танзимдарории [%s] навиÑед"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "УÑули параметрҳоро бо уÑули use-distrib ÑÐºÒ·Ð¾Ñ Ð¸Ñтифода бурда намешавад"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "барои навъи параллелӣ раÑонаи вобаÑташуда иÑтифода мешавад: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -841,224 +841,224 @@ msgstr ""
"--synthesis бо --media, --excludemedia, --sortmedia, --update ё --parallel "
"иÑтифода бурда намешавад"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Эзоҳ: то даме, ки раÑонаи ҷуÑтуҷӯшуда hdlists-ро иÑтифода набарад, urpmf "
"Ñгон натиҷаро баргардонида наметавонад\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Кофтукови рамзҳои муқарраршуда"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "роҳи дуюми ҳиÑоби вобаÑтагиҳо ба амал оварда мешавад\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "қуттӣ парофта мешавад %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "ба ҷои аз нав намудани қуттӣ коргузорӣ амалӣ хоҳад шуд %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "муҳити \"%s\" аллакай вуҷуд дорад"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "Ñарчашмаи маҷозӣ боÑд маҳаллӣ бошад"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "хониши Ñарлавҳаҳо аз миёнаи \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "дохилшавӣ ба миёнаи коргузориши аввала номумкин"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "барқароркунии файли hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "кушодани rpmdb номумкин"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"дохилшавӣ ба миёнаи коргузориши аввала номумкин (файли hdlists ёфт нашуд)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "кӯшиши интихоби муҳити вуҷуд надоштаи \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "интихобкунии миёнаи биÑÑ‘Ñ€: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "хориҷкунии миёнаи \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "бозтанзимкунии urpmi барои миёнаи \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...бозтанзимкунӣ бо нокомӣ анҷомид"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "бозтанзимгузорӣ хотима ёфт"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "муҳити \"%s\" интихоб нашудааÑÑ‚"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "Ñанҷидани файли hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "Ñанҷидани файли synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "офариниши hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "муаммои хондани файли hdlist Ñ‘ файли Ñарчашмаи synthesis \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...нуÑхабардорӣ нагузашт"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "нуÑхабардории файли тавÑифоти \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...нуÑхабардорӣ шуд"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "нуÑхабардории [%s] бо нокомӣ анҷомид (файл шубҳаомез кӯтоҳ аÑÑ‚)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"hdlist (Ñ‘ ин ки synthesis) аввали нуÑха гирифташуда ҳиÑоб мешавад md5sum"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "нуÑхабардории [%s] бо нокомӣ анҷомид (ба md5sum мутобиқат намекунад)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"аз hdlist-и аввалаи гирифташуда md5sum ҳиÑоб карда мешавад(Ñ‘ ин ки synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...барқароркунӣ нагузашт: мувофиқ набудан ба md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "файлҳои rpm аз [%s] ёфт нашуданд"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "хониши файлҳои rpm аз [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "хондани файли rpm номумкин аз [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1069,78 +1069,78 @@ msgstr ""
"ин ҳангоми ба таври даÑÑ‚Ó£ наÑб намудани феҳриÑÑ‚ дар ҳолати ÑохтаниÑарчашма "
"ба амал меоÑд."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "барқароркунии Ñарчашмаи hdlist (Ñ‘ synthesis) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "hdlist (ё synthesis)-и таҳқиқшуда ёфт шуд ҳамчун %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "файли hdlist барои муҳити \"%s\" ёфт нашуд"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "барои \"%s\"файли калиди кушод тафтиш карда мешавад..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...калиди гирифта шуда %s аз файли калиди кушода \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "навиштани файли рӯйхатии \"%s\" номумкин"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "навиштани файли рӯйхат барои миёнаи \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "миёнаи иловашуда %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "таҷзиÑи файли hdlist - и \"%s\" номумкин"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "муаммои хондани файли synthesis-и муҳити \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "хониши Ñарлавҳаҳо аз миёнаи \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "ÐнNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Ò²Ò³Yy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Мебахшед, интихоби бад боз кӯшиш кунед\n"
@@ -1196,47 +1196,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "дохилшавии муҳити \"%s\" номумкин"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Қуттии бо номи %s неÑÑ‚"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Қуттиҳои зерин Ñоҳиби %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "аз Ñабаби мавҷуд набудан %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "аз Ñабаби қонеъ набудан %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "кӯшиши фаъол намудан %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "барои нигоҳдории %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "барои коргузоштани %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "аз ҳиÑоби ба вуҷуд омадани муаммо бо %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "хоҳиш нашуда"
@@ -1390,26 +1390,34 @@ msgstr "Ҳеҷ чизро хориҷ карда намешавад"
msgid "Checking to remove the following packages"
msgstr "Тафтишкунӣ барои хориҷи қуттиҳои зерин"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Барои қаноатмандии тобеиÑтҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
+msgstr[1] ""
"Барои қаноатмандии тобеиÑтҳо, қуттиҳои зерин хориҷ карда мешаванд (%d МБ)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "хориҷкунии қуттии %s"
msgstr[1] "хориҷкунии қуттии %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (Ò³/Ð) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Хориҷкунӣ нагузашт"
@@ -1671,7 +1679,7 @@ msgstr " --verbose - ҳолати муфаÑÑал.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - барориш рӯйхати файлҳои баÑта.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1682,12 +1690,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "барои %s давраи махÑÑƒÑ Ð¸Ñтифода мегардад\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1696,7 +1704,7 @@ msgstr ""
"Эзоҳ: то даме, ки раÑонаи ҷуÑтуҷӯшуда hdlists-ро иÑтифода набарад, urpmf "
"Ñгон натиҷаро баргардонида наметавонад\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Шумо метавонед --name барои ҷуÑтуҷӯ барои баÑтаи номҳо, хоҳед бинед.\n"
@@ -2024,7 +2032,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2236,15 +2244,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
@@ -2253,92 +2256,94 @@ msgstr[1] ""
msgid "Press Enter when ready..."
msgstr "Вақте, ки тайёр Enter-ро пахш кунед..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Бекор кардан"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Қуттиҳои зерин имзоҳои бад доранд"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Шумо хоҳиши давом додани коргузориро доред ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Коргузорӣ нагузашт"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "тақÑимкунии %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "коргузории %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "коргузории %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Коргузорӣ нагузашт"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Коргузориро бе тафтиши тобеиÑтҳо кӯшиш кунем? (Ò²/Ð) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Коргузориро боз уÑтувортар (--force) кӯшиш кунем? (Ò²/Ð) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d коргузорӣ амалӣ нагардид"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d коргузорӣ амалӣ нагардид"
+msgstr[1] "%d коргузорӣ амалӣ нагардид"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Коргузорӣ мумкин аÑÑ‚"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааÑÑ‚"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Ҳамааш аллакай кор гузошта шудааÑÑ‚"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Ҳамааш аллакай кор гузошта шудааÑÑ‚"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Ҳамааш аллакай кор гузошта шудааÑÑ‚"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi бозоғоз шуда иÑтодааÑÑ‚"
@@ -2592,8 +2597,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2886,57 +2893,59 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - ҷуÑтуҷӯи Ð±Ð°Ñ€ÑŠÐ°ÐºÑ Ð±Ð°Ñ€Ð¾Ð¸ қуттии талабшуда.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - барои даÑÑ‚Ñ€Ð°Ñ Ð½Ð°Ð¼ÑƒÐ´Ð°Ð½Ð¸ барномаҳои коромода ҷуÑтуҷӯ "
+"намоед.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - ҳоÑилкунии пурра бо қуттӣ барои хориҷ шудан.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - дархоÑти ваÑеъ ба тобеиÑтҳои қуттӣ.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - чопи гурӯҳҳо ҳамчун бо ном.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - ахбороти фоиданокро дар намуди барои хондан қуллай чоп "
"кардан.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - барориш рӯйхати файлҳои баÑта.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - уÑули ором.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - барои даÑÑ‚Ñ€Ð°Ñ Ð½Ð°Ð¼ÑƒÐ´Ð°Ð½Ð¸ барномаҳои коромода ҷуÑтуҷӯ "
-"намоед.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - чопи нашр ва нуÑха ҳамчун бо ном.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - қуттии оÑнда қуттии Ñарчашмавӣ аÑÑ‚ (ҳамчун --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2944,47 +2953,47 @@ msgid ""
msgstr ""
" -u - хориҷи қуттӣ агар нашри навтарин коргузошта бошад.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - ҷуÑтуҷӯи норӯшан ниҳодан (ҳамчун --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - ба монанди -y, лекин маҷбуран ба ҳолати ғайри ҳаÑÑоÑиÑÑ‚ "
"мувофиқат мекунад.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" номҳо ва Ñ‘ файлҳои rpm дар Ñатри фармонӣ ишора шуда дархоÑÑ‚ мегарданд.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes танҳо иÑтифода бурда мешавад бо --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Эзоҳ: то даме, ки раÑонаи ҷуÑтуҷӯшуда hdlists-ро иÑтифода набарад, urpmf "
"Ñгон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2992,16 +3001,14 @@ msgstr ""
"Эзоҳ: то даме, ки раÑонаи ҷуÑтуҷӯшуда hdlists-ро иÑтифода набарад, urpmf "
"Ñгон натиҷаро баргардонида наметавонад\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ягон рӯйхати файл пайдо нагашт\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ягон номнавиÑи тағиротҳо пайдо нагардид\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Ягон рӯйхати файл пайдо нагашт\n"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "муҳити \"%s\" интихоб нашудааÑÑ‚"
diff --git a/po/th.po b/po/th.po
index e723299e..d57fe09b 100644
--- a/po/th.po
+++ b/po/th.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2002-11-25 13:52-0500\n"
"Last-Translator: Wachara Chinsettawong <wachara@yahoo.com>\n"
"Language-Team: Thai <th@li.org>\n"
@@ -89,14 +89,14 @@ msgstr "_ยà¸à¹€à¸¥à¸´à¸"
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"ทางเลือà¸à¹„ม่รู้จัภ'%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "ไม่มีà¸à¸²à¸£à¸à¸³à¸«à¸™à¸”คำสั่ง"
@@ -124,7 +124,7 @@ msgstr "ไม่สามารถ install บางเพà¸à¹€à¸à¸ˆà¹„ด้
msgid "Warning"
msgstr "คำเตือน"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "ตà¸à¸¥à¸‡"
@@ -209,7 +209,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr "à¹à¸žà¹‡à¸„เà¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้มี signatures ที่ไม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, fuzzy, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -219,7 +219,7 @@ msgstr ""
"à¸à¸²à¸£à¸•à¸´à¸”ตั้งล้มเหลวมีบางไฟล์ที่ขาดหายไป\n"
"ขอà¹à¸™à¸°à¸™à¸³à¹ƒà¸«à¹‰à¸—ำà¸à¸²à¸£à¸­à¸±à¸žà¹€à¸”ตà¸à¸²à¸™à¸‚้อมูล urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, fuzzy, c-format
msgid "removing %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้ง %s"
@@ -241,9 +241,9 @@ msgstr ""
msgid "_Done"
msgstr "ทำเรียบร้อยà¹à¸¥à¹‰à¸§"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "à¸à¸²à¸£à¸•à¸´à¸”ตั้งไม่สำเร็จ"
#: ../gurpmi2:344
@@ -298,63 +298,63 @@ msgstr "superuser เท่านั้นที่มีสิทธิติà¸
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, fuzzy, c-format
msgid "unable to open rpmdb"
msgstr "ไม่สามารถเปิดà¹à¸Ÿà¹‰à¸¡ %s\n"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "ชื่อ rpm fileไม่ถูà¸à¸•à¹‰à¸­à¸‡ [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, fuzzy, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸­à¹ˆà¸²à¸™à¸‚้อมูลจาà¸à¹„ฟล์ hdlists"
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "à¸à¸²à¸£à¸­à¹ˆà¸²à¸™à¸‚้อมูลเรียบร้อย"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "à¸à¸²à¸£à¸­à¹ˆà¸²à¸™à¸‚้อมูลล้มเหลว: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ไม่สามารถใช้งาน rpm file [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ไม่สามารถใช้งาน \"%s\" ใน file [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, fuzzy, c-format
msgid "unable to register rpm file"
msgstr "ไม่สามารถใช้งาน rpm file [%s]"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "ลงทะเบียน local package มีข้อผิดพลาด"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -394,7 +394,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "สร้าง hdlist synthesis file สำหรับ อุปà¸à¸£à¸“์ \"%s\""
@@ -419,7 +419,7 @@ msgstr "ไม่สามารถเขียน config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "ไม่สามารถเขียน config file [%s]"
@@ -549,7 +549,7 @@ msgstr "มีหลาย package ที่มีชื่อไฟล์เห
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "ไม่สามารถที่จะผ่าน [%s] ด้วยค่า \"%s\"อย่างถูà¸à¸•à¹‰à¸­à¸‡"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ไม่สามารถใช้งาน list file ของ \"%s\", medium ignored"
@@ -682,328 +682,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ัดลอà¸à¹‚ค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "อุปà¸à¸£à¸“์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่à¹à¸¥à¹‰à¸§ ,อุปà¸à¸£à¸“์ถูà¸à¸¢à¸à¹€à¸¥à¸´à¸à¹„ม่ใช้"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "อุปà¸à¸£à¸“์\"%s\"พยายามเลือà¸à¹ƒà¸Šà¹‰à¸­à¸¸à¸›à¸à¸£à¸“์ที่ใช้à¹à¸¥à¹‰à¸§, อุปà¸à¸£à¸“์ถูà¸à¸¢à¸à¹€à¸¥à¸´à¸à¹„ม่ใช้"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "ชื่อ rpm fileไม่ถูà¸à¸•à¹‰à¸­à¸‡ [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "ไม่สามารถหา list file สำหรับ\"%s\",medium ignored"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¥à¸µà¹ˆà¸¢à¸‡à¸à¸²à¸£à¸—ำงานของอุปà¸à¸£à¸“์ \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "สร้าง hdlist synthesis file สำหรับ อุปà¸à¸£à¸“์ \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ไม่สามารถใช้งาน hdlist file \"%s\", medium ignored"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ไม่สามารถ parse hdlist file of \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "อุปà¸à¸£à¸“์\"%s\"พยามยามใช้ hdlistที่ใช้อยู่à¹à¸¥à¹‰à¸§ ,อุปà¸à¸£à¸“์ถูà¸à¸¢à¸à¹€à¸¥à¸´à¸à¹„ม่ใช้"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "อุปà¸à¸£à¸“์\"%s\"พยายามเลือà¸à¹ƒà¸Šà¹‰à¸­à¸¸à¸›à¸à¸£à¸“์ที่ใช้à¹à¸¥à¹‰à¸§, อุปà¸à¸£à¸“์ถูà¸à¸¢à¸à¹€à¸¥à¸´à¸à¹„ม่ใช้"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¥à¸µà¹ˆà¸¢à¸‡à¸à¸²à¸£à¸—ำงานของอุปà¸à¸£à¸“์ \"%s\""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "จำนวนเม้าท์พ้อยท์มาà¸à¹€à¸à¸´à¸™à¹„ปสำหรับอุปà¸à¸£à¸“์à¹à¸šà¸šà¹€à¸„ลื่อนย้ายได้\"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸™à¸³à¸­à¸¸à¸›à¸à¸£à¸“์ที่เคลื่อนย้ายได้จาภ\"%s\" ออà¸à¸¡à¸²"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "ใช้อุปà¸à¸£à¸“์à¹à¸šà¸šà¸¢à¹‰à¸²à¸¢à¹€à¸‚้าออà¸à¹„ด้ที่à¹à¸•à¸à¸•à¹ˆà¸²à¸‡ [%s] สำหรับ \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "ไม่สามาถจะดึงส่วนของ pathname สำหรับอุปà¸à¸£à¸“์à¹à¸šà¸šà¹€à¸„ลื่อนย้ายได้\"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "เขียน config file[%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, fuzzy, c-format
msgid "using associated media for parallel mode: %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹ƒà¸Šà¹‰à¸­à¸¸à¸›à¸à¸£à¸“์ที่เà¸à¸µà¹ˆà¸¢à¸§à¸‚้องสำหรับ parallel mode : %s "
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "ทำà¸à¸²à¸£à¸œà¹ˆà¸²à¸™à¸„รั้งที่สองเพื่อทดสอบ ความเป็นอิสระ\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, fuzzy, c-format
msgid "skipping package %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้งà¹à¸žà¹‡à¸„เà¸à¹‡à¸ˆ %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "ปัà¸à¸«à¸²à¸à¸²à¸£à¸•à¸´à¸”ตั้งà¹à¸žà¹‡à¸„เà¸à¹‡à¸ˆ %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "อุปà¸à¸£à¸“์\"%s\"มีอยู่à¹à¸¥à¹‰à¸§"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "อุปà¸à¸£à¸“์\"%s\"พยายามเลือà¸à¹ƒà¸Šà¹‰à¸­à¸¸à¸›à¸à¸£à¸“์ที่ใช้à¹à¸¥à¹‰à¸§, medium ignored"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸—ำà¸à¸²à¸£à¸­à¹ˆà¸²à¸™ headers จาà¸à¸­à¸¸à¸›à¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸—ำà¸à¸²à¸£à¸¢à¹‰à¸²à¸¢à¸­à¸­à¸à¸­à¸¸à¸›à¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "ไม่สามารถเข้าถึงอุปà¸à¸£à¸“์เพื่อใช้ในà¸à¸²à¸£à¸•à¸´à¸”ตั้งอันà¹à¸£à¸"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸­à¹ˆà¸²à¸™à¸‚้อมูลจาà¸à¹„ฟล์ hdlists"
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "ไม่สามารถเปิดà¹à¸Ÿà¹‰à¸¡ %s\n"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "ไม่สามารถที่จะเข้าถึงอุปà¸à¸£à¸“์เพื่อà¸à¸²à¸£à¸•à¸´à¸”ตั้งตัวà¹à¸£à¸ (ไม่พบไฟล์ hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸¥à¸µà¹ˆà¸¢à¸‡à¸à¸²à¸£à¸—ำงานของอุปà¸à¸£à¸“์ \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "พยายามที่จะเลือà¸à¹ƒà¸Šà¹‰à¸¡à¸µà¹€à¸”ียหลายๆตัว: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸—ำà¸à¸²à¸£à¸¢à¹‰à¸²à¸¢à¸­à¸­à¸à¸­à¸¸à¸›à¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸‚ียน list file สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "บัันทึà¸à¸à¸²à¸£à¸•à¸±à¹‰à¸‡à¸„่าเมนูà¹à¸¥à¹‰à¸§"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "คอนฟิà¸à¹€à¸‹à¸­à¹€à¸§à¸­à¸£à¹Œ"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "อุปà¸à¸£à¸“์ \"%s\" ไม่ได้ถูà¸à¹€à¸¥à¸·à¸­à¸"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸£à¸§à¸ˆà¸ªà¸­à¸šà¹„ฟล์ hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸£à¸§à¸ˆà¸ªà¸­à¸šà¹„ฟล์ synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "สร้าง hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "มีปัà¸à¸«à¸²à¹ƒà¸™à¸à¸²à¸£à¸­à¹ˆà¸²à¸™à¹„ฟล์ synthesis สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, fuzzy, c-format
msgid "...copying failed"
msgstr "à¸à¸²à¸£à¸„ัดลอà¸à¸ªà¸¡à¸šà¸¹à¸£à¸“์"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ัดลอà¸à¸„ำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "à¸à¸²à¸£à¸„ัดลอà¸à¸ªà¸¡à¸šà¸¹à¸£à¸“์"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸‚ียน list file สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "à¸à¸²à¸£à¸—ำสำเนา [%s] ไม่สำเร็จ"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ัดลอà¸à¹‚ค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "à¸à¸²à¸£à¸—ำสำเนา [%s] ไม่สำเร็จ"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "à¸à¸²à¸£à¸”ึงโค้ดจาภhdlist (หรือ synthesis)ล้มเหลว"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "à¸à¸²à¸£à¸­à¹ˆà¸²à¸™à¸‚้อมูลล้มเหลว: %s"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "ไม่พบ rpm files จาภ[%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸­à¹ˆà¸²à¸™à¹„ฟล์ rpm จาภ[%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "ไม่สามารถอ่านไฟล์ rpm จาภ[%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1011,78 +1011,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸”ึงโค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, fuzzy, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ัดลอà¸à¹‚ค้ด hdlist (หรือ synthesis) ของ \"%s\"..."
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "ไม่พบ hdlist file สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸„ัดลอà¸à¸„ำอธิบายไฟล์ของ \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "ไม่สามารถเขียน list file ของ\"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¹€à¸‚ียน list file สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "อุปà¸à¸£à¸“์ที่ถูà¸à¹€à¸žà¸´à¹ˆà¸¡à¹€à¸‚้ามา %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ไม่สามารถ parse hdlist file of \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "มีปัà¸à¸«à¸²à¹ƒà¸™à¸à¸²à¸£à¸­à¹ˆà¸²à¸™à¹„ฟล์ synthesis สำหรับอุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸—ำà¸à¸²à¸£à¸­à¹ˆà¸²à¸™ headers จาà¸à¸­à¸¸à¸›à¸à¸£à¸“์\"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nnม"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yyช"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "à¸à¸²à¸£à¹€à¸¥à¸·à¸­à¸à¹„ม่ถูà¸à¸•à¹‰à¸­à¸‡ ลองใหม่ครับ\n"
@@ -1137,47 +1137,47 @@ msgstr "อุปà¸à¸£à¸“์ที่ไม่เชื่อมà¸à¸±à¸™ \"%s\
msgid "unable to access medium \"%s\""
msgstr "ไม่สามารถใช้อุปà¸à¸£à¸“์\"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "ไม่มี package ที่ชื่อ %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "packages ต่อไปนี้มี %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, fuzzy, c-format
msgid "due to missing %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, fuzzy, c-format
msgid "due to unsatisfied %s"
msgstr "ไม่มี kdesu "
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "ไม่มีอะไรที่ต้องลบทิ้ง\n"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "Window border theme"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, fuzzy, c-format
msgid "in order to install %s"
msgstr "ไม่สามารถติดตั้งà¹à¸žà¹‡à¸„เà¸à¸ˆ %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, fuzzy, c-format
msgid "due to conflicts with %s"
msgstr "%s ขัดà¹à¸¢à¹‰à¸‡à¸à¸±à¸š %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, fuzzy, c-format
msgid "unrequested"
msgstr "Konquest"
@@ -1318,24 +1318,30 @@ msgstr "ไม่มีà¹à¸—็à¸à¸—ี่จะลบ!"
msgid "Checking to remove the following packages"
msgstr "หนึ่งใน Packages ต่อไปนี้ต้องได้รับà¸à¸²à¸£à¸•à¸´à¸”ตั้ง "
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "เพื่อความถูà¸à¸•à¹‰à¸­à¸‡à¸‚องà¸à¸²à¸£à¹€à¸›à¹‡à¸™à¸­à¸´à¸ªà¸£à¸°à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¹‚ปรà¹à¸à¸£à¸¡à¹à¸žà¹‡à¸„เà¸à¸ˆà¸šà¸²à¸‡à¸•à¸±à¸§à¸ˆà¸°à¸–ูà¸à¸¥à¸šà¸—ิ้ง(%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "เพื่อความถูà¸à¸•à¹‰à¸­à¸‡à¸‚องà¸à¸²à¸£à¹€à¸›à¹‡à¸™à¸­à¸´à¸ªà¸£à¸°à¸£à¸°à¸«à¸§à¹ˆà¸²à¸‡à¹‚ปรà¹à¸à¸£à¸¡à¹à¸žà¹‡à¸„เà¸à¸ˆà¸šà¸²à¸‡à¸•à¸±à¸§à¸ˆà¸°à¸–ูà¸à¸¥à¸šà¸—ิ้ง(%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้งà¹à¸žà¹‡à¸„เà¸à¹‡à¸ˆ %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) "
-#: ../urpme:156
+#: ../urpme:159
#, fuzzy, c-format
msgid "Removal failed"
msgstr "ล็อà¸à¸­à¸´à¸™à¸¥à¹‰à¸¡à¹€à¸«à¸¥à¸§"
@@ -1583,7 +1589,7 @@ msgstr " -v - โหมดคำ\n"
msgid " -m - the media in which the package was found\n"
msgstr " --list - à¹à¸ªà¸”งรายชื่อà¹à¸žà¹‡à¸„เà¸à¸ˆà¸—ี่มีอยู่\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - เวอร์ชั่นที่พิมพ์, รีลีสà¹à¸¥à¸° arch พร้อมชื่อ.\n"
@@ -1593,19 +1599,19 @@ msgstr " -f - เวอร์ชั่นที่พิมพ์,
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1886,7 +1892,7 @@ msgstr " --noclean - เà¸à¹‡à¸š rpm ซึ่งไม่ถูà¸à¹ƒà¸Š
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - เลือà¸à¸—ั้งหมดที่ตรงà¸à¸±à¸šà¸„ำสั่งที่พิมพ์\n"
@@ -2081,15 +2087,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
#: ../urpmi:623
@@ -2097,92 +2098,93 @@ msgstr[0] ""
msgid "Press Enter when ready..."
msgstr "à¸à¸£à¸¸à¸“าà¸à¸” enter เมื่อพร้อม"
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "ยà¸à¹€à¸¥à¸´à¸"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "à¹à¸žà¹‡à¸„เà¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้มี signatures ที่ไม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "à¹à¸žà¹‡à¸„เà¸à¸ˆà¸•à¹ˆà¸­à¹„ปนี้มี signatures ที่ไม่ถูà¸à¸•à¹‰à¸­à¸‡"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "คุณยังต้องà¸à¸²à¸£à¸ˆà¸°à¸•à¸´à¸”ตั้งอีà¸à¸•à¹ˆà¸­à¹„ปหรือไม่ ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "à¸à¸²à¸£à¸•à¸´à¸”ตั้งไม่สำเร็จ"
+
+#: ../urpmi:711
#, fuzzy, c-format
msgid "distributing %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้ง %s\n"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้ง %s\n"
-#: ../urpmi:737
+#: ../urpmi:727
#, fuzzy, c-format
msgid "installing %s"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้ง %s\n"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "à¸à¸²à¸£à¸•à¸´à¸”ตั้งไม่สำเร็จ"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "ต้องà¸à¸²à¸£à¸—ดลองติดตั้งโดยที่ไม่ต้องตรอจสอบความเข้าà¸à¸±à¸™à¹„ด้? (y/N)"
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "ต้องà¸à¸²à¸£à¸—ดลองบังคับติดตั้ง (--force)? (y/N)"
-#: ../urpmi:825
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "à¸à¸²à¸£à¸•à¸´à¸”ตั้งไม่สำเร็จ"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "à¸à¸²à¸£à¸•à¸´à¸”ตั้งไม่สำเร็จ"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "à¸à¸²à¸£à¸•à¸´à¸”ตั้งสามารถทำได้"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "ทุà¸à¸­à¸¢à¹ˆà¸²à¸‡à¹„ด้ถูà¸à¸•à¸´à¸”ตั้งเรียบร้อยà¹à¸¥à¹‰à¸§"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "ทุà¸à¸­à¸¢à¹ˆà¸²à¸‡à¹„ด้ถูà¸à¸•à¸´à¸”ตั้งเรียบร้อยà¹à¸¥à¹‰à¸§"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "ทุà¸à¸­à¸¢à¹ˆà¸²à¸‡à¹„ด้ถูà¸à¸•à¸´à¸”ตั้งเรียบร้อยà¹à¸¥à¹‰à¸§"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "ทุà¸à¸­à¸¢à¹ˆà¸²à¸‡à¹„ด้ถูà¸à¸•à¸´à¸”ตั้งเรียบร้อยà¹à¸¥à¹‰à¸§"
-#: ../urpmi:871
+#: ../urpmi:862
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "à¸à¸³à¸¥à¸±à¸‡à¸•à¸´à¸”ตั้ง $rpm\n"
@@ -2417,8 +2419,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
#: ../urpmi.recover:82
#, c-format
@@ -2694,52 +2697,54 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - reverse search to what requires package.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - ย้อมให้มีà¸à¸²à¸£à¸„้นหาà¹à¸žà¹‡à¸„เà¸à¸ˆà¸ˆà¸²à¸à¸—ี่ป้อนให้\n"
+
+#: ../urpmq:93
#, fuzzy, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -d - ขยายà¸à¸²à¸£à¸„้นหาให้รวมถึงความเป็นอิสระของโปรà¹à¸à¸£à¸¡\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ขยายà¸à¸²à¸£à¸„้นหาให้รวมถึงความเป็นอิสระของโปรà¹à¸à¸£à¸¡\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - พิมพ์à¸à¸¥à¸¸à¹ˆà¸¡à¸žà¸£à¹‰à¸­à¸¡à¸Šà¸·à¹ˆà¸­\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -g - พิมพ์à¸à¸¥à¸¸à¹ˆà¸¡à¸žà¸£à¹‰à¸­à¸¡à¸Šà¸·à¹ˆà¸­\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - à¹à¸ªà¸”งรายชื่อà¹à¸žà¹‡à¸„เà¸à¸ˆà¸—ี่มีอยู่\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - โหมดเงียบ\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - ย้อมให้มีà¸à¸²à¸£à¸„้นหาà¹à¸žà¹‡à¸„เà¸à¸ˆà¸ˆà¸²à¸à¸—ี่ป้อนให้\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - พิมพ์เวอร์ชั่นà¸à¸±à¸šà¸£à¸µà¸¥à¸µà¸ªà¸žà¸£à¹‰à¸­à¸¡à¸Šà¸·à¹ˆà¸­\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - à¹à¸žà¹‡à¸„เà¸à¸ˆà¸•à¹ˆà¸­à¹„ปเป็นà¹à¸žà¹‡à¸„เà¸à¸ˆà¹‚ค้ด (เช่นเดียวà¸à¸±à¸š --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2747,57 +2752,56 @@ msgid ""
msgstr ""
" -u - ทำà¸à¸²à¸£à¸¥à¸šà¹à¸žà¹‡à¸„เà¸à¸ˆà¸—ิ้งถ้าเวอร์ชั่นล่าสุดได้รับà¸à¸²à¸£à¸•à¸´à¸”ตั้งลงในเครื่องà¹à¸¥à¹‰à¸§\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - ใช้à¸à¸²à¸£à¸„้นหาà¹à¸šà¸šà¹„ม่เจาะจง(เช่นเดียวà¸à¸±à¸šà¸à¸²à¸£à¹ƒà¸Šà¹‰ --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - เลือà¸à¸—ั้งหมดที่ตรงà¸à¸±à¸šà¸„ำสั่งที่พิมพ์\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr "ชื่อของไฟล์หรือของ rpm ที่ให้จาà¸à¸„ำสั่งที่พิมพ์à¸à¸³à¸¥à¸±à¸‡à¸–ูà¸à¸„้นหา\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes can only be used with --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "ไม่พบรุปภาพ"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "ไม่พบรุปภาพ"
+#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "ไม่พบรุปภาพ"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "อุปà¸à¸£à¸“์ \"%s\" ไม่ได้ถูà¸à¹€à¸¥à¸·à¸­à¸"
diff --git a/po/tl.po b/po/tl.po
index 01bb1fa3..74c18955 100644
--- a/po/tl.po
+++ b/po/tl.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tl\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-03-08 20:24+0800\n"
"Last-Translator: Eric Pareja <xenos@upm.edu.ph>\n"
"Language-Team: Filipino <salinpinoy@comitus.net>\n"
@@ -106,14 +106,14 @@ msgstr "_Cancel"
msgid "Choose location to save file"
msgstr "Piliin ang lugar kung saan ise-save ang file"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"mga hindi kilalang option '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Walang command na nabanggit"
@@ -143,7 +143,7 @@ msgstr ""
msgid "Warning"
msgstr "Babala"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ayos"
@@ -241,7 +241,7 @@ msgstr ""
"\n"
"Gusto mong ituloy ang pag-i-install?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -252,7 +252,7 @@ msgstr ""
"%s\n"
"Baka gusto mong i-update ang iyong urpmi database"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "inaalis ang %s"
@@ -272,9 +272,9 @@ msgstr "Ini-install ang package na `%s' (%s/%s)..."
msgid "_Done"
msgstr "Tapos"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Pag-i-install ay nabigo"
#: ../gurpmi2:344
@@ -333,63 +333,63 @@ msgstr "Superuser lamang ang pinapayagang mag-install ng mga package"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "hindi mabuksan ang rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "inbalidong pangalan ng rpm file [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "kinukuha muli ang rpm file [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...pagkukuha muli natapos"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...pagkukuha muli nabigo: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "hindi ma-access ang rpm file [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "hindi ma-parse ang \"%s\" sa file [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "hindi mairehistro ang rpm file"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "error sa pagrerehistro ng mga local package"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -429,7 +429,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
@@ -454,7 +454,7 @@ msgstr "hindi maisulat ang config file [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "hindi maisulat ang config file [%s]"
@@ -584,7 +584,7 @@ msgstr "may maramihang package na may parehong pangalan ng rpm file \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "hindi ma-parse ng tama ang [%s] sa halaga na \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "hindi ma-access ang list file ng \"%s\", medium di-pinansin"
@@ -723,7 +723,7 @@ msgstr "babala: md5sum para sa %s ay wala sa talaksang MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "kino-compute ang md5sum ng mayroong source hdlist (o synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -732,105 +732,105 @@ msgstr ""
"virtual medium na \"%s\" ay dapat nag-define ng hdlist o list file, medium "
"di-pinansin"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"virtual medium na \"%s\" ay dapat may malinaw na url, medium di-pinansin"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "inbalidong pangalan ng rpm file [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "hindi mahanap ang list file para sa \"%s\", medium di-pinansin"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "nakabuo ng hdlist synthesis file para sa medium na \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "hindi ma-access ang hdlist file ng \"%s\", medium di-pinansin"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "hindi ma-parse ang hdlist file ng \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"medium \"%s\" ay sumusubok gumamit ng gamit na na hdlist, medium di-pinansin"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"medium \"%s\" ay sumusubok gumamit ng gamit na na list, medium di-pinansin"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "sinusubukang i-bypass ang mayroon nang medium na \"%s\", iniiwasan"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "sobrang daming mount point para sa naaalis na medium na \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "kinukuha ang naaalis na device bilang \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, fuzzy, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Ang \"%s\" ay ISO image at isasalang ng kusa"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "gumagamit ng iba't-ibang naaalis na device [%s] para sa \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "hindi makuha muli ang pathname para sa naaalis na medium \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "isulat ang config file [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Hindi magamit ang parallel mode kasama ang use-distrib mode"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "ginagamit ang kasamahang media para sa parallel mode: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -839,144 +839,144 @@ msgstr ""
"--synthesis ay hindi magagamit kasama ang --media, --excludemedia,--"
"sortmedia, --update o --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Hanapin ang mga naka-install na font"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "nagsasagawa ng pangalawang pagdaan para i-compute ang mga dependency\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "nilalaktawan ang package na %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "i-install imbis na i-upgrade ang package na %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "medium na \"%s\" ay mayroon na"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "virtual medium ay kailangang local"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "binabasa ang mga header mula sa medium na \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "inaalis ang medium na \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "hindi ma-access ang unang installation medium"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "kinukuha muli ang hdlists file..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "hindi mabuksan ang rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "hindi ma-access ang unang installation medium (walang hdlists na file)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "sinusubukang piliin ang di-mayroong medium na \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "pumipili ng maramihang media: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "inaalis ang medium na \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "kinukuha muli ang mga rpm file mula sa medium na \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Configuration file"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Pagsasaayos ng Server"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "medium na \"%s\" ay hindi nakapili"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "sinusuri ang hdlist file [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sinusuri ang synthesis file [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "binubuo ang hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, fuzzy, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -985,77 +985,77 @@ msgstr ""
"Hindi makabuo ng talaksang synthesis para sa medium na \"%s\". Maaaring sira "
"ang inyong talaksang hdlist."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "problema sa pagbabasa ng hdlist o synthesis file ng medium na \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...pagkokopya nabigo"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "kinokopya ang paglalarawan na file ng \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...pagkokopya natapos"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "isinusulat ang list file para sa medium na \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "pagkopya ng [%s] nabigo (file ay kahina-hinalang maliit)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "kino-compute ang md5sum ng nakopyang source hdlist (o synthesis)"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "pagkopya ng [%s] nabigo (md5sum di-tugma)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "kino-compute ang md5sum ng nakuhang source hdlist (o synthesis)"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...pagkukuha muli nabigo: md5sum di-tugma"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "walang nahanap na rpm file mula sa [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "binabasa ang mga rpm file mula sa [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "hindi mabasa ang mga rpm file mula sa [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, fuzzy, c-format
msgid "no rpms read"
msgstr "walang nabasang rpm"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1066,78 +1066,78 @@ msgstr ""
"ito ay mangyayari kung mano-mano mong in-mount ang directory noong ginagawa "
"ang medium."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "kinukuha muli ang source hdlist (o synthesis) ng \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "nahanap ang sinuring hdlist (o synthesis) bilang %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "walang nahanap na hdlist file para sa medium na \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "sinusuri ang pubkey file ng \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...in-import ang key na %s mula sa pubkey file ng \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "hindi ma-import ang pubkey file ng \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "isinusulat ang list file para sa medium na \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "idinagdag ang medium na %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "hindi ma-parse ang hdlist file ng \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "problema sa pagbabasa ng synthesis file ng medium na \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "binabasa ang mga header mula sa medium na \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "HhNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "OoYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Sorry, masamang pili, subukan muli\n"
@@ -1192,47 +1192,47 @@ msgstr "incoherent na medium na \"%s\" may markang naaalis pero hindi naman"
msgid "unable to access medium \"%s\""
msgstr "hindi ma-access ang medium na \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Walang package na may pangalang %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Ang mga sumusunod na package ay naglalaman ng %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "dahil sa nawawalang %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "dahil sa hindi na-satisfy na %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "sinusubukang i-promote ang %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "para maitago ang %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "para ma-install ang %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "dahil sa pagkakasalungat sa %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "hindi hiniling"
@@ -1387,26 +1387,34 @@ msgstr "Walang maaalis"
msgid "Checking to remove the following packages"
msgstr "Nagsusuri para alisin ang mga sumusunod na package"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
+msgstr[1] ""
"Para ma-satisfy ang dependency, ang sumusunod na package ay aalisin (%d MB)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "inaalis ang package na %s"
msgstr[1] "inaalis ang package na %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (o/H) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Pag-aalis nabigo"
@@ -1674,7 +1682,7 @@ msgstr " --verbose - masalita na paraan.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - ilista ang mga file sa package.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1687,12 +1695,12 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "ginagamit ang specific environment sa %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1701,7 +1709,7 @@ msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, fuzzy, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -2021,7 +2029,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - iapgreyd lamang ang mga paketeng pareho ang arkitektura.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - piliin lahat ng katugma sa command line.\n"
@@ -2238,15 +2246,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
@@ -2255,92 +2258,94 @@ msgstr[1] ""
msgid "Press Enter when ready..."
msgstr "Pindutin ang Enter kung handa na..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "I-cancel"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Ang mga sumusunod na package ay may masamang signature"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Ang mga sumusunod na package ay may masamang signature"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Gusto mong ituloy ang pag-i-install ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Pag-i-install ay nabigo"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "dini-distribute ang %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "ini-install ang %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "ini-install ang %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Pag-i-install ay nabigo"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Subukan ang pag-i-install na hindi sinusuri ang mga dependency? (o/H) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Subukan ang pag-i-install nang mas malakas (--force)? (o/H) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d transaksyong pag-i-install ay nabigo"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d transaksyong pag-i-install ay nabigo"
+msgstr[1] "%d transaksyong pag-i-install ay nabigo"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Pag-i-install ay maaari"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Lahat ay naka-install na"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Lahat ay naka-install na"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Lahat ay naka-install na"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Lahat ay naka-install na"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "sinisimulan muli ang urpmi"
@@ -2598,8 +2603,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2899,58 +2906,60 @@ msgstr ""
"ng\n"
" package.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - payagang maghanap sa provides para hanapin ang package.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kompletong output kasama ang package na aalisin.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - ipaabot ang tanong sa package dependencies.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - i-print ang mga grupo na may pangalan din.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - mag-print ng kapakipakinabang na inpormasyon sa anyong\n"
" nababasa ng tao.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - ilista ang mga file sa package.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - tahimik na paraan.\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - payagang maghanap sa provides para hanapin ang package.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
" -r - i-print ang version at release na may pangalan din.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - ang kasunod na package ay source package (pareho ng --"
"src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2959,46 +2968,46 @@ msgstr ""
" -u - alisin ang package kung may mas bagong version na\n"
" naka-install.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
" -y - igiit ang fuzzy na paghahanap (pareho ng --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - piliin lahat ng katugma sa command line.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" ang mga pangalan o rpm file na binigay sa command line ay tatanungin.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes ay magagamit lang kasama ang --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3006,16 +3015,14 @@ msgstr ""
"Tandaan: dahil wala sa mga hinanapang media ay gumagamit ng mga hdlist, ang "
"urpmf ay hindi makapagbalik ng kahit anong resulta\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Walang nahanap na filelist\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Walang nahanap na changelog\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Walang nahanap na filelist\n"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "medium na \"%s\" ay hindi nakapili"
diff --git a/po/tr.po b/po/tr.po
index c7f8e554..b44ab332 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -17,7 +17,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-tr\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-01-26 05:48+0200\n"
"Last-Translator: Ömer Fadıl USTA <omer_fad@hotmail.com>\n"
"Language-Team: Turkish <mandrakei18n@yahoogroups.com>\n"
@@ -97,14 +97,14 @@ msgstr "Ä°p_tal"
msgid "Choose location to save file"
msgstr "Bir dosya seçin"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"bilinmeyen seçenek '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "Komut belirtmemiÅŸsiniz"
@@ -132,7 +132,7 @@ msgstr "Bazı paketler kurulamadı"
msgid "Warning"
msgstr "Uyarı"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Tamam"
@@ -190,6 +190,7 @@ msgstr ""
"gerekiyor (%d Mb)"
#: ../gurpmi2:219 ../urpmi:583
+#, c-format
msgid "(%d package, %d MB)"
msgid_plural "(%d packages, %d MB)"
msgstr[0] "(%d paket, %d MB)"
@@ -228,7 +229,7 @@ msgstr ""
"\n"
"Yüklemeye devam etmek istiyor musunuz?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -239,7 +240,7 @@ msgstr ""
"%s\n"
"Urpmi veritabanınızı güncellemek isteyebilirsiniz"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s kaldırılıyor"
@@ -259,9 +260,9 @@ msgstr "'%s' paketi kuruluyor ( %s/%s )..."
msgid "_Done"
msgstr "Bitti"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Kurulum başarısız oldu"
#: ../gurpmi2:344
@@ -321,63 +322,63 @@ msgstr "Paketleri kurmak için sadece sistem yöneticisi yetkilidir"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb açılamıyor"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "rpm dosya ismi [%s] geçersiz"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Rpm dosyası [%s] getiriliyor..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...ele alma tamamlandı"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...getirme başarısız: [%s]"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "rpm dosyasına [%s] erişilemiyor"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "\"%2$s\" dosyasındaki \"%1$s\" ayrıştırılamıyor"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "rpm dosyası kayıt edilemiyor"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "yerel paketlerin sicil kaydı yapılırken hata"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -417,7 +418,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
@@ -442,7 +443,7 @@ msgstr "yapılandırma dosyasına [%s] yazılamıyor"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "yapılandırma dosyasına [%s] yazılamıyor"
@@ -572,7 +573,7 @@ msgstr "aynı \"%s\" isminde çok sayıda rpm paketi var."
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "[%s] (\"%s\" değerindeki) düzgün ayrıştırılamıyor"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "\"%s\" ortamının liste dosyasına erişilemiyor, yoksayıldı"
@@ -705,7 +706,7 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, fuzzy, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -713,322 +714,322 @@ msgid ""
msgstr ""
"\"%s\" ortamı, halen kullanımdaki hdlist'i kullanmaya çalışıyor, yoksayıldı"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, fuzzy, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "rpm dosya ismi [%s] geçersiz"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "\"%s\" için liste dosyası bulunamıyor, ortam yoksayılıyor"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "\"%s\" için sabit disk listesi sentezleme dosyası oluşturuldu."
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "\"%s\" ortamının hdlist dosyasına erişilemiyor, yoksayıldı"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"\"%s\" ortamı, halen kullanımdaki hdlist'i kullanmaya çalışıyor, yoksayıldı"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "\"%s\" çıkarılabilir ortam için çok bazla bağlantı noktası tanımlı"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "\"%s\" çıkarılabilir aygıt olarak alındı."
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "Farklı %s çıkarılabilir aygıtları %s için kullanılıyor"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "\"%s\" ayrılabilir aygıtı için yolismi ele alınamadı"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "yapılandırma dosyası [%s] yazılıyor"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "paralel mod için ortak ortam kullanılıyor: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, fuzzy, c-format
msgid "Search start: %s end: %s"
msgstr "Yüklü yazıtiplerini ara"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "bağımlılıkların hesaplanması için ikinci geçiş yapılıyor\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s paketi atlanıyor"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, fuzzy, c-format
msgid "would install instead of upgrade package %s"
msgstr "%s paketi kurulumunda problem"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "\"%s\" ortamı zaten var"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, fuzzy, c-format
msgid "virtual medium needs to be local"
msgstr "\"%s\" kullanımda olan listeyi kullanmaya çalışıyor, yoksayıldı"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "\"%s\" ortamından başlıklar okunuyor"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "aygıt kaldırılıyor \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "İlk kurulum ortamına erişilemiyor"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "hard disk rpm listesi (hdlists) alınıyor..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "rpmdb açılamıyor"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "İlk kurulum ortamına erişilemiyor ( hdlists dosyası bulunamadı)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, fuzzy, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "varolan \"%s\" ortamı atlanmaya çalışılırken engelleniyor"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "Çoklu medya seçiliyor: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "aygıt kaldırılıyor \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, fuzzy, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rpm dosyaları ortamdan alınıyor \"%s\"..."
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, fuzzy, c-format
msgid "...reconfiguration failed"
msgstr "Yapılandırma dosyası"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, fuzzy, c-format
msgid "reconfiguration done"
msgstr "Sunucu Ayarları"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "\"%s\" seçilmedi"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "sabit disk listesi(hdlist) dosyası [%s] okunuyor"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "sentez dosyası [%s] inceleniyor"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "sabit disk listesi [%s] oluÅŸturuluyor"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, fuzzy, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...kopyalama başarısız"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "\"%s\"in açıklama dosyası kopyalanıyor..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...kopyalama tamamlandı"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "\"%s\" için listesi dosyası yazılıyor"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, fuzzy, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "[%s] kopyalaması başarısız"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, fuzzy, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) kopyalanıyor..."
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, fuzzy, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "[%s] kopyalaması başarısız"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, fuzzy, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "kaynak sabit disk listesi (ya da sentez) dosyası alımı başarısız oldu"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, fuzzy, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...getirme başarısız: [%s]"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "[%s] de rpm dosyaları yok"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "rpm dosyaları [%s]'den okunuyor"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]'den rpm dosyaları okunamadı: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1036,78 +1037,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "\"%s\" in kaynak hdlisti (ya da sentezi) getiriliyor..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "incelenmiÅŸ hdlist (yada sentez) %s olarak bulundu"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "\"%s\" için sabit disk listesi dosyası bulunamadı"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, fuzzy, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' medyasının dosyayı sınanıyor..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, fuzzy, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "\"%s\" liste dosyası yazılamıyor"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, fuzzy, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "\"%s\" liste dosyası yazılamıyor"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "\"%s\" için listesi dosyası yazılıyor"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "%s ortamı eklendi"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "\"%s\" sabit disk listesi dosyası ayrıştırılamıyor"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "\"%s\" için sabit disk listesi sentezleme dosyasının okunmasında hata"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "\"%s\" ortamından başlıklar okunuyor"
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "HhNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "EeYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Üzgünüm ,hatalı seçim, tekrar deneyin\n"
@@ -1163,47 +1164,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "\"%s\" ortamına erişilemiyor"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, fuzzy, c-format
msgid "No package named %s"
msgstr "%s adında bir paket yok"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Bu paketler %s içeriyor: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s paketinin kayıplığından"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "%s' den dolayı yetersiz"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, fuzzy, c-format
msgid "trying to promote %s"
msgstr "Kaldırılacak bir şey yok"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, fuzzy, c-format
msgid "in order to keep %s"
msgstr "sıradaki kurulum %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "sıradaki kurulum %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "%s paketi ile çelişkisinden"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "talep edilmemiÅŸ"
@@ -1348,26 +1349,32 @@ msgstr "Kaldırılacak bir şey yok"
msgid "Checking to remove the following packages"
msgstr "Kaldırılmak için sıradaki paketler sınanıyor"
-#: ../urpme:132
+#: ../urpme:133
#, fuzzy, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
"Bağımlılık sorununu aşabilmek için, aşağıdaki paketlerin kaldırılması "
"gerekiyor (%d Mb)"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "%s paketi kaldırılıyor"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " ( y, e / H , N ) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Kaldırma başarısız"
@@ -1627,7 +1634,7 @@ msgstr " --verbose - kalabalık kipi.\n"
msgid " -m - the media in which the package was found\n"
msgstr " --list - tüm paketleri göster\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - isminin yanında sürüm ve kurnazlığını yazar.\n"
@@ -1637,19 +1644,19 @@ msgstr " -f - isminin yanında sürüm ve kurnazlığını yazar.\n
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "%s' de belirtilen ortam kullanılıyor\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1936,7 +1943,7 @@ msgstr " --noclean - rpm'yi ön bellekte kullanılmadan sakla\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - komut satırındakilere uyanların tümünü seçer. \n"
@@ -2141,15 +2148,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
#: ../urpmi:623
@@ -2157,92 +2159,93 @@ msgstr[0] ""
msgid "Press Enter when ready..."
msgstr "Hazır olduğunuzda Enter'a basın..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Ä°ptal"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Sonraki paketler hatalı imza içeriyor"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Sonraki paketler hatalı imza içeriyor"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Yüklemeye devam etmek istiyor musunuz ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Kurulum başarısız oldu"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "%s dağıtılıyor"
-#: ../urpmi:735
+#: ../urpmi:725
#, fuzzy, c-format
msgid "installing %s from %s"
msgstr "%s kuruluyor"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s kuruluyor"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Kurulum başarısız oldu"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Paket bağımlılıklarını denetlemeksizin kurulum denensin mi (e/H) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Belki daha zorlayıcı bir seçenek gerekebilir (--force)? (e/H) "
-#: ../urpmi:825
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "kurulum yönergeleri"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "kurulum yönergeleri"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Kurulum Başarılı"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "herÅŸey zaten kurulu"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "herÅŸey zaten kurulu"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "herÅŸey zaten kurulu"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "herÅŸey zaten kurulu"
-#: ../urpmi:871
+#: ../urpmi:862
#, fuzzy, c-format
msgid "restarting urpmi"
msgstr "slurpd başlatılıyor: "
@@ -2493,8 +2496,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
#: ../urpmi.recover:82
#, c-format
@@ -2782,111 +2786,112 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr " -R - gerekli paketler için ters arama.\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - paketi bulmak için aramaya izin ver.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - kaldırılacak paketlerin toplu çıktısı.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - paket bağımlılıkları için sorguyu genişlet.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - isminin yanında grupları da yazar.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, fuzzy, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -g - isminin yanında grupları da yazar.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, fuzzy, c-format
msgid " -l - list files in package.\n"
msgstr " --list - tüm paketleri göster\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - Sessiz kipi.\n"
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - paketi bulmak için aramaya izin ver.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - isminin yanıda sürüm numarasını da yazar.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - bir sonraki paket bir kaynak paketi(--src ile aynı).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - daha güncel bir sürümü yüklü ise paketi kaldır.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - hatalı aramayı uygulamaya koy ( --fuzzy ile aynı)\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, fuzzy, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -a - komut satırındakilere uyanların tümünü seçer. \n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
" komut satırından isimleri veya rpm dosyaları verilenler sorgulandı.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes sadece --parallel ile kullanılabilir"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, fuzzy, c-format
-msgid "No filelist found\n"
-msgstr "Resim bulunamadı"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, fuzzy, c-format
msgid "No changelog found\n"
msgstr "Görüntü (imaj) bulunamadı!"
+#, fuzzy
+#~ msgid "No filelist found\n"
+#~ msgstr "Resim bulunamadı"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "\"%s\" seçilmedi"
diff --git a/po/uk.po b/po/uk.po
index 9a49adbd..dbe44889 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-uk\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-01-25 11:16+0200\n"
"Last-Translator: Taras Boychuk <btr1@mail.ru>\n"
"Language-Team: ukrainian <translation@linux.org.ua>\n"
@@ -107,12 +107,12 @@ msgstr "_C СкаÑувати"
msgid "Choose location to save file"
msgstr "Виберіть міÑце Ð´Ð»Ñ Ð·Ð±ÐµÑ€ÐµÐ¶ÐµÐ½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð°"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Ðевідомий параметр %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ðе вибрано пакунків"
@@ -143,7 +143,7 @@ msgstr ""
msgid "Warning"
msgstr "ПопередженнÑ"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Гаразд"
@@ -237,7 +237,7 @@ msgstr ""
"\n"
"Ви хочете продовжити вÑтановленнÑ?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -248,7 +248,7 @@ msgstr ""
"%s\n"
"Можливо, Вам потрібно поновити вашу базу даних urpmi"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "вилучаєтьÑÑ %s"
@@ -268,9 +268,9 @@ msgstr "Ð’ÑтановлюєтьÑÑ Ð¿Ð°ÐºÑƒÐ½Ð¾Ðº `%s' (%s/%s)..."
msgid "_Done"
msgstr "Виконано"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÑƒÑпішне"
#: ../gurpmi2:344
@@ -327,63 +327,63 @@ msgstr "Тільки кориÑтувачу root дозволÑєтьÑÑ Ð²ÑÑ‚
msgid "Running urpmi in restricted mode..."
msgstr "ЗапуÑкаєтьÑÑ urpmi в обмеженому режимі..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "неможливо відкрити rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "неправильна назва rpm-файла [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ rpm-файла [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ðµ: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "немає доÑтупу до rpm-файла [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "неможливо проаналізувати файл %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "неможливо зареєÑтрувати rpm-файл"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "помилка реєÑтрації пакунків"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Цю дію заборонено до Ð²Ð¸ÐºÐ¾Ð½Ð°Ð½Ð½Ñ Ð² обмеженому режимі"
@@ -423,7 +423,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "побудовано hdlist synthesis файл Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
@@ -448,7 +448,7 @@ msgstr "неможливо запиÑати конфігураційний фаÐ
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "неможливо запиÑати конфігураційний файл [%s]"
@@ -578,7 +578,7 @@ msgstr "Ñ–Ñнує декілька пакунків з однаковою наÐ
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "неможливо коректно проаналізувати [%s] на значенні \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "неможливо доÑтупитиÑÑ Ð´Ð¾ файла ÑпиÑку \"%s\", ноÑÑ–Ñ Ð¿Ñ€Ð¾Ñ–Ð³Ð½Ð¾Ñ€Ð¾Ð²Ð°Ð½Ð¾"
@@ -715,7 +715,7 @@ msgstr "попередженнÑ: величина md5sum Ð´Ð»Ñ %s недоÑÑ‚
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "розраховуєтьÑÑ md5sum Ð´Ð»Ñ Ñ–Ñнуючого джерела hdlist (або synthesis)"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -724,108 +724,108 @@ msgstr ""
"віртуальний ноÑій \"%s\" не повинен мати заданих файлів hdlist або list,"
"ноÑÑ–Ñ Ð¿Ñ€Ð¾Ñ–Ð³Ð½Ð¾Ñ€Ð¾Ð²Ð°Ð½Ð¾"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"віртуальний ноÑій \"%s\" повинен мати повне поÑÐ¸Ð»Ð°Ð½Ð½Ñ (url), ноÑÑ–Ñ "
"проігноровано"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "неправильна назва rpm-файла [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "неможливо знайти файл ÑпиÑку Ð´Ð»Ñ \"%s\", ноÑÑ–Ñ Ð¿Ñ€Ð¾Ñ–Ð³Ð½Ð¾Ñ€Ð¾Ð²Ð°Ð½Ð¾"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "Ñпроба вибрати неіÑнуючого ноÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "побудовано hdlist synthesis файл Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "неможливо доÑтупитиÑÑ Ð´Ð¾ файла hdlist \"%s\", ноÑÑ–Ñ Ð¿Ñ€Ð¾Ñ–Ð³Ð½Ð¾Ñ€Ð¾Ð²Ð°Ð½Ð¾"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "неможливо проаналізувати файл hdlist Ð´Ð»Ñ \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"ноÑій \"%s\" намагаєтьÑÑ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñтати hdlist, що вже викориÑтовуєтьÑÑ, ноÑÑ–Ñ "
"проігноровано"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"ноÑій \"%s\" намагаєтьÑÑ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñтати ÑпиÑок, що вже викориÑтовуєтьÑÑ, ноÑÑ–Ñ "
"проігноровано"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "Ñпроба знехтувати Ñ–Ñнуючим ноÑієм \"%s\", пропуÑкаєтьÑÑ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "забагато точок Ð¼Ð¾Ð½Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð´Ð»Ñ Ð·Ð¼Ñ–Ð½Ð½Ð¾Ð³Ð¾ ноÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "отримуєтьÑÑ Ð·Ð¼Ñ–Ð½Ð½Ð¸Ð¹ приÑтрій Ñк \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "ÐоÑій \"%s\" Ñ” ISO-відбитком, його буде змонтовано нальоту"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "викориÑтовуєтьÑÑ Ñ–Ð½ÑˆÐ¸Ð¹ змінний приÑтрій [%s] Ð´Ð»Ñ \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "неможливо відновити шлÑÑ… до змінного ноÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "запиÑати конфігураційний файл [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Ðеможливо викориÑтовувати паралельний режим з режимом use-distrib"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "викориÑтовуютьÑÑ Ð·Ð²'Ñзані ноÑÑ–Ñ— Ð´Ð»Ñ Ð¿Ð°Ñ€Ð°Ð»ÐµÐ»ÑŒÐ½Ð¾Ð³Ð¾ режиму: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -834,145 +834,145 @@ msgstr ""
"--synthesis не може викориÑтовуватиÑÑ Ð· --media, --excludemedia, --"
"sortmedia, --update або --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Примітка: оÑкільки жодне з вибраних джерел на викориÑтовує hdlists, urpmf не "
"може повернути ÑкогоÑÑŒ результату\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Початок пошуку: %s, кінець: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "здійÑнюєтьÑÑ Ð´Ñ€ÑƒÐ³Ð¸Ð¹ прохід обрахунку залежноÑтей\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "пропуÑкаєтьÑÑ Ð¿Ð°ÐºÑƒÐ½Ð¾Ðº %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "буде вÑтановлено заміÑÑ‚ÑŒ Ð¿Ð¾Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¿Ð°ÐºÑƒÐ½ÐºÐ° %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "ноÑій \"%s\" вже Ñ–Ñнує"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "віртуальний ноÑій повинен бути локальним"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "читаютьÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ з ноÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "видалÑєтьÑÑ Ð½Ð¾Ñій \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "немає доÑтупу до першого ноÑÑ–Ñ Ð²ÑтановленнÑ"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "відновлюєтьÑÑ Ñ„Ð°Ð¹Ð» hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "неможливо відкрити rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "немає доÑтупу до першого ноÑÑ–Ñ Ð²ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (немає файла hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Ñпроба вибрати неіÑнуючого ноÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "вибір багатьох ноÑіїв: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "видалÑєтьÑÑ Ð½Ð¾Ñій \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "Ð¿ÐµÑ€ÐµÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ urpmi з ноÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...Ð¿ÐµÑ€ÐµÐºÐ¾Ð½Ñ„Ñ–Ð³ÑƒÑ€Ð°Ñ†Ñ–Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ð°"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "переконфігурацію виконано"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "Помилка при Ñтворенні файла назв: залежніÑÑ‚ÑŒ %d не знайдено"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
"Помилка при Ñтворенні файла назв: Ðеможливо здійÑнити Ð·Ð°Ð¿Ð¸Ñ Ñƒ файл (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "ноÑÑ–Ñ \"%s\" не вибрано"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "перевірÑєтьÑÑ Ñ„Ð°Ð¹Ð» hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "перевірÑєтьÑÑ Ñ„Ð°Ð¹Ð» synthesis [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "ÑтворюєтьÑÑ hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -981,80 +981,80 @@ msgstr ""
"Ðеможливо згенерувати файл synthesis Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\". Можливо, файл hdlist "
"пошкоджено."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "проблема Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° hdlist або synthesis Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ðµ"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "копіюєтьÑÑ Ñ„Ð°Ð¹Ð» опиÑу \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐµÐ½Ð¾"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "запиÑуєтьÑÑ Ñ„Ð°Ð¹Ð» ÑпиÑку Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ [%s] завершилоÑÑŒ невдало (файл Ñ” підозріло малим)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
"розраховуєтьÑÑ md5sum Ð´Ð»Ñ hdlist (або synthesis) Ð´Ð»Ñ Ð´Ð¶ÐµÑ€ÐµÐ»Ð°, з Ñкого йде "
"копіюваннÑ"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "ÐºÐ¾Ð¿Ñ–ÑŽÐ²Ð°Ð½Ð½Ñ [%s] невдале (не Ñпівпадає md5sum)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"розраховуєтьÑÑ md5sum Ð´Ð»Ñ hdlist (або synthesis) джерела, що поновлюєтьÑÑ"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...Ð²Ñ–Ð´Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ðµ: неправильна md5sum"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "не знайдено rpm-файла Ð´Ð»Ñ [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "читаютьÑÑ rpm-файли з [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "неможливо прочитати rpm-файли Ð´Ð»Ñ [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "rpms не прочитано"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1064,78 +1064,78 @@ msgstr ""
"неможливо отримати доÑтуп до ноÑÑ–Ñ \"%s\",\n"
"це може ÑтатиÑÑ, Ñкщо Ви змонтували теку вручну під Ñ‡Ð°Ñ ÑÑ‚Ð²Ð¾Ñ€ÐµÐ½Ð½Ñ Ð½Ð¾ÑÑ–Ñ."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "немає файла hdlist Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "відновлюєтьÑÑ Ð´Ð¶ÐµÑ€ÐµÐ»Ð¾ hdlist (або synthesis) \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "знайдено випробуваний hdlist (або synthesis) Ñк %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "немає файла hdlist Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "перевірÑєтьÑÑ Ñ„Ð°Ð¹Ð» ключів з \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...імпортовано ключ %s з файла ключів \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "неможливо імпортувати файл ключів з \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "запиÑуєтьÑÑ Ñ„Ð°Ð¹Ð» ÑпиÑку Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "додано ноÑÑ–Ñ %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "неможливо проаналізувати файл hdlist Ð´Ð»Ñ \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "проблема Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ Ñ„Ð°Ð¹Ð»Ð° synthesis Ð´Ð»Ñ Ð½Ð¾ÑÑ–Ñ \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "читаютьÑÑ Ð·Ð°Ð³Ð¾Ð»Ð¾Ð²ÐºÐ¸ з ноÑÑ–Ñ \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "ÐнNn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "ТтYy"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Вибачте, неправильний вибір, Ñпробуйте ще раз\n"
@@ -1190,47 +1190,47 @@ msgstr "невідомого ноÑÑ–Ñ \"%s\" позначено Ñк змінÐ
msgid "unable to access medium \"%s\""
msgstr "немає доÑтупу до ноÑÑ–Ñ \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Ðемає пакунку з назвою %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "ÐаÑтупні пакунки міÑÑ‚ÑÑ‚ÑŒ %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "через відÑутніÑÑ‚ÑŒ %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "через незадоволеніÑÑ‚ÑŒ %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "намагаюÑÑŒ активізувати %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб зберегти %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "Ð´Ð»Ñ Ñ‚Ð¾Ð³Ð¾, щоб вÑтановити %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "через конфлікти з %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "не замовлено"
@@ -1379,14 +1379,24 @@ msgstr "Ðічого вилучати"
msgid "Checking to remove the following packages"
msgstr "ПеревірÑєтьÑÑ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ñ–ÑÑ‚ÑŒ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ Ð½Ð°Ñтупних пакунків"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Щоб задовольнити залежноÑÑ‚Ñ–, наÑтупні %d пакунків буде вилучено (%d Мб)"
+msgstr[1] ""
+"Щоб задовольнити залежноÑÑ‚Ñ–, наÑтупні %d пакунків буде вилучено (%d Мб)"
+msgstr[2] ""
+"Щоб задовольнити залежноÑÑ‚Ñ–, наÑтупні %d пакунків буде вилучено (%d Мб)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
+msgid " (%d MB)"
msgstr ""
-"Щоб задовольнити залежноÑÑ‚Ñ–, наÑтупні %d пакунків буде вилучено (%d Мб)"
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
@@ -1394,12 +1404,12 @@ msgstr[0] "вилучаєтьÑÑ Ð¿Ð°ÐºÑƒÐ½Ð¾Ðº %s"
msgstr[1] "вилучаєтьÑÑ Ð¿Ð°ÐºÑƒÐ½Ð¾Ðº %s"
msgstr[2] "вилучаєтьÑÑ Ð¿Ð°ÐºÑƒÐ½Ð¾Ðº %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (Т/н) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Ð’Ð¸Ð´Ð°Ð»ÐµÐ½Ð½Ñ Ð½ÐµÐ²Ð´Ð°Ð»Ðµ"
@@ -1657,7 +1667,7 @@ msgstr " --verbose - детальний режим.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - вивеÑти ÑпиÑок файлів у пакунку.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - вивеÑти верÑÑ–ÑŽ, випуÑк Ñ– архів з назвою.\n"
@@ -1667,12 +1677,12 @@ msgstr " -f - вивеÑти верÑÑ–ÑŽ, випуÑк Ñ– архі
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "викориÑтовуєтьÑÑ Ð¾Ñобливе Ð¾Ñ‚Ð¾Ñ‡ÐµÐ½Ð½Ñ Ð½Ð° %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1681,7 +1691,7 @@ msgstr ""
"Примітка: оÑкільки жодне з вибраних джерел на викориÑтовує hdlists, urpmf не "
"може повернути ÑкогоÑÑŒ результату\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Ви можете викориÑтовувати --name Ð´Ð»Ñ Ð¿Ð¾ÑˆÑƒÐºÑƒ назв пакунків.\n"
@@ -1990,7 +2000,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - поновити тільки пакунки з такою Ñамою архітектурою.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - вибрати вÑÑ– відповідноÑÑ‚Ñ– в командному Ñ€Ñдку.\n"
@@ -2204,15 +2214,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
msgstr[1] ""
msgstr[2] ""
@@ -2222,92 +2227,95 @@ msgstr[2] ""
msgid "Press Enter when ready..."
msgstr "ÐатиÑніть Enter, коли будете готові..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "СкаÑувати"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "ÐаÑтупні пакунки мають неправильні підпиÑи"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "ÐаÑтупні пакунки мають неправильні підпиÑи"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ви хочете продовжувати вÑтановленнÑ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÑƒÑпішне"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "вÑтановлюєтьÑÑ %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "вÑтановлюєтьÑÑ %s з %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "вÑтановлюєтьÑÑ %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð½ÐµÑƒÑпішне"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Спробувати вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð±ÐµÐ· перевірки залежноÑтей? (y/N) (Ñ‚/Ð) "
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Спробувати примуÑове вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ (--force)? (y/N) (Ñ‚/Ð) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d запит на вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð½ÐµÑƒÑпішно"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d запит на вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð½ÐµÑƒÑпішно"
+msgstr[1] "%d запит на вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð½ÐµÑƒÑпішно"
+msgstr[2] "%d запит на вÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð²ÑÑ Ð½ÐµÑƒÑпішно"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Ð’ÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð½Ñ Ð¼Ð¾Ð¶Ð»Ð¸Ð²Ðµ"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Ð’Ñе вже вÑтановлено"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Ð’Ñе вже вÑтановлено"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Ð’Ñе вже вÑтановлено"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Ð’Ñе вже вÑтановлено"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "перезапуÑк urpmi"
@@ -2560,8 +2568,11 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
#: ../urpmi.recover:82
#, c-format
@@ -2857,56 +2868,58 @@ msgstr ""
" - розширений зворотний пошук пакунків (включає віртуальні "
"пакунки).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - шукати в provides, щоб знайти пакунок.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - повний вивід даних про пакунок Ð´Ð»Ñ Ð²Ð¸Ð»ÑƒÑ‡ÐµÐ½Ð½Ñ.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - розширений запит до залежноÑтей пакунка.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - також виводити групи з назвами.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - виводити кориÑну інформацію в придатному Ð´Ð»Ñ Ñ‡Ð¸Ñ‚Ð°Ð½Ð½Ñ "
"виглÑді.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - вивеÑти ÑпиÑок файлів у пакунку.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - режим мовчаннÑ.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - шукати в provides, щоб знайти пакунок.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - також виводити верÑÑ–ÑŽ Ñ– випуÑк з назвою.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - наÑтупний пакунок Ñ” пакунком з джерельними текÑтами (те "
"Ñаме, що --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2914,44 +2927,44 @@ msgid ""
msgstr ""
" -u - пропуÑтити пакунок, Ñкщо новіша верÑÑ–Ñ Ð²Ð¶Ðµ вÑтановлена.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - задати невизначений пошук (так Ñамо Ñк --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - подібно до -y, але нечутливо до регіÑтру.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " назви або rpm-файли, задані в командному Ñ€Ñдку, необхідні.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes може викориÑтовуватиÑÑ Ñ‚Ñ–Ð»ÑŒÐºÐ¸ з --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Примітка: оÑкільки жодне з вибраних джерел на викориÑтовує hdlists, urpmf не "
"може повернути ÑкогоÑÑŒ результату\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2959,16 +2972,14 @@ msgstr ""
"Примітка: оÑкільки жодне з вибраних джерел на викориÑтовує hdlists, urpmf не "
"може повернути ÑкогоÑÑŒ результату\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Ðе знайдено ÑпиÑку файлів\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Ðе знайдено журналу змін\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Ðе знайдено ÑпиÑку файлів\n"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "ноÑÑ–Ñ \"%s\" не вибрано"
diff --git a/po/urpmi.pot b/po/urpmi.pot
index 80791236..9e46aaca 100644
--- a/po/urpmi.pot
+++ b/po/urpmi.pot
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2007-02-23 19:44+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+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"
@@ -82,12 +82,12 @@ msgstr ""
msgid "Choose location to save file"
msgstr ""
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr ""
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr ""
@@ -115,7 +115,7 @@ msgstr ""
msgid "Warning"
msgstr ""
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr ""
@@ -201,7 +201,7 @@ msgid ""
"Do you want to continue installation ?"
msgstr ""
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -209,7 +209,7 @@ msgid ""
"You may want to update your urpmi database"
msgstr ""
-#: ../gurpmi2:292 ../urpme:141 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr ""
@@ -229,9 +229,9 @@ msgstr ""
msgid "_Done"
msgstr ""
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
+msgid "Installation failed:"
msgstr ""
#: ../gurpmi2:344
@@ -286,63 +286,63 @@ msgstr ""
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr ""
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr ""
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr ""
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr ""
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr ""
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr ""
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr ""
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr ""
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr ""
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -382,7 +382,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr ""
@@ -407,7 +407,7 @@ msgstr ""
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr ""
@@ -537,7 +537,7 @@ msgstr ""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr ""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -670,328 +670,328 @@ msgstr ""
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr ""
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr ""
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr ""
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr ""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr ""
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr ""
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr ""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr ""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr ""
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr ""
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr ""
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr ""
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr ""
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr ""
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr ""
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr ""
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr ""
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr ""
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr ""
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr ""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr ""
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr ""
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr ""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr ""
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr ""
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr ""
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr ""
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr ""
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr ""
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr ""
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr ""
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr ""
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr ""
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -999,78 +999,78 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr ""
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr ""
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr ""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr ""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr ""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr ""
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr ""
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr ""
@@ -1125,47 +1125,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr ""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr ""
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr ""
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr ""
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr ""
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr ""
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr ""
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr ""
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr ""
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr ""
@@ -1321,7 +1321,7 @@ msgid_plural "Remove %d packages?"
msgstr[0] ""
msgstr[1] ""
-#: ../urpme:137 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr ""
@@ -1569,7 +1569,7 @@ msgstr ""
msgid " -m - the media in which the package was found\n"
msgstr ""
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1579,19 +1579,19 @@ msgstr ""
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1853,7 +1853,7 @@ msgstr ""
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr ""
@@ -2052,94 +2052,94 @@ msgstr[1] ""
msgid "Press Enter when ready..."
msgstr ""
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr ""
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr ""
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr ""
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr ""
-#: ../urpmi:721
+#: ../urpmi:692
#, c-format
-msgid "distributing %s"
+msgid "Installation failed"
msgstr ""
-#: ../urpmi:735
+#: ../urpmi:711
#, c-format
-msgid "installing %s from %s"
+msgid "distributing %s"
msgstr ""
-#: ../urpmi:737
+#: ../urpmi:725
#, c-format
-msgid "installing %s"
+msgid "installing %s from %s"
msgstr ""
-#: ../urpmi:762
+#: ../urpmi:727
#, c-format
-msgid "Installation failed:"
+msgid "installing %s"
msgstr ""
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr ""
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpmi:825
+#: ../urpmi:815
#, c-format
msgid "%d installation transaction failed"
msgid_plural "%d installation transactions failed"
msgstr[0] ""
msgstr[1] ""
-#: ../urpmi:835
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr ""
-#: ../urpmi:840
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:848
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr ""
-#: ../urpmi:849
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr ""
-#: ../urpmi:852
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr ""
-#: ../urpmi:853
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr ""
-#: ../urpmi:872
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr ""
@@ -2635,105 +2635,102 @@ msgid ""
" - extended reverse search (includes virtual packages).\n"
msgstr ""
-#: ../urpmq:91
+#: ../urpmq:90
+#, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr ""
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr ""
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr ""
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr ""
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr ""
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr ""
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr ""
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr ""
diff --git a/po/uz.po b/po/uz.po
index b0c89617..2505cbf1 100644
--- a/po/uz.po
+++ b/po/uz.po
@@ -1,23 +1,24 @@
# translation of urpmi-uz.po to Uzbek
-# Copyright (C) 2001,2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001,2003, 2004, 2006, 2007 Free Software Foundation, Inc.
#
# Sherzod Mamatkulov <mamatkulov@yahoo.com>, 2001.
-# Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006.
+# Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006, 2007.
# Nurali Abdurahmonov <mavnur@gmail.com>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: urpmi-uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
-"PO-Revision-Date: 2006-12-03 14:46+0000\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
+"PO-Revision-Date: 2007-02-26 22:17+0100\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM ўрнатиш"
@@ -25,9 +26,9 @@ msgstr "RPM ўрнатиш"
#: ../gurpmi:44
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
-msgstr ""
+msgstr "Хато: %s файли топилмади, амал бекор қилинади"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ок"
@@ -46,7 +47,7 @@ msgid ""
msgstr ""
#: ../gurpmi:73 ../gurpmi:84
-#, fuzzy, c-format
+#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
"\n"
@@ -54,8 +55,11 @@ msgid ""
"\n"
"Proceed?"
msgstr ""
-"Қуйидаги боғлиқликларни ўрнатиш учун Ñиз root бўлишингиз керак:\n"
+"Қуйидаги пакетлар ўрнатилади:\n"
+"\n"
"%s\n"
+"\n"
+"Давом Ñтишни иÑтайÑизми?"
#: ../gurpmi:79
#, c-format
@@ -66,6 +70,11 @@ msgid ""
"\n"
"You may prefer to just save it. What is your choice?"
msgstr ""
+"Қуйидаги пакетлар ўрнатилади:\n"
+"\n"
+"%s\n"
+"\n"
+"Уларни ўрнатмаÑдан компьютерга ÑақлаÑа ҳам бўлади. Сиз нимани иÑтайÑиз?"
#: ../gurpmi:97
#, c-format
@@ -77,37 +86,37 @@ msgstr "Ўр_натиш"
msgid "_Save"
msgstr "_Сақлаш"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Бекор қилиш"
#: ../gurpmi:107
-#, fuzzy, c-format
+#, c-format
msgid "Choose location to save file"
-msgstr "Файлни танланг"
+msgstr "Файлни қаерга Ñақлаш жойини танланг"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Ðомаълум параметр \"%s\""
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Ҳеч қандай пакет кўрÑатилмаган"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Ð˜Ð»Ñ‚Ð¸Ð¼Ð¾Ñ ÐºÑƒÑ‚Ð¸Ð± туринг..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "root бўлиш керак"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -118,42 +127,42 @@ msgstr ""
"%s\n"
"Бунга қарамаÑдан ўрнатишни давом Ñттиришни иÑтайÑизми?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Диққат"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ок"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (Ñнгилаш)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (ўрнатиш)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
-msgstr ""
+msgstr "Пакет танлови"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Қуйидаги пакетлардан бири керак:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "Тў_хтатиш"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -164,41 +173,45 @@ msgstr ""
"%s\n"
"Ўрнатишни давом Ñттиришни иÑтайÑизми?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади:"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади (%d Мб)"
-msgstr[1] "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади (%d Мб)"
+msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади:"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d-та пакет, %d Мб)"
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d-та пакет, %d Мб)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Пакетни ўрнатиш..."
-#: ../gurpmi2:219 ../urpmi:608
-#, fuzzy, c-format
+#: ../gurpmi2:227 ../urpmi:613
+#, c-format
msgid "unable to get source packages, aborting"
-msgstr "пакетни (%s) олиб ташлаб бўлмади"
+msgstr ""
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Ð˜Ð»Ñ‚Ð¸Ð¼Ð¾Ñ \"%s\" номли манбани [%s] уÑкунаÑига қўйинг"
+msgstr "Ð˜Ð»Ñ‚Ð¸Ð¼Ð¾Ñ \"%s\" номли тўпламни [%s] уÑкунаÑига қўйинг"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" пакети олинмоқда..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -211,7 +224,7 @@ msgstr ""
"\n"
"Ўрнатишни давом Ñттиришни иÑтайÑизми?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -222,37 +235,37 @@ msgstr ""
"%s\n"
"Балки urpmi маълумот базаÑини Ñнгилашингиз керак."
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s ўчирилмоқда"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Тайёрланмоқда..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Тайёр"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "Ўрнатиш муваффақиÑÑ‚Ñиз тугади"
+msgid "Installation failed:"
+msgstr "Ўрнатиш муваффақиÑÑ‚Ñиз тугади:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Ҳамма нарÑа аллақачон ўрнатилган"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "Ўрнатиш тугади"
@@ -272,19 +285,21 @@ msgid " -h|--help - print this help message.\n"
msgstr " -h|--help - шу ёрдам хабарини кўрÑатиш.\n"
#: ../rpm-find-leaves:17
-#, fuzzy, c-format
+#, c-format
msgid " --root <path> - use the given root instead of /\n"
-msgstr " --synthesis - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
+msgstr ""
+" --root <йўл> - / ўрнига туб Ð´Ð¸Ñ€ÐµÐºÑ‚Ð¾Ñ€Ð¸Ñ Ñифатида кўрÑатилган йўлдан "
+"фойдаланиш\n"
#: ../rpm-find-leaves:18
-#, fuzzy, c-format
+#, c-format
msgid " -g [group] - restrict results to specified group.\n"
-msgstr " --group - group Ñ‚Ñгини кўрÑатиш: гуруҳ.\n"
+msgstr " -g [гуруҳ] - натижаларни кўрÑатилган гуруҳга чегаралаш\n"
#: ../rpm-find-leaves:19
-#, fuzzy, c-format
+#, c-format
msgid " -f - output rpm full name (NVRA)\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr " -f - RPM-файлининг тўлиқ номини кўрÑатиш (NVRA)\n"
#: ../rpm-find-leaves:20
#, c-format
@@ -301,63 +316,63 @@ msgstr "Фақат бошқарувчи пакетларни ўрнатиши м
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb'ни очиб бўлмади"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
-msgstr ""
+msgstr "%d-та RPM-хедер топилди, %d-та ÑÑки хедер ўчирилади"
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM-файлининг номи (%s) нотўғри"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-файли (%s) олинмоқда..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...олиш тугади"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
-msgstr "...олиш муваффақиÑÑ‚Ñиз тудаги: %s"
+msgstr "...олиш муваффақиÑÑ‚Ñиз тугади: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
-#: ../urpm.pm:149
-#, fuzzy, c-format
+#: ../urpm.pm:147
+#, c-format
msgid "unable to parse spec file %s [%s]"
-msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
+msgstr ""
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-файлини рўйхатдан ўтказиб бўлмади"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
-#, fuzzy, c-format
+#: ../urpm.pm:163
+#, c-format
msgid "error registering local packages"
-msgstr "Қуйидаги пакетларни Ñаралашда хато рўй берди:"
+msgstr ""
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -370,37 +385,37 @@ msgstr ""
#: ../urpm/args.pm:133
#, c-format
msgid "chroot directory doesn't exist"
-msgstr ""
+msgstr "chroot директориÑÑи мавжуд ÑмаÑ"
#: ../urpm/args.pm:242
-#, fuzzy, c-format
+#, c-format
msgid "You need to be root to use --use-distrib"
-msgstr "Бу буйруғни ишлатиш учун Ñиз root бўлишингиз керак! \n"
+msgstr "--use-distrib амалидан фойдаланиш учун root бўлиш шарт"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-файлини (%s) ўқиб бўлмади\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
-msgstr ""
+msgstr "%s амалидан %s амалиÑиз фойдаланиб бўлмайди"
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
-msgstr ""
+msgstr "%s амалидан %s амали билан бирга фойдаланиб бўлмайди"
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "манба (%s) учун hdlist synthesis файли Ñратилди"
+msgstr "тўплам учун hdlist synthesis файли Ñратилди: \"%s\""
#: ../urpm/bug_report.pm:51 ../urpmi:247
#, c-format
@@ -408,21 +423,21 @@ msgid "Copying failed"
msgstr "ÐуÑха кўчириш муваффақиÑÑ‚Ñиз тугади"
#: ../urpm/cfg.pm:81
-#, fuzzy, c-format
+#, c-format
msgid "syntax error in config file at line %s"
-msgstr "моÑлама файлини (%s) ёзиб бўлмади"
+msgstr "моÑлама файлининг %s-чи Ñатрида хато"
#: ../urpm/cfg.pm:112
-#, fuzzy, c-format
+#, c-format
msgid "unable to read config file [%s]"
-msgstr "моÑлама файлини (%s) ёзиб бўлмади"
+msgstr "%s моÑлама файлини ўқиб бўлмади"
#: ../urpm/cfg.pm:138
#, c-format
msgid "medium `%s' is defined twice, aborting"
-msgstr ""
+msgstr "\"%s\" тўплами икки марта аниқланган, амал бекор қилинади"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "моÑлама файлини (%s) ёзиб бўлмади"
@@ -430,7 +445,7 @@ msgstr "моÑлама файлини (%s) ёзиб бўлмади"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "ПрокÑига уланиш учун керакли маълумотни киритинг\n"
#: ../urpm/download.pm:112
#, c-format
@@ -450,72 +465,72 @@ msgstr ""
#: ../urpm/download.pm:194
#, c-format
msgid "%s failed: exited with signal %d"
-msgstr ""
+msgstr "%s муваффақиÑÑ‚Ñиз тугади: хато коди %d"
#: ../urpm/download.pm:195
#, c-format
msgid "%s failed: exited with %d"
-msgstr ""
+msgstr "%s муваффақиÑÑ‚Ñиз тугади: хато коди %d"
#: ../urpm/download.pm:219
-#, fuzzy, c-format
+#, c-format
msgid "copy failed"
-msgstr "ÐуÑха кўчириш муваффақиÑÑ‚Ñиз тугади"
+msgstr "нуÑха кўчириш муваффақиÑÑ‚Ñиз тугади"
#: ../urpm/download.pm:225
-#, fuzzy, c-format
+#, c-format
msgid "wget is missing\n"
-msgstr "%s етишмаганига кўра"
+msgstr "wget даÑтури етишмаÑпти\n"
#: ../urpm/download.pm:289
-#, fuzzy, c-format
+#, c-format
msgid "curl is missing\n"
-msgstr "%s етишмаганига кўра"
+msgstr "curl даÑтури етишмаÑпти\n"
#: ../urpm/download.pm:411
#, c-format
msgid "curl failed: download canceled\n"
-msgstr ""
+msgstr "curl муваффақиÑÑ‚Ñиз тугади: ёзиб олиш бекор қилинди\n"
#: ../urpm/download.pm:450
#, c-format
msgid "rsync is missing\n"
-msgstr ""
+msgstr "rsync даÑтури етишмаÑпти\n"
#: ../urpm/download.pm:511
#, c-format
msgid "ssh is missing\n"
-msgstr ""
+msgstr "ssh даÑтури етишмаÑпти\n"
#: ../urpm/download.pm:530
#, c-format
msgid "prozilla is missing\n"
-msgstr ""
+msgstr "prozilla даÑтури етишмаÑпти\n"
#: ../urpm/download.pm:546
#, c-format
msgid "Couldn't execute prozilla\n"
-msgstr ""
+msgstr "prozilla даÑтурини ишга тушириб бўлмади\n"
#: ../urpm/download.pm:593
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
+msgstr " %s%% бажарилди, жами = %s, ETA = %s, тезлик = %s"
#: ../urpm/download.pm:595
#, c-format
msgid " %s%% completed, speed = %s"
-msgstr ""
+msgstr " %s%% бажарилди, тезлик = %s"
#: ../urpm/download.pm:651
-#, fuzzy, c-format
+#, c-format
msgid "retrieving %s"
-msgstr "%s ўчирилмоқда"
+msgstr "%s олинмоқда"
#: ../urpm/download.pm:655
-#, fuzzy, c-format
+#, c-format
msgid "retrieved %s"
-msgstr "...олиш муваффақиÑÑ‚Ñиз тудаги: %s"
+msgstr "%s олинди"
#: ../urpm/download.pm:668
#, c-format
@@ -525,7 +540,7 @@ msgstr "%s учун номаълум протокол аниқланган"
#: ../urpm/download.pm:687
#, c-format
msgid "%s is not available, falling back on %s"
-msgstr ""
+msgstr "%s топилмади, %s ишлатилади"
#: ../urpm/download.pm:691
#, c-format
@@ -538,9 +553,9 @@ msgid "unable to handle protocol: %s"
msgstr "номаълум протокол: %s"
#: ../urpm/get_pkgs.pm:41
-#, fuzzy, c-format
+#, c-format
msgid "cleaning %s and %s"
-msgstr "%s ўрнатилмоқда"
+msgstr "%s ва %s тозаланмоқда"
#: ../urpm/get_pkgs.pm:56 ../urpm/get_pkgs.pm:79 ../urpm/get_pkgs.pm:110
#, c-format
@@ -548,19 +563,20 @@ msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr "номи (%s) бир ҳил бўлган бир нечта RPM-файли мавжуд"
#: ../urpm/get_pkgs.pm:93
-#, fuzzy, c-format
+#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "RPM-файлини (%s) манбадан (%s) ўқиб бўлмади"
+msgstr ""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
-#, fuzzy, c-format
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
+#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
+msgstr ""
+"\"%s\" учун рўйхат файлига мурожаат қилиб бўлмади, тўплам Ñътиборга олинмайди"
#: ../urpm/get_pkgs.pm:101
#, c-format
msgid "(retry as root?)"
-msgstr ""
+msgstr "(root Ñифатида қайтадан уриниб кўришни иÑтайÑизми?)"
#: ../urpm/get_pkgs.pm:126
#, c-format
@@ -568,11 +584,13 @@ msgid ""
"medium \"%s\" uses an invalid list file:\n"
" mirror is probably not up-to-date, trying to use alternate method"
msgstr ""
+"\"%s\" тўплами хато рўйхат файлидан фойдаланмоқда:\n"
+" Ñҳтимол ойнани Ñнгилаш керак, бошқача уÑулни Ñинаб кўраман"
#: ../urpm/get_pkgs.pm:130
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "манба (%s) RPM-файлларнинг жойини аниқламаган"
+msgstr "тўплам RPM-файлларнинг жойини аниқламаган: \"%s\""
#: ../urpm/get_pkgs.pm:142
#, c-format
@@ -582,12 +600,12 @@ msgstr "%s пакети топилмади."
#: ../urpm/get_pkgs.pm:174
#, c-format
msgid "malformed URL: [%s]"
-msgstr ""
+msgstr "хато URL: [%s]"
#: ../urpm/get_pkgs.pm:180
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "RPM -файллари манбадан (%s) олинмоқда..."
+msgstr "RPM-файллари \"%s\" тўпламидан олинмоқда..."
#: ../urpm/install.pm:77
#, c-format
@@ -601,9 +619,9 @@ msgid ""
msgstr ""
#: ../urpm/install.pm:113
-#, fuzzy, c-format
+#, c-format
msgid "unable to create transaction"
-msgstr "Манбани Ñратиб бўлмади."
+msgstr ""
#: ../urpm/install.pm:121
#, c-format
@@ -616,9 +634,9 @@ msgid "unable to remove package %s"
msgstr "пакетни (%s) олиб ташлаб бўлмади"
#: ../urpm/install.pm:135
-#, fuzzy, c-format
+#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
-msgstr "пакетни (%s) олиб ташлаб бўлмади"
+msgstr "delta-rpm пакетидан RPM-файлини ажратиб бўлмади: %s"
#: ../urpm/install.pm:141
#, c-format
@@ -631,9 +649,9 @@ msgid "unable to install package %s"
msgstr "%s пакетини ўрнатиб бўлмади"
#: ../urpm/install.pm:180
-#, fuzzy, c-format
+#, c-format
msgid "removing installed rpms (%s) from %s"
-msgstr "%s ўрнатилмоқда"
+msgstr ""
#: ../urpm/install.pm:186
#, c-format
@@ -656,361 +674,363 @@ msgid "No server defined, missing uri or host"
msgstr ""
#: ../urpm/ldap.pm:163
-#, fuzzy, c-format
+#, c-format
msgid "No base defined"
-msgstr "Буйруқ кўрÑатилмаган."
+msgstr ""
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
-#, fuzzy, c-format
+#, c-format
msgid "%s database locked"
-msgstr "urpmi маълумот базаÑи қулфланган"
+msgstr "%s маълумот базаÑи қулфланган"
#: ../urpm/md5sum.pm:23
-#, fuzzy, c-format
+#, c-format
msgid "examining %s file"
-msgstr "MD5SUM файли текширилмоқда"
+msgstr "%s файли текширилмоқда"
#: ../urpm/md5sum.pm:25
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr ""
+msgstr "ДИҚҚÐТ: MD5SUM файлида %s учун md5sum ҳақида маълумот мавжуд ÑмаÑ"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "мавжуд бўлган hdlist (ёки synthesis) файли учун md5sum ҳиÑобланмоқда"
+msgstr "hdlist ёки synthesis файли (%s) учун md5sum ҳиÑобланмоқда"
-#: ../urpm/media.pm:171
-#, fuzzy, c-format
+#: ../urpm/media.pm:172
+#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
-msgstr "манба (%s) танланмаган"
+msgstr ""
-#: ../urpm/media.pm:175
-#, fuzzy, c-format
+#: ../urpm/media.pm:176
+#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "манба (%s) танланмаган"
+msgstr ""
-#: ../urpm/media.pm:183
-#, fuzzy, c-format
+#: ../urpm/media.pm:184
+#, c-format
msgid "invalid hdlist name"
-msgstr "RPM-файлининг номи (%s) нотўғри"
+msgstr "hdlist файли хато"
-#: ../urpm/media.pm:190
-#, fuzzy, c-format
+#: ../urpm/media.pm:191
+#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgstr "\"%s\" учун рўйхат файли топилмади, тўплам Ñътиборга олинмайди"
-#: ../urpm/media.pm:203
-#, fuzzy, c-format
+#: ../urpm/media.pm:204
+#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgstr ""
-#: ../urpm/media.pm:206
-#, fuzzy, c-format
+#: ../urpm/media.pm:207
+#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
-msgstr "манба (%s) учун hdlist synthesis файли Ñратилди"
+msgstr ""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
-#, fuzzy, c-format
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
+#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
+msgstr ""
+"\"%s\" учун hdlist файлига мурожаат қилиб бўлмади, тўплам Ñътиборга олинмайди"
-#: ../urpm/media.pm:215
-#, fuzzy, c-format
+#: ../urpm/media.pm:216
+#, c-format
msgid "unable to access list file of \"%s\""
-msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
+msgstr "\"%s\" учун рўйхат файлига мурожаат қилиб бўлмади"
-#: ../urpm/media.pm:229
-#, fuzzy, c-format
+#: ../urpm/media.pm:230
+#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "манба (%s) танланмаган"
+msgstr ""
-#: ../urpm/media.pm:230
-#, fuzzy, c-format
+#: ../urpm/media.pm:231
+#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "манба (%s) танланмаган"
+msgstr ""
-#: ../urpm/media.pm:255
-#, fuzzy, c-format
+#: ../urpm/media.pm:256
+#, c-format
msgid "trying to override existing medium \"%s\", skipping"
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgstr ""
-#: ../urpm/media.pm:398
-#, fuzzy, c-format
+#: ../urpm/media.pm:399
+#, c-format
msgid "too many mount points for removable medium \"%s\""
-msgstr "манбани (%s) Ñратиб бўлмади\n"
+msgstr ""
-#: ../urpm/media.pm:399
-#, fuzzy, c-format
+#: ../urpm/media.pm:400
+#, c-format
msgid "taking removable device as \"%s\""
-msgstr "Олинадиган уÑкуналар"
+msgstr ""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
-#, fuzzy, c-format
+#: ../urpm/media.pm:406
+#, c-format
msgid "using different removable device [%s] for \"%s\""
-msgstr "Олинадиган уÑкуналар"
+msgstr ""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
-#, fuzzy, c-format
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
+#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "манбани (%s) Ñратиб бўлмади\n"
+msgstr ""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
-msgstr ""
+msgstr "ёзилди: %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
-msgstr "моÑлама файли (%s) ёзилмоқда"
+msgstr "моÑлама файли (%s) ёзилди"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-"--synthesis'дан --media, --excludemedia, --sortmedia, --update or --parallel "
-"билан бирга фойдаланиб бўлмайди"
+"--synthesis'дан --media, --excludemedia, --sortmedia, --update, --use-"
+"distrib ёки --parallel билан бирга фойдаланиб бўлмайди"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
-#, fuzzy, c-format
+#: ../urpm/media.pm:597
+#, c-format
msgid "Search start: %s end: %s"
-msgstr "Ўрнатилган шрифтларни қидириш"
+msgstr "Қидириш боши: %s охири: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "боғликларни аниқлаш учун иккинчи боÑқич бажарилмоқда\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s пакети ташлаб ўтилмоқда"
-#: ../urpm/media.pm:637
-#, fuzzy, c-format
+#: ../urpm/media.pm:638
+#, c-format
msgid "would install instead of upgrade package %s"
-msgstr "Қуйидаги пакетларни ўрнатиш керак: %s"
+msgstr ""
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
-msgstr "манба (%s) аллақачон мавжуд"
+msgstr "тўплам аллақачон мавжуд: \"%s\""
-#: ../urpm/media.pm:677
-#, fuzzy, c-format
+#: ../urpm/media.pm:678
+#, c-format
msgid "virtual medium needs to be local"
-msgstr "манба (%s) танланмаган"
+msgstr ""
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
-msgstr ""
+msgstr "(андоза бўйича Ñътиборга олинмади)"
-#: ../urpm/media.pm:697
-#, fuzzy, c-format
+#: ../urpm/media.pm:698
+#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
-msgstr "манбадан (%s) Ñарлавҳалар ўқилмоқда"
+msgstr ""
-#: ../urpm/media.pm:703
-#, fuzzy, c-format
+#: ../urpm/media.pm:704
+#, c-format
msgid "adding medium \"%s\""
-msgstr "манба (%s) ўчирилмоқда"
+msgstr "тўплам қўшилмоқда: %s"
-#: ../urpm/media.pm:729
-#, fuzzy, c-format
+#: ../urpm/media.pm:730
+#, c-format
msgid "unable to mount the distribution medium"
-msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
+msgstr ""
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
-#, fuzzy, c-format
+#: ../urpm/media.pm:740
+#, c-format
msgid "retrieving media.cfg file..."
-msgstr "hdlists файли олинмоқда..."
+msgstr "media.cfg файли ёзиб олинмоқда..."
-#: ../urpm/media.pm:744
-#, fuzzy, c-format
+#: ../urpm/media.pm:745
+#, c-format
msgid "unable to parse media.cfg"
-msgstr "rpmdb'ни очиб бўлмади"
+msgstr ""
-#: ../urpm/media.pm:747
-#, fuzzy, c-format
+#: ../urpm/media.pm:748
+#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
+msgstr ""
-#: ../urpm/media.pm:826
-#, fuzzy, c-format
+#: ../urpm/media.pm:827
+#, c-format
msgid "trying to select nonexistent medium \"%s\""
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgstr ""
-#: ../urpm/media.pm:829
-#, fuzzy, c-format
+#: ../urpm/media.pm:830
+#, c-format
msgid "selecting multiple media: %s"
-msgstr "манба (%s) ўчирилмоқда"
+msgstr ""
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
-msgstr "манба (%s) ўчирилмоқда"
+msgstr "тўплам олиб ташланмоқда: \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
-msgstr "манба (%s) учун urpmi қайтадан моÑланмоқда..."
+msgstr "тўплам учун urpmi қайтадан моÑланмоқда: \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...қайтадан моÑлаш муваффақиÑÑ‚Ñиз тугади"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "...қайтадан моÑлаш тугади"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
-#, fuzzy, c-format
+#: ../urpm/media.pm:1073
+#, c-format
msgid "medium \"%s\" is up-to-date"
-msgstr "манба (%s) танланмаган"
+msgstr "тўпламни Ñнгилаш ҳожати йўқ: \"%s\""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist файли (%s) текширилмоқда"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis файли (%s) текширилмоқда"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist файли Ñратилмоқда"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "манбанинг (%s) hdlist ёки synthesis файлини ўқишда муаммо юзага келди"
+msgstr ""
+"тўпламининг hdlist ёки synthesis файлини ўқишда муаммо рўй берди: \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...нуÑха кўчириш муваффақиÑÑ‚Ñиз тугади"
-#: ../urpm/media.pm:1203
-#, fuzzy, c-format
+#: ../urpm/media.pm:1204
+#, c-format
msgid "copying description file of \"%s\"..."
-msgstr "hdlists файлидан нуÑха кўчирилмоқда..."
+msgstr ""
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...нуÑха кўчириш бажарилди"
-#: ../urpm/media.pm:1232
-#, fuzzy, c-format
+#: ../urpm/media.pm:1233
+#, c-format
msgid "copying [%s] for medium \"%s\"..."
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgstr ""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
"'%s' файлидан нуÑха кўчириш муваффақиÑÑ‚Ñиз тугади (унинг ҳажми жуда кичик)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-"манбанинг олинган hdlist (ёки synthesis) файлининг md5sum'и ҳиÑобланмоқда"
+"тўпламнинг олинган hdlist (ёки synthesis) файлининг md5sum'и ҳиÑобланмоқда"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "%s'дан нуÑха кўчириш муваффақиÑÑ‚Ñиз тугади (md5sum нотўғри)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "олинган hdlist (ёки synthesis) файли учун md5sum Ñони ҳиÑобланмоқда..."
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
-msgstr "...олиш муваффақиÑÑ‚Ñиз тудаги: md5sum Ð¼Ð¾Ñ ÐºÐµÐ»Ð¼Ð°Ð´Ð¸"
+msgstr "...олиш муваффақиÑÑ‚Ñиз тугади: md5sum Ð¼Ð¾Ñ ÐºÐµÐ»Ð¼Ð°Ð´Ð¸"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "%s'дан RPM-файллар топилмади"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "RPM-файллари %s'дан ўқилмоқда"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]: %s'дан RPM-файлларни ўқиб бўлмади"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1018,101 +1038,101 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
-#, fuzzy, c-format
+#: ../urpm/media.pm:1378
+#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
-msgstr "манбада (%s) ҳеч қандай hdlist файли топилмади"
+msgstr "тўпламнинг hdlist файли %s хато: %s"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "'%s' учун hdlist (ёки synthesis) файли ёзиб олинмоқда..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "қидирилган hdlist (ёки synthesis) файли топилди: %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
-msgstr "манбада (%s) ҳеч қандай hdlist файли топилмади"
+msgstr "тўплам учун ҳеч қандай hdlist файли топилмади: \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' учун pubkey файли текширилмоқда..."
-#: ../urpm/media.pm:1544
-#, fuzzy, c-format
+#: ../urpm/media.pm:1545
+#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
+msgstr ""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
-msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
+msgstr "тўплам учун рўйхат файли ёзилмоқда: \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
-#, fuzzy, c-format
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
+#, c-format
msgid "updated medium \"%s\""
-msgstr "%s манбаÑи қўшилди"
+msgstr "тўплам Ñнгиланди: \"%s\""
-#: ../urpm/media.pm:1638
-#, fuzzy, c-format
+#: ../urpm/media.pm:1639
+#, c-format
msgid "unable to parse hdlist file of \"%s\""
-msgstr "'%s' учун pubkey файлини импорт қилиб бўлмади"
+msgstr ""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Манбанинг (%s) synthesis файлини ўқишда муаммо юзага келди"
+msgstr "тўпламининг synthesis файлини ўқишда муаммо рўй берди: \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
-msgstr "манбадан (%s) Ñарлавҳалар ўқилмоқда"
+msgstr "тўпламидан хедерлар ўқилмоқда: \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "ЖжJjNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Ò²Ò³HhYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Узр, нотўғри танлов. БошқаÑини танланг\n"
#: ../urpm/parallel.pm:14
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse \"%s\" in file [%s]"
-msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
+msgstr ""
#: ../urpm/parallel.pm:23
-#, fuzzy, c-format
+#, c-format
msgid "examining parallel handler in file [%s]"
-msgstr "hdlist файли (%s) текширилмоқда"
+msgstr ""
#: ../urpm/parallel.pm:34
-#, fuzzy, c-format
+#, c-format
msgid "found parallel handler for nodes: %s"
-msgstr "қидирилган hdlist (ёки synthesis) файли топилди: %s"
+msgstr ""
#: ../urpm/parallel.pm:38
-#, fuzzy, c-format
+#, c-format
msgid "unable to use parallel option \"%s\""
-msgstr "манбани (%s) Ñнгилаб бўлмади\n"
+msgstr ""
#: ../urpm/removable.pm:32
#, c-format
@@ -1126,13 +1146,13 @@ msgstr "%s узилмоқда"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "манба (%s) танланмаган"
+msgid "medium \"%s\" is not available"
+msgstr ""
#: ../urpm/removable.pm:143
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-файлини (%s) манбадан (%s) ўқиб бўлмади"
+msgstr "RPM-файлини (%s) \"%s\" тўпламидан ўқиб бўлмади"
#: ../urpm/removable.pm:151
#, c-format
@@ -1140,54 +1160,54 @@ msgid "inconsistent medium \"%s\" marked removable but not really"
msgstr ""
#: ../urpm/removable.pm:163
-#, fuzzy, c-format
+#, c-format
msgid "unable to access medium \"%s\""
-msgstr "манбани (%s) Ñнгилаб бўлмади\n"
+msgstr "тўпламга мурожаат қилиб бўлмади: \"%s\""
-#: ../urpm/select.pm:115
-#, fuzzy, c-format
+#: ../urpm/select.pm:113
+#, c-format
msgid "No package named %s"
msgstr "%s номли пакет мавжуд ÑмаÑ"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Қуйидаги пакетларда %s бор: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s етишмаганига кўра"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
-#, fuzzy, c-format
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
+#, c-format
msgid "due to unsatisfied %s"
-msgstr "%s етишмаганига кўра"
+msgstr ""
-#: ../urpm/select.pm:405
-#, fuzzy, c-format
+#: ../urpm/select.pm:401
+#, c-format
msgid "trying to promote %s"
-msgstr "Ўчириш учун ҳеч нарÑа йўқ"
+msgstr ""
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s'ни қолдириш учун"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s'ни ўрнатиш учун"
-#: ../urpm/select.pm:442
-#, fuzzy, c-format
+#: ../urpm/select.pm:438
+#, c-format
msgid "due to conflicts with %s"
-msgstr "%s етишмаганига кўра"
+msgstr ""
-#: ../urpm/select.pm:444
-#, fuzzy, c-format
+#: ../urpm/select.pm:440
+#, c-format
msgid "unrequested"
-msgstr "Талаб қилинганда ишга тушириш"
+msgstr ""
#: ../urpm/signature.pm:26
#, c-format
@@ -1195,9 +1215,9 @@ msgid "Invalid signature (%s)"
msgstr "Имзо ҳақиқий ÑÐ¼Ð°Ñ (%s)"
#: ../urpm/signature.pm:57
-#, fuzzy, c-format
+#, c-format
msgid "Invalid Key ID (%s)"
-msgstr "Имзо ҳақиқий ÑÐ¼Ð°Ñ (%s)"
+msgstr ""
#: ../urpm/signature.pm:59
#, c-format
@@ -1227,14 +1247,14 @@ msgid " --help - print this help message.\n"
msgstr " --help - шу ёрдам хабарини кўрÑатиш.\n"
#: ../urpme:45
-#, fuzzy, c-format
+#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto-select - тизимни Ñнгилаш учун пакетларни авто-танлаш.\n"
+msgstr ""
#: ../urpme:46
-#, fuzzy, c-format
+#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - ўрнатишни тўғри бажариш имкониÑтини текшириш.\n"
+msgstr " --test - олиб ташлашни тўғри бажариш имкониÑтини текшириш.\n"
#: ../urpme:47 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1248,27 +1268,25 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
#: ../urpme:49 ../urpmi:146
-#, fuzzy, c-format
+#, c-format
msgid " --repackage - Re-package the files before erasing\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr ""
#: ../urpme:50
-#, fuzzy, c-format
+#, c-format
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-" --wget - маÑофадаги файлларни олиш учун wget даÑтурини ишлатиш.\n"
#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
-#, fuzzy, c-format
+#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
-" --wget - маÑофадаги файлларни олиш учун wget даÑтурини ишлатиш.\n"
#: ../urpme:52
-#, fuzzy, c-format
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s).\n"
-msgstr " --description - description Ñ‚Ñгини кўрÑатиш: таърифи.\n"
+msgstr ""
#: ../urpme:53
#, c-format
@@ -1278,33 +1296,29 @@ msgid ""
msgstr ""
#: ../urpme:55 ../urpmi:119 ../urpmq:74
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr ""
-" --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга уриниб "
-"кўриш.\n"
+msgstr " --probe-synthesis - synthesis файлидан фойдаланиш.\n"
#: ../urpme:56 ../urpmi:120 ../urpmq:75
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr ""
-" --probe-hdlist - hdlist файлини топишга ва ундан фойдаланишга уриниб "
-"кўриш.\n"
+msgstr " --probe-hdlist - hdlist файлидан фойдаланиш.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - ортиқча хабарлар билан.\n"
+msgstr " --verbose, -v - ортиқча хабарлар билан.\n"
#: ../urpme:58
-#, fuzzy, c-format
+#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - ҳамма манбаларни танлаш.\n"
+msgstr ""
#: ../urpme:75
-#, fuzzy, c-format
+#, c-format
msgid "Only superuser is allowed to remove packages"
-msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
+msgstr "Пакетларни фақат root олиб ташлаши мумкин"
#: ../urpme:106
#, c-format
@@ -1331,30 +1345,36 @@ msgstr "Ўчириш учун ҳеч нарÑа йўқ"
msgid "Checking to remove the following packages"
msgstr "Қуйидаги пакетларни олиб ташлаш учун текшириш бажарилмоқда"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади (%d Мб)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет олиб ташланади"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "Remove %d packages?"
-msgstr "%d-та пакетни олиб ташлашни иÑтайÑизми?"
+msgid " (%d MB)"
+msgstr " (%d Мб)"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d-та пакетни олиб ташлашни иÑтайÑизми?"
+
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (ҳ/Й) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Ўчириш муваффақиÑÑ‚Ñиз тугади"
#: ../urpmf:29
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
@@ -1367,12 +1387,12 @@ msgstr ""
"Copyright (C) 2002-2006 Mandriva.\n"
"Бу Ñркин даÑтур ва GNU GPL шартлари аÑоÑида тарқатилиши мумкин.\n"
"\n"
-"Фойдаланиш:\n"
+"Фойдаланиш: urpmf [параметрлар] қидириш учун ифода\n"
#: ../urpmf:36
-#, fuzzy, c-format
+#, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - шу ёрдам хабарини кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1383,7 +1403,7 @@ msgstr ""
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
-" --excludemedia - кўрÑатилган, вергул билан ажратилган, манбалардан "
+" --excludemedia - кўрÑатилган, вергул билан ажратилган, тўпламлардан "
"фойдаланилмаÑин.\n"
#: ../urpmf:39
@@ -1396,21 +1416,19 @@ msgstr ""
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-" --media - фақат кўрÑатилган, вергул билан ажратилган, манбалардан "
+" --media - фақат кўрÑатилган, вергул билан ажратилган, тўпламлардан "
"фойдаланиш.\n"
#: ../urpmf:42 ../urpmi:89 ../urpmq:53
-#, fuzzy, c-format
+#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
-" --media - фақат кўрÑатилган, вергул билан ажратилган, манбалардан "
-"фойдаланиш.\n"
#: ../urpmf:43 ../urpmi:90 ../urpmq:54
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - urpmi МБ ўрнига synthesis файлидан фойдаланиш.\n"
+msgstr " --synthesis - кўрÑатилган synthesis файлидан фойдаланиш.\n"
#: ../urpmf:44
#, c-format
@@ -1420,7 +1438,7 @@ msgstr " --uniq - бир хил қаторлар кўрÑатилмаÑ
#: ../urpmf:45 ../urpmi:87 ../urpmq:49
#, c-format
msgid " --update - use only update media.\n"
-msgstr " --update - фақат Ñнгилаш манбаÑидан фойдаланиш.\n"
+msgstr " --update - фақат Ñнгилаш тўпламидан фойдаланиш.\n"
#: ../urpmf:46
#, c-format
@@ -1428,14 +1446,14 @@ msgid " --verbose - verbose mode.\n"
msgstr " --verbose - ортиқча хабарлар билан.\n"
#: ../urpmf:47
-#, fuzzy, c-format
+#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:48
-#, fuzzy, c-format
+#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:49
#, c-format
@@ -1453,56 +1471,54 @@ msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
#: ../urpmf:52
-#, fuzzy, c-format
+#, c-format
msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -c - Ñарлавҳаларнинг кÑш директориÑÑини тозалаш.\n"
+msgstr ""
#: ../urpmf:53
-#, fuzzy, c-format
+#, c-format
msgid " -a - binary AND operator.\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr ""
#: ../urpmf:54
-#, fuzzy, c-format
+#, c-format
msgid " -o - binary OR operator.\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr ""
#: ../urpmf:55
-#, fuzzy, c-format
+#, c-format
msgid " ! - unary NOT.\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr ""
#: ../urpmf:56
-#, fuzzy, c-format
+#, c-format
msgid " ( ) - left and right parentheses.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:57
-#, fuzzy, c-format
+#, c-format
msgid "List of tags:\n"
-msgstr ""
-"Тиклаш учун маълумотлар рўйхати:\n"
-"\n"
+msgstr "ТÑглар рўйхати:\n"
#: ../urpmf:58
-#, fuzzy, c-format
+#, c-format
msgid " --qf - specify a printf-like output format\n"
-msgstr " --X - X интерфейÑидан фойдаланиш.\n"
+msgstr ""
#: ../urpmf:59
-#, fuzzy, c-format
+#, c-format
msgid " example: '%%name:%%files'\n"
-msgstr " %s - андоза.\n"
+msgstr " маÑалан: '%%name:%%files'\n"
#: ../urpmf:60
-#, fuzzy, c-format
+#, c-format
msgid " --arch - architecture\n"
-msgstr " --url - url Ñ‚Ñгини кўрÑатиш: url.\n"
+msgstr ""
#: ../urpmf:61
-#, fuzzy, c-format
+#, c-format
msgid " --buildhost - build host\n"
-msgstr " --files - files Ñ‚Ñгини кўрÑатиш: ҳамма файллар.\n"
+msgstr ""
#: ../urpmf:62
#, c-format
@@ -1510,19 +1526,19 @@ msgid " --buildtime - build time\n"
msgstr ""
#: ../urpmf:63
-#, fuzzy, c-format
+#, c-format
msgid " --conffiles - configuration files\n"
-msgstr "КонÑолни моÑлаш модули"
+msgstr ""
#: ../urpmf:64
-#, fuzzy, c-format
+#, c-format
msgid " --conflicts - conflict tags\n"
-msgstr " --files - files Ñ‚Ñгини кўрÑатиш: ҳамма файллар.\n"
+msgstr ""
#: ../urpmf:65
-#, fuzzy, c-format
+#, c-format
msgid " --description - package description\n"
-msgstr " --description - description Ñ‚Ñгини кўрÑатиш: таърифи.\n"
+msgstr " --description - пакет таърифи\n"
#: ../urpmf:66
#, c-format
@@ -1530,103 +1546,103 @@ msgid " --distribution - distribution\n"
msgstr ""
#: ../urpmf:67
-#, fuzzy, c-format
+#, c-format
msgid " --epoch - epoch\n"
-msgstr " --size - size Ñ‚Ñгини кўрÑатиш: ҳажми.\n"
+msgstr ""
#: ../urpmf:68
-#, fuzzy, c-format
+#, c-format
msgid " --filename - filename of the package\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:69
-#, fuzzy, c-format
+#, c-format
msgid " --files - list of files contained in the package\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr " --files - пакетдаги файллар рўйхатини кўрÑатиш\n"
#: ../urpmf:70
-#, fuzzy, c-format
+#, c-format
msgid " --group - group\n"
-msgstr " --group - group Ñ‚Ñгини кўрÑатиш: гуруҳ.\n"
+msgstr " --group - гуруҳ\n"
#: ../urpmf:71
-#, fuzzy, c-format
+#, c-format
msgid " --name - package name\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr " --name - пакетнинг номи\n"
#: ../urpmf:72
-#, fuzzy, c-format
+#, c-format
msgid " --obsoletes - obsoletes tags\n"
-msgstr " --files - files Ñ‚Ñгини кўрÑатиш: ҳамма файллар.\n"
+msgstr ""
#: ../urpmf:73
-#, fuzzy, c-format
+#, c-format
msgid " --packager - packager\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:74
-#, fuzzy, c-format
+#, c-format
msgid " --provides - provides tags\n"
-msgstr " --files - files Ñ‚Ñгини кўрÑатиш: ҳамма файллар.\n"
+msgstr ""
#: ../urpmf:75
-#, fuzzy, c-format
+#, c-format
msgid " --requires - requires tags\n"
-msgstr " --files - files Ñ‚Ñгини кўрÑатиш: ҳамма файллар.\n"
+msgstr ""
#: ../urpmf:76
-#, fuzzy, c-format
+#, c-format
msgid " --size - installed size\n"
-msgstr " --size - size Ñ‚Ñгини кўрÑатиш: ҳажми.\n"
+msgstr ""
#: ../urpmf:77
-#, fuzzy, c-format
+#, c-format
msgid " --sourcerpm - source rpm name\n"
-msgstr " --group - group Ñ‚Ñгини кўрÑатиш: гуруҳ.\n"
+msgstr ""
#: ../urpmf:78
-#, fuzzy, c-format
+#, c-format
msgid " --summary - summary\n"
-msgstr " --summary - summary Ñ‚Ñгини кўрÑатиш: ҳиÑобот.\n"
+msgstr ""
#: ../urpmf:79
-#, fuzzy, c-format
+#, c-format
msgid " --url - url\n"
-msgstr " --url - url Ñ‚Ñгини кўрÑатиш: url.\n"
+msgstr ""
#: ../urpmf:80
-#, fuzzy, c-format
+#, c-format
msgid " --vendor - vendor\n"
-msgstr " --verbose - ортиқча хабарлар билан.\n"
+msgstr ""
#: ../urpmf:81
-#, fuzzy, c-format
+#, c-format
msgid " -m - the media in which the package was found\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr " -m - пакет қайÑи тўпламда топилганини кўрÑатиш\n"
-#: ../urpmf:82 ../urpmq:90
-#, fuzzy, c-format
+#: ../urpmf:82 ../urpmq:95
+#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmf:137
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1648,12 +1664,10 @@ msgstr ""
"Фойдаланиш:\n"
#: ../urpmi:88
-#, fuzzy, c-format
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-" --media - фақат кўрÑатилган, вергул билан ажратилган, манбалардан "
-"фойдаланиш.\n"
#: ../urpmi:91
#, c-format
@@ -1669,9 +1683,9 @@ msgid ""
msgstr " --auto-select - тизимни Ñнгилаш учун пакетларни авто-танлаш.\n"
#: ../urpmi:93
-#, fuzzy, c-format
+#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-select - тизимни Ñнгилаш учун пакетларни авто-танлаш.\n"
+msgstr ""
#: ../urpmi:94
#, c-format
@@ -1691,9 +1705,9 @@ msgid ""
msgstr ""
#: ../urpmi:97
-#, fuzzy, c-format
+#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr ""
#: ../urpmi:98 ../urpmq:57
#, c-format
@@ -1716,29 +1730,29 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " -a - ҳамма манбаларни танлаш.\n"
+msgstr ""
#: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
msgid " --src, -s - next package is a source package.\n"
-msgstr " --list - мавжуд бўлган пакетлар рўйхатини кўрÑатиш.\n"
+msgstr ""
#: ../urpmi:106
-#, fuzzy, c-format
+#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr ""
#: ../urpmi:107
-#, fuzzy, c-format
+#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --noclean - ишлатилмаган RPM'ни кÑшда Ñақлаш.\n"
+msgstr " --clean - аввало пакетларни кÑшдан олиб ташлаш.\n"
#: ../urpmi:108
-#, fuzzy, c-format
+#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
-msgstr " --noclean - ишлатилмаган RPM'ни кÑшда Ñақлаш.\n"
+msgstr " --noclean - пакетлар кÑшдан олиб ташланмаÑин.\n"
#: ../urpmi:110
#, c-format
@@ -1755,10 +1769,9 @@ msgid ""
msgstr ""
#: ../urpmi:115 ../urpmq:70
-#, fuzzy, c-format
+#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-" --wget - маÑофадаги файлларни олиш учун wget даÑтурини ишлатиш.\n"
#: ../urpmi:117
#, c-format
@@ -1845,9 +1858,12 @@ msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
+" --verify-rpm - ўрнатишдан аввал пакетнинг Ñлектрон имзоÑини текшириш\n"
+" (--no-verify-rpm ушбу амалнинг теÑкариÑи, андоза бўйича "
+"пакетнинг Ñлектрон имзоÑи текширилади).\n"
#: ../urpmi:140
-#, fuzzy, c-format
+#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
@@ -1869,21 +1885,23 @@ msgstr " --excludedocs - қўлланма файлларÑиз.\n"
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
+" --ignoresize - ўрнатишдан аввал диÑкда етарли бўш жой борлиги "
+"текширилмаÑин.\n"
#: ../urpmi:144
-#, fuzzy, c-format
+#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --url - url Ñ‚Ñгини кўрÑатиш: url.\n"
+msgstr ""
#: ../urpmi:145
-#, fuzzy, c-format
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
-msgstr " --description - description Ñ‚Ñгини кўрÑатиш: таърифи.\n"
+msgstr ""
#: ../urpmi:147
-#, fuzzy, c-format
+#, c-format
msgid " --skip - packages which installation should be skipped\n"
-msgstr " --test - ўрнатишни тўғри бажариш имкониÑтини текшириш.\n"
+msgstr ""
#: ../urpmi:148
#, c-format
@@ -1893,34 +1911,34 @@ msgid ""
msgstr ""
#: ../urpmi:150
-#, fuzzy, c-format
+#, c-format
msgid " --nolock - don't lock rpm db.\n"
-msgstr " --noclean - ишлатилмаган RPM'ни кÑшда Ñақлаш.\n"
+msgstr ""
#: ../urpmi:151
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
-#, fuzzy, c-format
+#: ../urpmi:152 ../urpmq:92
+#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - ҳамма манбаларни танлаш.\n"
+msgstr ""
#: ../urpmi:153
-#, fuzzy, c-format
+#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmi:154
-#, fuzzy, c-format
+#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr ""
#: ../urpmi:157
#, c-format
@@ -1945,18 +1963,16 @@ msgid "You can't install binary rpm files when using --install-src"
msgstr ""
#: ../urpmi:243
-#, fuzzy, c-format
+#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "Гуруҳ аллақачон мавжуд, Ð¸Ð»Ñ‚Ð¸Ð¼Ð¾Ñ Ð±Ð¾ÑˆÒ›Ð° гуруҳ номини танланг"
+msgstr ""
#: ../urpmi:244
-#, fuzzy, c-format
+#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-"Жилдни (%s) текшириш муваффақиÑÑ‚Ñиз тугади\n"
-"Хато: %s"
#: ../urpmi:253
#, c-format
@@ -1970,52 +1986,61 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
-msgstr ""
+msgstr "Тўплам Ñнгиланмоқда...\n"
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (Ñнгилаш)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (Ñнгилаш)"
-#: ../urpmi:443
+#: ../urpmi:441
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (ўрнатиш)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, c-format
msgid "%s (to install)"
msgstr "%s (ўрнатиш)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Ðимани танлайÑиз? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Қуйидаги пакетни ўрнатиб бўлмайди, чунки у ўрнатилган\n"
+"пакетлардан кўра ÑÑкироқ пакетларга боғлиқ:\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+"Қуйидаги пакетларни ўрнатиб бўлмайди, чунки улар ўрнатилган\n"
+"пакетлардан кўра ÑÑкироқ пакетларга боғлиқ:\n"
+"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2024,66 +2049,75 @@ msgstr ""
"\n"
"Бунга қарамаÑдан давом Ñтишни иÑтайÑизми?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (Ҳ/й) "
#: ../urpmi:503
-#, fuzzy, c-format
+#, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
+msgstr ""
+"Талаб қилинган пакетни ўрнатиб бўлмайди:\n"
"%s"
-msgstr[0] ""
-"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[1] ""
+msgstr ""
"Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
"%s"
-#: ../urpmi:534
-#, fuzzy, c-format
+#: ../urpmi:535
+#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"Ўрнатишни давом Ñтиб бўлмайди, чунки бошқа пакетларни Ñнгилаш\n"
+"учун қуйидаги пакетни олиб ташлаш керак:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"Ўрнатишни давом Ñтиб бўлмайди, чунки бошқаларни Ñнгилаш\n"
-"учун қуйидаги пакетларни олиб ташлаш керак:\n"
-"%s\n"
-msgstr[1] ""
-"Ўрнатишни давом Ñтиб бўлмайди, чунки бошқаларни Ñнгилаш\n"
+msgstr ""
+"Ўрнатишни давом Ñтиб бўлмайди, чунки бошқа пакетларни Ñнгилаш\n"
"учун қуйидаги пакетларни олиб ташлаш керак:\n"
"%s\n"
-#: ../urpmi:541
-#, fuzzy, c-format
+#: ../urpmi:544
+#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
+msgstr ""
+"Бошқа пакетларни Ñнгилаш учун қуйидаги пакетни олиб ташлаш керак:\n"
"%s"
-msgstr[0] ""
-"Бошқаларни Ñнгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[1] ""
-"Бошқаларни Ñнгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
+msgstr ""
+"Бошқа пакетларни Ñнгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
-msgstr ""
+msgstr "(Ñинов уÑули, ҳеч нарÑа олиб ташланмайди)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2092,100 +2126,109 @@ msgstr ""
"Қуйидаги боғлиқликларни ўрнатиш учун Ñиз root бўлишингиз керак:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
-msgstr ""
+msgstr "(Ñинов уÑули, ҳеч нарÑа ўрнатилмайди)"
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "%d-та пакетни ўрнатиш билан давом Ñтишни иÑтайÑизми?"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Тайёр бўлганда ENTER тугмаÑини боÑинг..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Бекор қилиш"
-#: ../urpmi:666
-#, fuzzy, c-format
+#: ../urpmi:671
+#, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Қуйидаги пакетларнинг имзолари нотўғри"
-msgstr[1] "Қуйидаги пакетларнинг имзолари нотўғри"
+msgstr "Қуйидаги пакетнинг имзоÑи хато"
+
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
-#: ../urpmi:668
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Ўрнатишни давом Ñтишни иÑтайÑизми?"
-#: ../urpmi:715
-#, fuzzy, c-format
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Ўрнатиш муваффақиÑÑ‚Ñиз тугади"
+
+#: ../urpmi:711
+#, c-format
msgid "distributing %s"
-msgstr "Ишга туширилмоқда: %s"
+msgstr ""
-#: ../urpmi:729
-#, fuzzy, c-format
+#: ../urpmi:725
+#, c-format
msgid "installing %s from %s"
-msgstr "%s ўрнатилмоқда"
+msgstr "ўрнатилмоқда: %s, қаердан: %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s ўрнатилмоқда"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "Ўрнатиш муваффақиÑÑ‚Ñиз тугади:"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Боғлиқликларни текширмаÑдан ўрнатиб кўрайми? (Ò³/Й) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "Ўрнатиш муваффақиÑÑ‚Ñиз тугади"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "Ўрнатиш муваффақиÑÑ‚Ñиз тугади"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Ўрнатиш мумкин"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
-msgstr ""
+msgstr "Пакетларни Ñнгилаш муҳтожи йўқ"
-#: ../urpmi:840
-#, fuzzy, c-format
+#: ../urpmi:838
+#, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Пакет %s аллақачон ўрнатилган"
-msgstr[1] "Пакет %s аллақачон ўрнатилган"
+msgstr "%s пакети аллақачон ўрнатилган"
-#: ../urpmi:843
-#, fuzzy, c-format
+#: ../urpmi:839
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s пакетлари аллақачон ўрнатилган"
+
+#: ../urpmi:842
+#, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Ҳамма нарÑа аллақачон ўрнатилган"
-msgstr[1] "Ҳамма нарÑа аллақачон ўрнатилган"
+msgstr "%s пакетини ўрнатиб бўлмайди"
+
+#: ../urpmi:843
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "%s пакетларини ўрнатиб бўлмайди"
-#: ../urpmi:863
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi қайтадан ишга тушмоқда"
@@ -2203,25 +2246,30 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
+"Фойдаланиш: urpmi.addmedia [амаллар] <номи> <url>\n"
+"<url> қуйидагилардан бири\n"
+" [file:/]/<йўл>\n"
+" ftp://<фойдаланувчи>:<махфий Ñўз>@<хоÑÑ‚>/<йўл>\n"
+" ftp://<хоÑÑ‚>/<йўл>\n"
+" http://<хоÑÑ‚>/<йўл>\n"
+" removable://<йўл>\n"
+"\n"
+"[амаллар] қуйидагилар\n"
#: ../urpmi.addmedia:54
#, c-format
msgid " --update - create an update medium.\n"
-msgstr " --update - Ñнгилаш манбаÑини Ñратиш.\n"
+msgstr " --update - Ñнгилаш тўпламини Ñратиш.\n"
#: ../urpmi.addmedia:55
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr ""
-" --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга уриниб "
-"кўриш.\n"
+msgstr " --probe-synthesis - synthesis файлидан фойдаланиш.\n"
#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr ""
-" --probe-hdlist - hdlist файлини топишга ва ундан фойдаланишга уриниб "
-"кўриш.\n"
+msgstr " --probe-hdlist - hdlist файлидан фойдаланиш.\n"
#: ../urpmi.addmedia:57
#, c-format
@@ -2229,7 +2277,7 @@ msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
msgstr ""
#: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
msgstr " --no-probe - synthesis ёки hdlist файлини топишга уринмаш.\n"
@@ -2246,9 +2294,9 @@ msgid " --interactive - with --distrib, ask confirmation for each media\n"
msgstr ""
#: ../urpmi.addmedia:64
-#, fuzzy, c-format
+#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --list-media - мавжуд бўлган манбалар рўйхатини кўрÑатиш.\n"
+msgstr ""
#: ../urpmi.addmedia:65
#, c-format
@@ -2267,7 +2315,7 @@ msgstr ""
#: ../urpmi.addmedia:69 ../urpmi.update:42
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr ""
+msgstr " --no-md5sum - MD5SUM файлини текширишни ўчириш.\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2279,17 +2327,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - Ñарлавҳаларнинг кÑш директориÑÑини тозалаш.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - хабарÑиз.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - ортиқча хабарлар билан.\n"
@@ -2297,7 +2345,7 @@ msgstr " -v - ортиқча хабарлар билан.\n"
#: ../urpmi.addmedia:86
#, c-format
msgid "unable to update medium \"%s\"\n"
-msgstr "манбани (%s) Ñнгилаб бўлмади\n"
+msgstr "тўпламни Ñнгилаб бўлмади: \"%s\"\n"
#: ../urpmi.addmedia:115
#, c-format
@@ -2305,14 +2353,14 @@ msgid "bad <url> (for local directory, the path must be absolute)\n"
msgstr ""
#: ../urpmi.addmedia:118
-#, fuzzy, c-format
+#, c-format
msgid "Only superuser is allowed to add media"
-msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
+msgstr "Пакетлар тўпламини фақат root қўшиши мумкин"
#: ../urpmi.addmedia:121
-#, fuzzy, c-format
+#, c-format
msgid "creating config file [%s]"
-msgstr "моÑлама файли (%s) ёзилмоқда"
+msgstr "моÑлама файли (%s) Ñратилмоқда"
#: ../urpmi.addmedia:122
#, c-format
@@ -2330,6 +2378,8 @@ msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
+"\n"
+"\"%s\" тўпламини қўшишни иÑтайÑизми?"
#: ../urpmi.addmedia:166
#, c-format
@@ -2339,12 +2389,12 @@ msgstr "synthesis/hdlist файлига ниÑбий йўл кўрÑатилма
#: ../urpmi.addmedia:169
#, c-format
msgid "Can't use %s with remote medium"
-msgstr ""
+msgstr "МаÑофадаги тўплам учун %s амалидан фойдаланиб бўлмайди"
#: ../urpmi.addmedia:190
#, c-format
msgid "unable to create medium \"%s\"\n"
-msgstr "манбани (%s) Ñратиб бўлмади\n"
+msgstr "тўпламни Ñратиб бўлмади: \"%s\"\n"
#: ../urpmi.recover:28
#, c-format
@@ -2368,9 +2418,9 @@ msgid " --checkpoint - set repackaging start now\n"
msgstr ""
#: ../urpmi.recover:35
-#, fuzzy, c-format
+#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - ишлатилмаган RPM'ни кÑшда Ñақлаш.\n"
+msgstr ""
#: ../urpmi.recover:37
#, c-format
@@ -2379,14 +2429,14 @@ msgid ""
msgstr ""
#: ../urpmi.recover:38
-#, fuzzy, c-format
+#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-url - мавжуд бўлган манба ва унинг URL'ни кўрÑатиш.\n"
+msgstr ""
#: ../urpmi.recover:39
-#, fuzzy, c-format
+#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-url - мавжуд бўлган манба ва унинг URL'ни кўрÑатиш.\n"
+msgstr ""
#: ../urpmi.recover:40
#, c-format
@@ -2396,9 +2446,9 @@ msgid ""
msgstr ""
#: ../urpmi.recover:42
-#, fuzzy, c-format
+#, c-format
msgid " --disable - turn off repackaging\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
+msgstr ""
#: ../urpmi.recover:57
#, c-format
@@ -2406,9 +2456,9 @@ msgid "Invalid date or duration [%s]\n"
msgstr ""
#: ../urpmi.recover:65
-#, fuzzy, c-format
+#, c-format
msgid "Repackage directory not defined\n"
-msgstr "%s пакети топилмади."
+msgstr ""
#: ../urpmi.recover:68
#, c-format
@@ -2422,8 +2472,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr "%d-та файл олиб ташланди\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d-та файл олиб ташланди\n"
#: ../urpmi.recover:82
#, c-format
@@ -2458,17 +2509,17 @@ msgstr ""
#: ../urpmi.recover:130
#, c-format
msgid "You must be superuser to do this"
-msgstr ""
+msgstr "Бундан фойдаланиш учун root бўлиш шарт"
#: ../urpmi.recover:143 ../urpmi.recover:209
-#, fuzzy, c-format
+#, c-format
msgid "Writing rpm macros file [%s]...\n"
-msgstr "RPM-файли (%s) олинмоқда..."
+msgstr ""
#: ../urpmi.recover:185
-#, fuzzy, c-format
+#, c-format
msgid "No rollback date found\n"
-msgstr "Файллар рўйхати топилмади\n"
+msgstr ""
#: ../urpmi.recover:188
#, c-format
@@ -2481,34 +2532,34 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"Фойдаланиш: urpmi.removemedia [-a] <ном>...\n"
-"<ном> - олиб ташланадиган манбанинг номи.\n"
+"Фойдаланиш: urpmi.removemedia (-a | <номи> ...)\n"
+"<номи> - олиб ташланиши керак бўлган тўпламнинг номи.\n"
#: ../urpmi.removemedia:41
#, c-format
msgid " -a - select all media.\n"
-msgstr " -a - ҳамма манбаларни танлаш.\n"
+msgstr " -a - ҳамма тўпламларни танлаш.\n"
#: ../urpmi.removemedia:43
-#, fuzzy, c-format
+#, c-format
msgid " -y - fuzzy match on media names.\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr ""
#: ../urpmi.removemedia:65
-#, fuzzy, c-format
+#, c-format
msgid "Only superuser is allowed to remove media"
-msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
+msgstr "Тўпламни фақат root олиб ташлаши мумкин"
#: ../urpmi.removemedia:78
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-"олиб ташлаш учун ҳеч нарÑа йўқ (манбани қўшиш\n"
+"олиб ташлаш учун ҳеч нарÑа йўқ (тўпламни қўшиш\n"
"учун urpmi.addmedia буйруғидан фойдаланинг)\n"
#: ../urpmi.removemedia:84
@@ -2521,18 +2572,18 @@ msgstr ""
"(қуйидагилардан биттаÑи: %s)\n"
#: ../urpmi.update:30
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
msgstr ""
-"Фойдаланиш: urpmi.removemedia [-a] <ном>...\n"
-"<ном> - олиб ташланадиган манбанинг номи.\n"
+"Фойдаланиш: urpmi.update [амаллар] <номи> ...\n"
+"<номи> - Ñнгиланиши керак бўлган тўпламнинг номи.\n"
#: ../urpmi.update:41
-#, fuzzy, c-format
+#, c-format
msgid " --update - update only update media.\n"
-msgstr " --update - фақат Ñнгилаш манбаÑидан фойдаланиш.\n"
+msgstr " --update - фақат Ñнгилаш тўпламидан фойдаланиш.\n"
#: ../urpmi.update:43
#, c-format
@@ -2540,9 +2591,9 @@ msgid " --force-key - force update of gpg key.\n"
msgstr ""
#: ../urpmi.update:44
-#, fuzzy, c-format
+#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --update - фақат Ñнгилаш манбаÑидан фойдаланиш.\n"
+msgstr ""
#: ../urpmi.update:45
#, c-format
@@ -2550,28 +2601,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
-#, fuzzy, c-format
+#, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
+#, c-format
msgid " -a - select all non-removable media.\n"
-msgstr " -a - ҳамма манбаларни танлаш.\n"
+msgstr ""
-#: ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+#: ../urpmi.update:50
+#, c-format
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr ""
-#: ../urpmi.update:70
-#, fuzzy, c-format
+#: ../urpmi.update:71
+#, c-format
msgid "Only superuser is allowed to update media"
-msgstr "Фақат бошқарувчи пакетларни ўрнатиши мумкин"
+msgstr "Фақат бошқарувчи (root ) тўплами Ñнгилаши мумкин"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-"Ñнгилаш учун ҳеч нарÑа йўқ (манбани қўшиш учун\n"
+"Ñнгилаш учун ҳеч нарÑа йўқ (тўпламни қўшиш учун\n"
"urpmi.addmedia буйруғидан фойдаланинг)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2580,20 +2637,20 @@ msgstr ""
"Ñнгилаш параметри етишмаÑпти\n"
"(қуйидагилардан биттаÑи: %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
-#, fuzzy, c-format
+#: ../urpmi.update:102
+#, c-format
msgid "ignoring media %s"
-msgstr "Манба (\"%s\") тузатилмоқда:"
+msgstr "тўпламга Ñътибор берилмайди: \"%s\""
-#: ../urpmi.update:101
-#, fuzzy, c-format
+#: ../urpmi.update:102
+#, c-format
msgid "enabling media %s"
-msgstr "манба (%s) ўчирилмоқда"
+msgstr ""
#: ../urpmq:43
#, c-format
@@ -2612,13 +2669,11 @@ msgstr ""
"Фойдаланиш:\n"
#: ../urpmq:51
-#, fuzzy, c-format
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-" --media - фақат кўрÑатилган, вергул билан ажратилган, манбалардан "
-"фойдаланиш.\n"
#: ../urpmq:56
#, c-format
@@ -2633,22 +2688,22 @@ msgstr " --list - мавжуд бўлган пакетлар рўйха
#: ../urpmq:60
#, c-format
msgid " --list-media - list available media.\n"
-msgstr " --list-media - мавжуд бўлган манбалар рўйхатини кўрÑатиш.\n"
+msgstr " --list-media - мавжуд бўлган тўпламлар рўйхатини кўрÑатиш.\n"
#: ../urpmq:61
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url - мавжуд бўлган манба ва унинг URL'ни кўрÑатиш.\n"
+msgstr " --list-url - мавжуд бўлган тўплам ва унинг URL'ни кўрÑатиш.\n"
#: ../urpmq:62
-#, fuzzy, c-format
+#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-url - мавжуд бўлган манба ва унинг URL'ни кўрÑатиш.\n"
+msgstr ""
#: ../urpmq:63
-#, fuzzy, c-format
+#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
-msgstr " --list-media - мавжуд бўлган манбалар рўйхатини кўрÑатиш.\n"
+msgstr ""
#: ../urpmq:64
#, c-format
@@ -2657,9 +2712,9 @@ msgid ""
msgstr ""
#: ../urpmq:65
-#, fuzzy, c-format
+#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --list - мавжуд бўлган пакетлар рўйхатини кўрÑатиш.\n"
+msgstr ""
#: ../urpmq:66
#, c-format
@@ -2668,9 +2723,9 @@ msgid ""
msgstr ""
#: ../urpmq:68
-#, fuzzy, c-format
+#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --url - url Ñ‚Ñгини кўрÑатиш: url.\n"
+msgstr ""
#: ../urpmq:72
#, c-format
@@ -2680,200 +2735,152 @@ msgid ""
msgstr ""
#: ../urpmq:84
-#, fuzzy, c-format
+#, c-format
msgid " --changelog - print changelog.\n"
-msgstr " --all - ҳамма Ñ‚Ñгларни кўрÑатиш.\n"
+msgstr ""
#: ../urpmq:85
-#, fuzzy, c-format
+#, c-format
msgid " --summary, -S - print summary.\n"
-msgstr " --summary - summary Ñ‚Ñгини кўрÑатиш: ҳиÑобот.\n"
+msgstr ""
+
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
#: ../urpmq:88
+#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+
+#: ../urpmq:90
#, fuzzy, c-format
-msgid " -c - complete output with package to be removed.\n"
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
-#: ../urpmq:89
-#, fuzzy, c-format
+#: ../urpmq:93
+#, c-format
+msgid " -c - complete output with package to be removed.\n"
+msgstr ""
+
+#: ../urpmq:94
+#, c-format
msgid " -d - extend query to package dependencies.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
-#: ../urpmq:91
-#, fuzzy, c-format
+#: ../urpmq:96
+#, c-format
msgid " -g - print groups with name also.\n"
-msgstr " -q - хабарÑиз.\n"
+msgstr ""
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
-
-#: ../urpmq:95
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+#: ../urpmq:99
+#, c-format
+msgid " -m - equivalent to -du\n"
+msgstr ""
-#: ../urpmq:96
-#, fuzzy, c-format
+#: ../urpmq:100
+#, c-format
msgid " -r - print version and release with name also.\n"
-msgstr " --name - фақат пакетнинг номини кўрÑатиш.\n"
-
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:101
-#, fuzzy, c-format
+#: ../urpmq:103
+#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -a - ҳамма манбаларни танлаш.\n"
+msgstr ""
-#: ../urpmq:102
-#, fuzzy, c-format
+#: ../urpmq:104
+#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -l - пакетдаги файлларни кўрÑатиш.\n"
+msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes'дан фақат --parallel билан бирга фойдаланиб бўлади"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "Файллар рўйхати топилмади\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Changelog файли топилмади\n"
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет ҳам ўрнатилади:\n"
-#~ "%s\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "Ўрнатиш муваффақиÑÑ‚Ñиз тугади"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "\"%s\" (%s/%s) пакети ўрнатилмоқда..."
-
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "synthesis файли (%s) текширилмоқда"
-
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "Ишга туширилмоқда: %s"
+#~ msgid "No filelist found\n"
+#~ msgstr "Файллар рўйхати топилмади\n"
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Пакетни ўрнатиш..."
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "%d-та пакетни ўрнатиш билан давом Ñтишни иÑтайÑизми? (%d Мб)"
-#, fuzzy
-#~ msgid "Installing %s on %s..."
-#~ msgstr "%s ўрнатилмоқда"
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d-та пакет, %d Мб)"
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Пакетни ўрнатиш..."
+#~ msgid "medium \"%s\" is not selected"
+#~ msgstr "тўплам танланмаган: \"%s\""
#~ msgid ""
-#~ "Some requested packages cannot be installed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Талаб қилинган баъзи бир пакетларни ўрнатиб бўлмайди:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The installation cannot continue because the following packages\n"
-#~ "have to be removed for others to be upgraded:\n"
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
#~ "%s\n"
#~ msgstr ""
-#~ "Ўрнатишни давом Ñтиб бўлмайди, чунки бошқаларни Ñнгилаш\n"
-#~ "учун қуйидаги пакетларни олиб ташлаш керак:\n"
+#~ "Боғлиқликларни таъминлаш учун қуйидаги %d-та пакет ҳам ўрнатилади:\n"
#~ "%s\n"
#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Бошқаларни Ñнгилаш учун қуйидаги пакетларни олиб ташлаш керак:\n"
-#~ "%s"
-
-#~ msgid ""
#~ "To satisfy dependencies, the following packages are going to be installed"
#~ msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакетлар ҳам ўрнатилади"
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "Боғлиқликларни таъминлаш учун қуйидаги пакет ҳам ўрнатилади"
-
-#~ msgid "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr "%d-та пакетни ўрнатиш билан давом Ñтишни иÑтайÑизми? (%d Мб)"
-
-#~ msgid "The following packages have bad signatures"
-#~ msgstr "Қуйидаги пакетларнинг имзолари нотўғри"
-
-#~ msgid "Packages %s are already installed"
-#~ msgstr "Пакетлар %s аллақачон ўрнатилган"
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr ""
#~ " --probe-synthesis - synthesis файлини топишга ва ундан фойдаланишга "
@@ -2885,83 +2892,20 @@ msgstr "Changelog файли топилмади\n"
#~ "кўриш.\n"
#~ msgid ""
-#~ " --no-probe - do not try to find any synthesis or\n"
-#~ " hdlist file.\n"
-#~ msgstr ""
-#~ " --no-probe - synthesis ёки hdlist файлини топишга уринилмаÑин.\n"
-
-#~ msgid "Will create config file [%s]"
-#~ msgstr "МоÑлама файли (%s) Ñратилмоқда"
-
-#~ msgid ""
-#~ "usage: urpmi.removemedia [-a] <name> ...\n"
-#~ "where <name> is a medium name to remove.\n"
-#~ msgstr ""
-#~ "Фойдаланиш: urpmi.removemedia [-a] <ном>...\n"
-#~ "<ном> - олиб ташланадиган манбанинг номи.\n"
-
-#~ msgid ""
#~ "\n"
#~ "unknown options '%s'\n"
#~ msgstr ""
#~ "\n"
#~ "номаълум параметрлар \"%s\"\n"
-#, fuzzy
-#~ msgid "inconsistent list file for \"%s\", medium ignored"
-#~ msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
-
-#~ msgid ""
-#~ "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-#~ "update or --parallel"
-#~ msgstr ""
-#~ "--synthesis'дан --media, --excludemedia, --sortmedia, --update or --"
-#~ "parallel билан бирга фойдаланиб бўлмайди"
-
-#, fuzzy
-#~ msgid "virtual medium \"%s\" is not local, medium ignored"
-#~ msgstr "манба (%s) танланмаган"
-
-#~ msgid "added medium %s"
-#~ msgstr "%s манбаÑи қўшилди"
-
-#, fuzzy
-#~ msgid "unable to access first installation medium"
-#~ msgstr "RPM-файлига (%s) мурожаат қилиб бўлмади"
-
#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
#~ msgstr "'%s' учун hdlist (ёки synthesis) файлидан нуÑха кўчирилмоқда..."
#~ msgid "retrieval of source hdlist (or synthesis) failed"
#~ msgstr "...hdlist (ёки synthesis) файлини ёзиб олиш муваффақиÑÑ‚Ñиз тугади"
-#, fuzzy
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "'%s' файлини ёзиб бўлмади"
-
-#, fuzzy
-#~ msgid "nothing written in list file for \"%s\""
-#~ msgstr "манба (%s) учун рўйхат файли ёзилмоқда"
-
#~ msgid "found %d headers in cache"
#~ msgstr "кÑшда %d Ñарлавҳа топилди"
#~ msgid "removing %d obsolete headers in cache"
#~ msgstr "кÑшдаги %d ÑÑки Ñарлавҳа ўчирилмоқда"
-
-#~ msgid "no package named %s"
-#~ msgstr "%s номли пакет мавжуд ÑмаÑ"
-
-#~ msgid "urpmi database locked"
-#~ msgstr "urpmi маълумот базаÑи қулфланган"
-
-#~ msgid "examining MD5SUM file"
-#~ msgstr "MD5SUM файли текширилмоқда"
-
-#~ msgid "computing md5sum of existing source hdlist (or synthesis)"
-#~ msgstr ""
-#~ "мавжуд бўлган hdlist (ёки synthesis) файли учун md5sum ҳиÑобланмоқда"
-
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Қуйидаги пакетларда %s бор: %s"
diff --git a/po/uz@Latn.po b/po/uz@Latn.po
index b77fa2c5..6b497799 100644
--- a/po/uz@Latn.po
+++ b/po/uz@Latn.po
@@ -1,23 +1,24 @@
# translation of urpmi-uz.po to Uzbek
-# Copyright (C) 2001,2003, 2004, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2001,2003, 2004, 2006, 2007 Free Software Foundation, Inc.
#
# Sherzod Mamatkulov <mamatkulov@yahoo.com>, 2001.
-# Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006.
+# Mashrab Kuvatov <kmashrab@uni-bremen.de>, 2003, 2004, 2006, 2007.
# Nurali Abdurahmonov <mavnur@gmail.com>, 2006.
msgid ""
msgstr ""
"Project-Id-Version: urpmi-uz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-18 16:01+0100\n"
-"PO-Revision-Date: 2006-12-03 14:46+0000\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
+"PO-Revision-Date: 2007-02-26 22:17+0100\n"
"Last-Translator: Mashrab Kuvatov <kmashrab@uni-bremen.de>\n"
"Language-Team: Uzbek <floss-uz-l10n@googlegroups.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
"X-Generator: KBabel 1.11.4\n"
-#: ../gurpmi:30 ../gurpmi2:63
+#: ../gurpmi:30 ../gurpmi2:64
#, c-format
msgid "RPM installation"
msgstr "RPM o'rnatish"
@@ -25,9 +26,9 @@ msgstr "RPM o'rnatish"
#: ../gurpmi:44
#, c-format
msgid "Error: unable to find file %s, will cancel operation"
-msgstr ""
+msgstr "Xato: %s fayli topilmadi, amal bekor qilinadi"
-#: ../gurpmi:45 ../gurpmi2:152 ../gurpmi2:175
+#: ../gurpmi:45 ../gurpmi2:153 ../gurpmi2:176
#, c-format
msgid "_Ok"
msgstr "_Ok"
@@ -46,7 +47,7 @@ msgid ""
msgstr ""
#: ../gurpmi:73 ../gurpmi:84
-#, fuzzy, c-format
+#, c-format
msgid ""
"You are about to install the following software packages on your computer:\n"
"\n"
@@ -54,8 +55,11 @@ msgid ""
"\n"
"Proceed?"
msgstr ""
-"Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
+"Quyidagi paketlar o'rnatiladi:\n"
+"\n"
"%s\n"
+"\n"
+"Davom etishni istaysizmi?"
#: ../gurpmi:79
#, c-format
@@ -66,6 +70,11 @@ msgid ""
"\n"
"You may prefer to just save it. What is your choice?"
msgstr ""
+"Quyidagi paketlar o'rnatiladi:\n"
+"\n"
+"%s\n"
+"\n"
+"Ularni o'rnatmasdan kompyuterga saqlasa ham bo'ladi. Siz nimani istaysiz?"
#: ../gurpmi:97
#, c-format
@@ -77,37 +86,37 @@ msgstr "O'r_natish"
msgid "_Save"
msgstr "_Saqlash"
-#: ../gurpmi:99 ../gurpmi2:152
+#: ../gurpmi:99 ../gurpmi2:153
#, c-format
msgid "_Cancel"
msgstr "_Bekor qilish"
#: ../gurpmi:107
-#, fuzzy, c-format
+#, c-format
msgid "Choose location to save file"
-msgstr "Faylni tanlang"
+msgstr "Faylni qaerga saqlash joyini tanlang"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Noma'lum parametr \"%s\""
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Hech qanday paket ko'rsatilmagan"
-#: ../gurpmi2:43
+#: ../gurpmi2:44
#, c-format
msgid "Please wait..."
msgstr "Iltimos kutib turing..."
-#: ../gurpmi2:52
+#: ../gurpmi2:53
#, c-format
msgid "Must be root"
msgstr "root bo'lish kerak"
-#: ../gurpmi2:87
+#: ../gurpmi2:88
#, c-format
msgid ""
"Some requested packages cannot be installed:\n"
@@ -118,42 +127,42 @@ msgstr ""
"%s\n"
"Bunga qaramasdan o'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:111
+#: ../gurpmi2:112
#, c-format
msgid "Warning"
msgstr "Diqqat"
-#: ../gurpmi2:111 ../urpmi:624
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "Ok"
-#: ../gurpmi2:148
+#: ../gurpmi2:149
#, c-format
msgid " (to upgrade)"
msgstr " (yangilash)"
-#: ../gurpmi2:149
+#: ../gurpmi2:150
#, c-format
msgid " (to install)"
msgstr " (o'rnatish)"
-#: ../gurpmi2:152
+#: ../gurpmi2:153
#, c-format
msgid "Package choice"
-msgstr ""
+msgstr "Paket tanlovi"
-#: ../gurpmi2:153 ../urpmi:449
+#: ../gurpmi2:154 ../urpmi:447
#, c-format
msgid "One of the following packages is needed:"
msgstr "Quyidagi paketlardan biri kerak:"
-#: ../gurpmi2:176
+#: ../gurpmi2:177
#, c-format
msgid "_Abort"
msgstr "To'_xtatish"
-#: ../gurpmi2:196
+#: ../gurpmi2:197
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -164,41 +173,45 @@ msgstr ""
"%s\n"
"O'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:214 ../urpmi:578 ../urpmi:589
-#, fuzzy, c-format
+#: ../gurpmi2:216 ../urpmi:581 ../urpmi:592
+#, c-format
msgid ""
"To satisfy dependencies, the following package is going to be installed:"
-msgid_plural ""
+msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi:"
+
+#: ../gurpmi2:217 ../urpmi:582 ../urpmi:593
+#, c-format
+msgid ""
"To satisfy dependencies, the following packages are going to be installed:"
-msgstr[0] "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi (%d Mb)"
-msgstr[1] "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi (%d Mb)"
+msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi:"
-#: ../gurpmi2:217 ../urpmi:580
+#: ../gurpmi2:219 ../urpmi:583
#, c-format
-msgid "(%d packages, %d MB)"
-msgstr "(%d-ta paket, %d Mb)"
+msgid "(%d package, %d MB)"
+msgid_plural "(%d packages, %d MB)"
+msgstr[0] "(%d-ta paket, %d Mb)"
-#: ../gurpmi2:223
+#: ../gurpmi2:225
#, c-format
msgid "Package installation..."
msgstr "Paketni o'rnatish..."
-#: ../gurpmi2:219 ../urpmi:608
-#, fuzzy, c-format
+#: ../gurpmi2:227 ../urpmi:613
+#, c-format
msgid "unable to get source packages, aborting"
-msgstr "paketni (%s) olib tashlab bo'lmadi"
+msgstr ""
-#: ../gurpmi2:231 ../urpmi:617
+#: ../gurpmi2:239 ../urpmi:622
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
-msgstr "Iltimos \"%s\" nomli manbani [%s] uskunasiga qo'ying"
+msgstr "Iltimos \"%s\" nomli to'plamni [%s] uskunasiga qo'ying"
-#: ../gurpmi2:256
+#: ../gurpmi2:264
#, c-format
msgid "Downloading package `%s'..."
msgstr "\"%s\" paketi olinmoqda..."
-#: ../gurpmi2:271
+#: ../gurpmi2:279
#, c-format
msgid ""
"The following packages have bad signatures:\n"
@@ -211,7 +224,7 @@ msgstr ""
"\n"
"O'rnatishni davom ettirishni istaysizmi?"
-#: ../gurpmi2:278 ../gurpmi2:333 ../urpmi:684 ../urpmi:814
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -222,37 +235,37 @@ msgstr ""
"%s\n"
"Balki urpmi ma'lumot bazasini yangilashingiz kerak."
-#: ../gurpmi2:284 ../urpme:138 ../urpmi:735
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "%s o'chirilmoqda"
-#: ../gurpmi2:290 ../urpm/install.pm:70
+#: ../gurpmi2:298 ../urpm/install.pm:70
#, c-format
msgid "Preparing..."
msgstr "Tayyorlanmoqda..."
-#: ../gurpmi2:294
+#: ../gurpmi2:302
#, c-format
msgid "Installing package `%s' (%s/%s)..."
msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
-#: ../gurpmi2:326
+#: ../gurpmi2:334
#, c-format
msgid "_Done"
msgstr "_Tayyor"
-#: ../gurpmi2:331 ../urpmi:696 ../urpmi:774 ../urpmi:791
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+msgid "Installation failed:"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-#: ../gurpmi2:336
+#: ../gurpmi2:344
#, c-format
msgid "The package(s) are already installed"
msgstr "Hamma narsa allaqachon o'rnatilgan"
-#: ../gurpmi2:338
+#: ../gurpmi2:346
#, c-format
msgid "Installation finished"
msgstr "O'rnatish tugadi"
@@ -272,19 +285,21 @@ msgid " -h|--help - print this help message.\n"
msgstr " -h|--help - shu yordam xabarini ko'rsatish.\n"
#: ../rpm-find-leaves:17
-#, fuzzy, c-format
+#, c-format
msgid " --root <path> - use the given root instead of /\n"
-msgstr " --synthesis - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
+msgstr ""
+" --root <yo'l> - / o'rniga tub direktoriya sifatida ko'rsatilgan yo'ldan "
+"foydalanish\n"
#: ../rpm-find-leaves:18
-#, fuzzy, c-format
+#, c-format
msgid " -g [group] - restrict results to specified group.\n"
-msgstr " --group - group tegini ko'rsatish: guruh.\n"
+msgstr " -g [guruh] - natijalarni ko'rsatilgan guruhga chegaralash\n"
#: ../rpm-find-leaves:19
-#, fuzzy, c-format
+#, c-format
msgid " -f - output rpm full name (NVRA)\n"
-msgstr " -q - xabarsiz.\n"
+msgstr " -f - RPM-faylining to'liq nomini ko'rsatish (NVRA)\n"
#: ../rpm-find-leaves:20
#, c-format
@@ -301,63 +316,63 @@ msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:93
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "rpmdb'ni ochib bo'lmadi"
-#: ../urpm.pm:112
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
-msgstr ""
+msgstr "%d-ta RPM-xeder topildi, %d-ta eski xeder o'chiriladi"
-#: ../urpm.pm:128
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "RPM-faylining nomi (%s) noto'g'ri"
-#: ../urpm.pm:134
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "RPM-fayli (%s) olinmoqda..."
-#: ../urpm.pm:136 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...olish tugadi"
-#: ../urpm.pm:139 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
-msgstr "...olish muvaffaqiyatsiz tudagi: %s"
+msgstr "...olish muvaffaqiyatsiz tugadi: %s"
-#: ../urpm.pm:144
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
-#: ../urpm.pm:149
-#, fuzzy, c-format
+#: ../urpm.pm:147
+#, c-format
msgid "unable to parse spec file %s [%s]"
-msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
+msgstr ""
-#: ../urpm.pm:159
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "RPM-faylini ro'yxatdan o'tkazib bo'lmadi"
-#: ../urpm.pm:161
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:165
-#, fuzzy, c-format
+#: ../urpm.pm:163
+#, c-format
msgid "error registering local packages"
-msgstr "Quyidagi paketlarni saralashda xato ro'y berdi:"
+msgstr ""
-#: ../urpm.pm:261
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -370,37 +385,37 @@ msgstr ""
#: ../urpm/args.pm:133
#, c-format
msgid "chroot directory doesn't exist"
-msgstr ""
+msgstr "chroot direktoriyasi mavjud emas"
#: ../urpm/args.pm:242
-#, fuzzy, c-format
+#, c-format
msgid "You need to be root to use --use-distrib"
-msgstr "Bu buyrug'ni ishlatish uchun siz root bo'lishingiz kerak! \n"
+msgstr "--use-distrib amalidan foydalanish uchun root bo'lish shart"
-#: ../urpm/args.pm:273
+#: ../urpm/args.pm:275
#, c-format
msgid "urpmq: cannot read rpm file \"%s\"\n"
msgstr "urpmq: RPM-faylini (%s) o'qib bo'lmadi\n"
-#: ../urpm/args.pm:423
+#: ../urpm/args.pm:426
#, c-format
msgid "Can't use %s without %s"
-msgstr ""
+msgstr "%s amalidan %s amalisiz foydalanib bo'lmaydi"
-#: ../urpm/args.pm:426
+#: ../urpm/args.pm:429
#, c-format
msgid "Can't use %s with %s"
-msgstr ""
+msgstr "%s amalidan %s amali bilan birga foydalanib bo'lmaydi"
-#: ../urpm/args.pm:440
+#: ../urpm/args.pm:443
#, c-format
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
-msgstr "manba (%s) uchun hdlist synthesis fayli yaratildi"
+msgstr "to'plam uchun hdlist synthesis fayli yaratildi: \"%s\""
#: ../urpm/bug_report.pm:51 ../urpmi:247
#, c-format
@@ -408,21 +423,21 @@ msgid "Copying failed"
msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
#: ../urpm/cfg.pm:81
-#, fuzzy, c-format
+#, c-format
msgid "syntax error in config file at line %s"
-msgstr "moslama faylini (%s) yozib bo'lmadi"
+msgstr "moslama faylining %s-chi satrida xato"
#: ../urpm/cfg.pm:112
-#, fuzzy, c-format
+#, c-format
msgid "unable to read config file [%s]"
-msgstr "moslama faylini (%s) yozib bo'lmadi"
+msgstr "%s moslama faylini o'qib bo'lmadi"
#: ../urpm/cfg.pm:138
#, c-format
msgid "medium `%s' is defined twice, aborting"
-msgstr ""
+msgstr "\"%s\" to'plami ikki marta aniqlangan, amal bekor qilinadi"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "moslama faylini (%s) yozib bo'lmadi"
@@ -430,7 +445,7 @@ msgstr "moslama faylini (%s) yozib bo'lmadi"
#: ../urpm/download.pm:111
#, c-format
msgid "Please enter your credentials for accessing proxy\n"
-msgstr ""
+msgstr "Proksiga ulanish uchun kerakli ma'lumotni kiriting\n"
#: ../urpm/download.pm:112
#, c-format
@@ -450,72 +465,72 @@ msgstr ""
#: ../urpm/download.pm:194
#, c-format
msgid "%s failed: exited with signal %d"
-msgstr ""
+msgstr "%s muvaffaqiyatsiz tugadi: xato kodi %d"
#: ../urpm/download.pm:195
#, c-format
msgid "%s failed: exited with %d"
-msgstr ""
+msgstr "%s muvaffaqiyatsiz tugadi: xato kodi %d"
#: ../urpm/download.pm:219
-#, fuzzy, c-format
+#, c-format
msgid "copy failed"
-msgstr "Nusxa ko'chirish muvaffaqiyatsiz tugadi"
+msgstr "nusxa ko'chirish muvaffaqiyatsiz tugadi"
#: ../urpm/download.pm:225
-#, fuzzy, c-format
+#, c-format
msgid "wget is missing\n"
-msgstr "%s yetishmaganiga ko'ra"
+msgstr "wget dasturi yetishmayapti\n"
#: ../urpm/download.pm:289
-#, fuzzy, c-format
+#, c-format
msgid "curl is missing\n"
-msgstr "%s yetishmaganiga ko'ra"
+msgstr "curl dasturi yetishmayapti\n"
#: ../urpm/download.pm:411
#, c-format
msgid "curl failed: download canceled\n"
-msgstr ""
+msgstr "curl muvaffaqiyatsiz tugadi: yozib olish bekor qilindi\n"
#: ../urpm/download.pm:450
#, c-format
msgid "rsync is missing\n"
-msgstr ""
+msgstr "rsync dasturi yetishmayapti\n"
#: ../urpm/download.pm:511
#, c-format
msgid "ssh is missing\n"
-msgstr ""
+msgstr "ssh dasturi yetishmayapti\n"
#: ../urpm/download.pm:530
#, c-format
msgid "prozilla is missing\n"
-msgstr ""
+msgstr "prozilla dasturi yetishmayapti\n"
#: ../urpm/download.pm:546
#, c-format
msgid "Couldn't execute prozilla\n"
-msgstr ""
+msgstr "prozilla dasturini ishga tushirib bo'lmadi\n"
#: ../urpm/download.pm:593
#, c-format
msgid " %s%% of %s completed, ETA = %s, speed = %s"
-msgstr ""
+msgstr " %s%% bajarildi, jami = %s, ETA = %s, tezlik = %s"
#: ../urpm/download.pm:595
#, c-format
msgid " %s%% completed, speed = %s"
-msgstr ""
+msgstr " %s%% bajarildi, tezlik = %s"
#: ../urpm/download.pm:651
-#, fuzzy, c-format
+#, c-format
msgid "retrieving %s"
-msgstr "%s o'chirilmoqda"
+msgstr "%s olinmoqda"
#: ../urpm/download.pm:655
-#, fuzzy, c-format
+#, c-format
msgid "retrieved %s"
-msgstr "...olish muvaffaqiyatsiz tudagi: %s"
+msgstr "%s olindi"
#: ../urpm/download.pm:668
#, c-format
@@ -525,7 +540,7 @@ msgstr "%s uchun noma'lum protokol aniqlangan"
#: ../urpm/download.pm:687
#, c-format
msgid "%s is not available, falling back on %s"
-msgstr ""
+msgstr "%s topilmadi, %s ishlatiladi"
#: ../urpm/download.pm:691
#, c-format
@@ -538,9 +553,9 @@ msgid "unable to handle protocol: %s"
msgstr "noma'lum protokol: %s"
#: ../urpm/get_pkgs.pm:41
-#, fuzzy, c-format
+#, c-format
msgid "cleaning %s and %s"
-msgstr "%s o'rnatilmoqda"
+msgstr "%s va %s tozalanmoqda"
#: ../urpm/get_pkgs.pm:56 ../urpm/get_pkgs.pm:79 ../urpm/get_pkgs.pm:110
#, c-format
@@ -548,19 +563,21 @@ msgid "there are multiple packages with the same rpm filename \"%s\""
msgstr "nomi (%s) bir hil bo'lgan bir nechta RPM-fayli mavjud"
#: ../urpm/get_pkgs.pm:93
-#, fuzzy, c-format
+#, c-format
msgid "unable to correctly parse [%s] on value \"%s\""
-msgstr "RPM-faylini (%s) manbadan (%s) o'qib bo'lmadi"
+msgstr ""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
-#, fuzzy, c-format
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
+#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
-msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
+msgstr ""
+"\"%s\" uchun ro'yxat fayliga murojaat qilib bo'lmadi, to'plam e'tiborga "
+"olinmaydi"
#: ../urpm/get_pkgs.pm:101
#, c-format
msgid "(retry as root?)"
-msgstr ""
+msgstr "(root sifatida qaytadan urinib ko'rishni istaysizmi?)"
#: ../urpm/get_pkgs.pm:126
#, c-format
@@ -568,11 +585,13 @@ msgid ""
"medium \"%s\" uses an invalid list file:\n"
" mirror is probably not up-to-date, trying to use alternate method"
msgstr ""
+"\"%s\" to'plami xato ro'yxat faylidan foydalanmoqda:\n"
+" ehtimol oynani yangilash kerak, boshqacha usulni sinab ko'raman"
#: ../urpm/get_pkgs.pm:130
#, c-format
msgid "medium \"%s\" does not define any location for rpm files"
-msgstr "manba (%s) RPM-fayllarning joyini aniqlamagan"
+msgstr "to'plam RPM-fayllarning joyini aniqlamagan: \"%s\""
#: ../urpm/get_pkgs.pm:142
#, c-format
@@ -582,12 +601,12 @@ msgstr "%s paketi topilmadi."
#: ../urpm/get_pkgs.pm:174
#, c-format
msgid "malformed URL: [%s]"
-msgstr ""
+msgstr "xato URL: [%s]"
#: ../urpm/get_pkgs.pm:180
#, c-format
msgid "retrieving rpm files from medium \"%s\"..."
-msgstr "RPM -fayllari manbadan (%s) olinmoqda..."
+msgstr "RPM-fayllari \"%s\" to'plamidan olinmoqda..."
#: ../urpm/install.pm:77
#, c-format
@@ -601,9 +620,9 @@ msgid ""
msgstr ""
#: ../urpm/install.pm:113
-#, fuzzy, c-format
+#, c-format
msgid "unable to create transaction"
-msgstr "Manbani yaratib bo'lmadi."
+msgstr ""
#: ../urpm/install.pm:121
#, c-format
@@ -616,9 +635,9 @@ msgid "unable to remove package %s"
msgstr "paketni (%s) olib tashlab bo'lmadi"
#: ../urpm/install.pm:135
-#, fuzzy, c-format
+#, c-format
msgid "unable to extract rpm from delta-rpm package %s"
-msgstr "paketni (%s) olib tashlab bo'lmadi"
+msgstr "delta-rpm paketidan RPM-faylini ajratib bo'lmadi: %s"
#: ../urpm/install.pm:141
#, c-format
@@ -631,9 +650,9 @@ msgid "unable to install package %s"
msgstr "%s paketini o'rnatib bo'lmadi"
#: ../urpm/install.pm:180
-#, fuzzy, c-format
+#, c-format
msgid "removing installed rpms (%s) from %s"
-msgstr "%s o'rnatilmoqda"
+msgstr ""
#: ../urpm/install.pm:186
#, c-format
@@ -656,361 +675,366 @@ msgid "No server defined, missing uri or host"
msgstr ""
#: ../urpm/ldap.pm:163
-#, fuzzy, c-format
+#, c-format
msgid "No base defined"
-msgstr "Buyruq ko'rsatilmagan."
+msgstr ""
#: ../urpm/ldap.pm:172 ../urpm/ldap.pm:175
#, c-format
-msgid "Cannot connect to ldap uri :"
+msgid "Cannot connect to ldap uri:"
msgstr ""
#: ../urpm/lock.pm:50
-#, fuzzy, c-format
+#, c-format
msgid "%s database locked"
-msgstr "urpmi ma'lumot bazasi qulflangan"
+msgstr "%s ma'lumot bazasi qulflangan"
#: ../urpm/md5sum.pm:23
-#, fuzzy, c-format
+#, c-format
msgid "examining %s file"
-msgstr "MD5SUM fayli tekshirilmoqda"
+msgstr "%s fayli tekshirilmoqda"
#: ../urpm/md5sum.pm:25
#, c-format
msgid "warning: md5sum for %s unavailable in MD5SUM file"
-msgstr ""
+msgstr "DIQQAT: MD5SUM faylida %s uchun md5sum haqida ma'lumot mavjud emas"
#: ../urpm/md5sum.pm:45
-#, fuzzy, c-format
+#, c-format
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
-msgstr "mavjud bo'lgan hdlist (yoki synthesis) fayli uchun md5sum hisoblanmoqda"
+msgstr "hdlist yoki synthesis fayli (%s) uchun md5sum hisoblanmoqda"
-#: ../urpm/media.pm:171
-#, fuzzy, c-format
+#: ../urpm/media.pm:172
+#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
-msgstr "manba (%s) tanlanmagan"
+msgstr ""
-#: ../urpm/media.pm:175
-#, fuzzy, c-format
+#: ../urpm/media.pm:176
+#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
-msgstr "manba (%s) tanlanmagan"
+msgstr ""
-#: ../urpm/media.pm:183
-#, fuzzy, c-format
+#: ../urpm/media.pm:184
+#, c-format
msgid "invalid hdlist name"
-msgstr "RPM-faylining nomi (%s) noto'g'ri"
+msgstr "hdlist fayli xato"
-#: ../urpm/media.pm:190
-#, fuzzy, c-format
+#: ../urpm/media.pm:191
+#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgstr "\"%s\" uchun ro'yxat fayli topilmadi, to'plam e'tiborga olinmaydi"
-#: ../urpm/media.pm:203
-#, fuzzy, c-format
+#: ../urpm/media.pm:204
+#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgstr ""
-#: ../urpm/media.pm:206
-#, fuzzy, c-format
+#: ../urpm/media.pm:207
+#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
-msgstr "manba (%s) uchun hdlist synthesis fayli yaratildi"
+msgstr ""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
-#, fuzzy, c-format
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
+#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
-msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
+msgstr ""
+"\"%s\" uchun hdlist fayliga murojaat qilib bo'lmadi, to'plam e'tiborga "
+"olinmaydi"
-#: ../urpm/media.pm:215
-#, fuzzy, c-format
+#: ../urpm/media.pm:216
+#, c-format
msgid "unable to access list file of \"%s\""
-msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
+msgstr "\"%s\" uchun ro'yxat fayliga murojaat qilib bo'lmadi"
-#: ../urpm/media.pm:229
-#, fuzzy, c-format
+#: ../urpm/media.pm:230
+#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
-msgstr "manba (%s) tanlanmagan"
+msgstr ""
-#: ../urpm/media.pm:230
-#, fuzzy, c-format
+#: ../urpm/media.pm:231
+#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
-msgstr "manba (%s) tanlanmagan"
+msgstr ""
-#: ../urpm/media.pm:255
-#, fuzzy, c-format
+#: ../urpm/media.pm:256
+#, c-format
msgid "trying to override existing medium \"%s\", skipping"
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgstr ""
-#: ../urpm/media.pm:398
-#, fuzzy, c-format
+#: ../urpm/media.pm:399
+#, c-format
msgid "too many mount points for removable medium \"%s\""
-msgstr "manbani (%s) yaratib bo'lmadi\n"
+msgstr ""
-#: ../urpm/media.pm:399
-#, fuzzy, c-format
+#: ../urpm/media.pm:400
+#, c-format
msgid "taking removable device as \"%s\""
-msgstr "Olinadigan uskunalar"
+msgstr ""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr ""
-#: ../urpm/media.pm:405
-#, fuzzy, c-format
+#: ../urpm/media.pm:406
+#, c-format
msgid "using different removable device [%s] for \"%s\""
-msgstr "Olinadigan uskunalar"
+msgstr ""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
-#, fuzzy, c-format
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
+#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
-msgstr "manbani (%s) yaratib bo'lmadi\n"
+msgstr ""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
-msgstr ""
+msgstr "yozildi: %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
-msgstr "moslama fayli (%s) yozilmoqda"
+msgstr "moslama fayli (%s) yozildi"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr ""
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr ""
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-"--synthesis'dan --media, --excludemedia, --sortmedia, --update or --parallel "
-"bilan birga foydalanib bo'lmaydi"
+"--synthesis'dan --media, --excludemedia, --sortmedia, --update, --use-"
+"distrib yoki --parallel bilan birga foydalanib bo'lmaydi"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
-#: ../urpm/media.pm:596
-#, fuzzy, c-format
+#: ../urpm/media.pm:597
+#, c-format
msgid "Search start: %s end: %s"
-msgstr "O'rnatilgan shriftlarni qidirish"
+msgstr "Qidirish boshi: %s oxiri: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "bog'liklarni aniqlash uchun ikkinchi bosqich bajarilmoqda\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "%s paketi tashlab o'tilmoqda"
-#: ../urpm/media.pm:637
-#, fuzzy, c-format
+#: ../urpm/media.pm:638
+#, c-format
msgid "would install instead of upgrade package %s"
-msgstr "Quyidagi paketlarni o'rnatish kerak: %s"
+msgstr ""
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
-msgstr "manba (%s) allaqachon mavjud"
+msgstr "to'plam allaqachon mavjud: \"%s\""
-#: ../urpm/media.pm:677
-#, fuzzy, c-format
+#: ../urpm/media.pm:678
+#, c-format
msgid "virtual medium needs to be local"
-msgstr "manba (%s) tanlanmagan"
+msgstr ""
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
-msgstr ""
+msgstr "(andoza bo'yicha e'tiborga olinmadi)"
-#: ../urpm/media.pm:697
-#, fuzzy, c-format
+#: ../urpm/media.pm:698
+#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
-msgstr "manbadan (%s) sarlavhalar o'qilmoqda"
+msgstr ""
-#: ../urpm/media.pm:703
-#, fuzzy, c-format
+#: ../urpm/media.pm:704
+#, c-format
msgid "adding medium \"%s\""
-msgstr "manba (%s) o'chirilmoqda"
+msgstr "to'plam qo'shilmoqda: %s"
-#: ../urpm/media.pm:729
-#, fuzzy, c-format
+#: ../urpm/media.pm:730
+#, c-format
msgid "unable to mount the distribution medium"
-msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
+msgstr ""
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
-#, fuzzy, c-format
+#: ../urpm/media.pm:740
+#, c-format
msgid "retrieving media.cfg file..."
-msgstr "hdlists fayli olinmoqda..."
+msgstr "media.cfg fayli yozib olinmoqda..."
-#: ../urpm/media.pm:744
-#, fuzzy, c-format
+#: ../urpm/media.pm:745
+#, c-format
msgid "unable to parse media.cfg"
-msgstr "rpmdb'ni ochib bo'lmadi"
+msgstr ""
-#: ../urpm/media.pm:747
-#, fuzzy, c-format
+#: ../urpm/media.pm:748
+#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
-msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
+msgstr ""
-#: ../urpm/media.pm:826
-#, fuzzy, c-format
+#: ../urpm/media.pm:827
+#, c-format
msgid "trying to select nonexistent medium \"%s\""
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgstr ""
-#: ../urpm/media.pm:829
-#, fuzzy, c-format
+#: ../urpm/media.pm:830
+#, c-format
msgid "selecting multiple media: %s"
-msgstr "manba (%s) o'chirilmoqda"
+msgstr ""
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
-msgstr "manba (%s) o'chirilmoqda"
+msgstr "to'plam olib tashlanmoqda: \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
-msgstr "manba (%s) uchun urpmi qaytadan moslanmoqda..."
+msgstr "to'plam uchun urpmi qaytadan moslanmoqda: \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...qaytadan moslash muvaffaqiyatsiz tugadi"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "...qaytadan moslash tugadi"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
-#, fuzzy, c-format
+#: ../urpm/media.pm:1073
+#, c-format
msgid "medium \"%s\" is up-to-date"
-msgstr "manba (%s) tanlanmagan"
+msgstr "to'plamni yangilash hojati yo'q: \"%s\""
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "hdlist fayli (%s) tekshirilmoqda"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "synthesis fayli (%s) tekshirilmoqda"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "[%s] hdlist fayli yaratilmoqda"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr ""
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
-msgstr "manbaning (%s) hdlist yoki synthesis faylini o'qishda muammo yuzaga keldi"
+msgstr ""
+"to'plamining hdlist yoki synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...nusxa ko'chirish muvaffaqiyatsiz tugadi"
-#: ../urpm/media.pm:1203
-#, fuzzy, c-format
+#: ../urpm/media.pm:1204
+#, c-format
msgid "copying description file of \"%s\"..."
-msgstr "hdlists faylidan nusxa ko'chirilmoqda..."
+msgstr ""
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...nusxa ko'chirish bajarildi"
-#: ../urpm/media.pm:1232
-#, fuzzy, c-format
+#: ../urpm/media.pm:1233
+#, c-format
msgid "copying [%s] for medium \"%s\"..."
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgstr ""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
-"'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda kichik)"
+"'%s' faylidan nusxa ko'chirish muvaffaqiyatsiz tugadi (uning hajmi juda "
+"kichik)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr ""
-"manbaning olingan hdlist (yoki synthesis) faylining md5sum'i hisoblanmoqda"
+"to'plamning olingan hdlist (yoki synthesis) faylining md5sum'i hisoblanmoqda"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "%s'dan nusxa ko'chirish muvaffaqiyatsiz tugadi (md5sum noto'g'ri)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
-msgstr "olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
+msgstr ""
+"olingan hdlist (yoki synthesis) fayli uchun md5sum soni hisoblanmoqda..."
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
-msgstr "...olish muvaffaqiyatsiz tudagi: md5sum mos kelmadi"
+msgstr "...olish muvaffaqiyatsiz tugadi: md5sum mos kelmadi"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "%s'dan RPM-fayllar topilmadi"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "RPM-fayllari %s'dan o'qilmoqda"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "[%s]: %s'dan RPM-fayllarni o'qib bo'lmadi"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr ""
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1018,101 +1042,101 @@ msgid ""
"medium."
msgstr ""
-#: ../urpm/media.pm:1377
-#, fuzzy, c-format
+#: ../urpm/media.pm:1378
+#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
-msgstr "manbada (%s) hech qanday hdlist fayli topilmadi"
+msgstr "to'plamning hdlist fayli %s xato: %s"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "'%s' uchun hdlist (yoki synthesis) fayli yozib olinmoqda..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "qidirilgan hdlist (yoki synthesis) fayli topildi: %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
-msgstr "manbada (%s) hech qanday hdlist fayli topilmadi"
+msgstr "to'plam uchun hech qanday hdlist fayli topilmadi: \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "'%s' uchun pubkey fayli tekshirilmoqda..."
-#: ../urpm/media.pm:1544
-#, fuzzy, c-format
+#: ../urpm/media.pm:1545
+#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
-msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
+msgstr ""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
-msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+msgstr "to'plam uchun ro'yxat fayli yozilmoqda: \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
-#, fuzzy, c-format
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
+#, c-format
msgid "updated medium \"%s\""
-msgstr "%s manbasi qo'shildi"
+msgstr "to'plam yangilandi: \"%s\""
-#: ../urpm/media.pm:1638
-#, fuzzy, c-format
+#: ../urpm/media.pm:1639
+#, c-format
msgid "unable to parse hdlist file of \"%s\""
-msgstr "'%s' uchun pubkey faylini import qilib bo'lmadi"
+msgstr ""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
-msgstr "Manbaning (%s) synthesis faylini o'qishda muammo yuzaga keldi"
+msgstr "to'plamining synthesis faylini o'qishda muammo ro'y berdi: \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
-msgstr "manbadan (%s) sarlavhalar o'qilmoqda"
+msgstr "to'plamidan xederlar o'qilmoqda: \"%s\""
-#: ../urpm/msg.pm:61 ../urpmi:489 ../urpmi:508 ../urpmi:597
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "JjJjNn"
-#: ../urpm/msg.pm:62 ../urpme:36 ../urpmi:490 ../urpmi:509 ../urpmi:549
-#: ../urpmi:598 ../urpmi:675 ../urpmi:762 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "HhHhYy"
-#: ../urpm/msg.pm:113
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Uzr, noto'g'ri tanlov. Boshqasini tanlang\n"
#: ../urpm/parallel.pm:14
-#, fuzzy, c-format
+#, c-format
msgid "unable to parse \"%s\" in file [%s]"
-msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
+msgstr ""
#: ../urpm/parallel.pm:23
-#, fuzzy, c-format
+#, c-format
msgid "examining parallel handler in file [%s]"
-msgstr "hdlist fayli (%s) tekshirilmoqda"
+msgstr ""
#: ../urpm/parallel.pm:34
-#, fuzzy, c-format
+#, c-format
msgid "found parallel handler for nodes: %s"
-msgstr "qidirilgan hdlist (yoki synthesis) fayli topildi: %s"
+msgstr ""
#: ../urpm/parallel.pm:38
-#, fuzzy, c-format
+#, c-format
msgid "unable to use parallel option \"%s\""
-msgstr "manbani (%s) yangilab bo'lmadi\n"
+msgstr ""
#: ../urpm/removable.pm:32
#, c-format
@@ -1126,13 +1150,13 @@ msgstr "%s uzilmoqda"
#: ../urpm/removable.pm:112 ../urpm/removable.pm:117 ../urpm/removable.pm:147
#, c-format
-msgid "medium \"%s\" is not selected"
-msgstr "manba (%s) tanlanmagan"
+msgid "medium \"%s\" is not available"
+msgstr ""
#: ../urpm/removable.pm:143
#, c-format
msgid "unable to read rpm file [%s] from medium \"%s\""
-msgstr "RPM-faylini (%s) manbadan (%s) o'qib bo'lmadi"
+msgstr "RPM-faylini (%s) \"%s\" to'plamidan o'qib bo'lmadi"
#: ../urpm/removable.pm:151
#, c-format
@@ -1140,54 +1164,54 @@ msgid "inconsistent medium \"%s\" marked removable but not really"
msgstr ""
#: ../urpm/removable.pm:163
-#, fuzzy, c-format
+#, c-format
msgid "unable to access medium \"%s\""
-msgstr "manbani (%s) yangilab bo'lmadi\n"
+msgstr "to'plamga murojaat qilib bo'lmadi: \"%s\""
-#: ../urpm/select.pm:115
-#, fuzzy, c-format
+#: ../urpm/select.pm:113
+#, c-format
msgid "No package named %s"
msgstr "%s nomli paket mavjud emas"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Quyidagi paketlarda %s bor: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "%s yetishmaganiga ko'ra"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
-#, fuzzy, c-format
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
+#, c-format
msgid "due to unsatisfied %s"
-msgstr "%s yetishmaganiga ko'ra"
+msgstr ""
-#: ../urpm/select.pm:405
-#, fuzzy, c-format
+#: ../urpm/select.pm:401
+#, c-format
msgid "trying to promote %s"
-msgstr "O'chirish uchun hech narsa yo'q"
+msgstr ""
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "%s'ni qoldirish uchun"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "%s'ni o'rnatish uchun"
-#: ../urpm/select.pm:442
-#, fuzzy, c-format
+#: ../urpm/select.pm:438
+#, c-format
msgid "due to conflicts with %s"
-msgstr "%s yetishmaganiga ko'ra"
+msgstr ""
-#: ../urpm/select.pm:444
-#, fuzzy, c-format
+#: ../urpm/select.pm:440
+#, c-format
msgid "unrequested"
-msgstr "Talab qilinganda ishga tushirish"
+msgstr ""
#: ../urpm/signature.pm:26
#, c-format
@@ -1195,9 +1219,9 @@ msgid "Invalid signature (%s)"
msgstr "Imzo haqiqiy emas (%s)"
#: ../urpm/signature.pm:57
-#, fuzzy, c-format
+#, c-format
msgid "Invalid Key ID (%s)"
-msgstr "Imzo haqiqiy emas (%s)"
+msgstr ""
#: ../urpm/signature.pm:59
#, c-format
@@ -1227,14 +1251,16 @@ msgid " --help - print this help message.\n"
msgstr " --help - shu yordam xabarini ko'rsatish.\n"
#: ../urpme:45
-#, fuzzy, c-format
+#, c-format
msgid " --auto - automatically select a package in choices.\n"
-msgstr " --auto-select - tizimni yangilash uchun paketlarni avto-tanlash.\n"
+msgstr ""
#: ../urpme:46
-#, fuzzy, c-format
+#, c-format
msgid " --test - verify if the removal can be achieved correctly.\n"
-msgstr " --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
+msgstr ""
+" --test - olib tashlashni to'g'ri bajarish imkoniyatini "
+"tekshirish.\n"
#: ../urpme:47 ../urpmi:109 ../urpmq:67
#, c-format
@@ -1248,27 +1274,25 @@ msgid " --parallel - distributed urpmi across machines of alias.\n"
msgstr ""
#: ../urpme:49 ../urpmi:146
-#, fuzzy, c-format
+#, c-format
msgid " --repackage - Re-package the files before erasing\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr ""
#: ../urpme:50
-#, fuzzy, c-format
+#, c-format
msgid " --root - use another root for rpm removal.\n"
msgstr ""
-" --wget - masofadagi fayllarni olish uchun wget dasturini ishlatish.\n"
#: ../urpme:51 ../urpmf:40 ../urpmi:116 ../urpmi.addmedia:60
#: ../urpmi.recover:36 ../urpmi.removemedia:46 ../urpmi.update:46 ../urpmq:71
-#, fuzzy, c-format
+#, c-format
msgid " --urpmi-root - use another root for urpmi db & rpm installation.\n"
msgstr ""
-" --wget - masofadagi fayllarni olish uchun wget dasturini ishlatish.\n"
#: ../urpme:52
-#, fuzzy, c-format
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s).\n"
-msgstr " --description - description tegini ko'rsatish: ta'rifi.\n"
+msgstr ""
#: ../urpme:53
#, c-format
@@ -1278,33 +1302,29 @@ msgid ""
msgstr ""
#: ../urpme:55 ../urpmi:119 ../urpmq:74
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr ""
-" --probe-synthesis - synthesis faylini topishga va undan foydalanishga urinib "
-"ko'rish.\n"
+msgstr " --probe-synthesis - synthesis faylidan foydalanish.\n"
#: ../urpme:56 ../urpmi:120 ../urpmq:75
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr ""
-" --probe-hdlist - hdlist faylini topishga va undan foydalanishga urinib "
-"ko'rish.\n"
+msgstr " --probe-hdlist - hdlist faylidan foydalanish.\n"
#: ../urpme:57 ../urpmi:156 ../urpmq:86
-#, fuzzy, c-format
+#, c-format
msgid " --verbose, -v - verbose mode.\n"
-msgstr " --verbose - ortiqcha xabarlar bilan.\n"
+msgstr " --verbose, -v - ortiqcha xabarlar bilan.\n"
#: ../urpme:58
-#, fuzzy, c-format
+#, c-format
msgid " -a - select all packages matching expression.\n"
-msgstr " -a - hamma manbalarni tanlash.\n"
+msgstr ""
#: ../urpme:75
-#, fuzzy, c-format
+#, c-format
msgid "Only superuser is allowed to remove packages"
-msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
+msgstr "Paketlarni faqat root olib tashlashi mumkin"
#: ../urpme:106
#, c-format
@@ -1331,30 +1351,37 @@ msgstr "O'chirish uchun hech narsa yo'q"
msgid "Checking to remove the following packages"
msgstr "Quyidagi paketlarni olib tashlash uchun tekshirish bajarilmoqda"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
-"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi (%d Mb)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
+"Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket olib tashlanadi"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid "Remove %d packages?"
-msgstr "%d-ta paketni olib tashlashni istaysizmi?"
+msgid " (%d MB)"
+msgstr " (%d Mb)"
-#: ../urpme:134 ../urpmi:550 ../urpmi:676 ../urpmi.addmedia:137
+#: ../urpme:137
+#, c-format
+msgid "Remove %d package?"
+msgid_plural "Remove %d packages?"
+msgstr[0] "%d-ta paketni olib tashlashni istaysizmi?"
+
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (h/Y) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "O'chirish muvaffaqiyatsiz tugadi"
#: ../urpmf:29
-#, fuzzy, c-format
+#, c-format
msgid ""
"urpmf version %s\n"
"Copyright (C) 2002-2006 Mandriva.\n"
@@ -1367,12 +1394,12 @@ msgstr ""
"Copyright (C) 2002-2006 Mandriva.\n"
"Bu erkin dastur va GNU GPL shartlari asosida tarqatilishi mumkin.\n"
"\n"
-"Foydalanish:\n"
+"Foydalanish: urpmf [parametrlar] qidirish uchun ifoda\n"
#: ../urpmf:36
-#, fuzzy, c-format
+#, c-format
msgid " --version - print this tool's version number.\n"
-msgstr " --help - shu yordam xabarini ko'rsatish.\n"
+msgstr ""
#: ../urpmf:37 ../urpmi:137 ../urpmq:83
#, c-format
@@ -1383,7 +1410,7 @@ msgstr ""
#, c-format
msgid " --excludemedia - do not use the given media, separated by comma.\n"
msgstr ""
-" --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
+" --excludemedia - ko'rsatilgan, vergul bilan ajratilgan, to'plamlardan "
"foydalanilmasin.\n"
#: ../urpmf:39
@@ -1396,21 +1423,19 @@ msgstr ""
#, c-format
msgid " --media - use only the given media, separated by comma.\n"
msgstr ""
-" --media - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
-"foydalanish.\n"
+" --media - faqat ko'rsatilgan, vergul bilan ajratilgan, "
+"to'plamlardan foydalanish.\n"
#: ../urpmf:42 ../urpmi:89 ../urpmq:53
-#, fuzzy, c-format
+#, c-format
msgid ""
" --sortmedia - sort media according to substrings separated by comma.\n"
msgstr ""
-" --media - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
-"foydalanish.\n"
#: ../urpmf:43 ../urpmi:90 ../urpmq:54
#, c-format
msgid " --synthesis - use the given synthesis instead of urpmi db.\n"
-msgstr " --synthesis - urpmi MB o'rniga synthesis faylidan foydalanish.\n"
+msgstr " --synthesis - ko'rsatilgan synthesis faylidan foydalanish.\n"
#: ../urpmf:44
#, c-format
@@ -1420,7 +1445,7 @@ msgstr " --uniq - bir xil qatorlar ko'rsatilmasin.\n"
#: ../urpmf:45 ../urpmi:87 ../urpmq:49
#, c-format
msgid " --update - use only update media.\n"
-msgstr " --update - faqat yangilash manbasidan foydalanish.\n"
+msgstr " --update - faqat yangilash to'plamidan foydalanish.\n"
#: ../urpmf:46
#, c-format
@@ -1428,14 +1453,14 @@ msgid " --verbose - verbose mode.\n"
msgstr " --verbose - ortiqcha xabarlar bilan.\n"
#: ../urpmf:47
-#, fuzzy, c-format
+#, c-format
msgid " -i - ignore case distinctions in patterns.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
#: ../urpmf:48
-#, fuzzy, c-format
+#, c-format
msgid " -I - honor case distinctions in patterns (default).\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
#: ../urpmf:49
#, c-format
@@ -1453,56 +1478,54 @@ msgid " text - any text is parsed as a regexp, unless -l is used.\n"
msgstr ""
#: ../urpmf:52
-#, fuzzy, c-format
+#, c-format
msgid " -e - include perl code directly as perl -e.\n"
-msgstr " -c - sarlavhalarning kesh direktoriyasini tozalash.\n"
+msgstr ""
#: ../urpmf:53
-#, fuzzy, c-format
+#, c-format
msgid " -a - binary AND operator.\n"
-msgstr " -q - xabarsiz.\n"
+msgstr ""
#: ../urpmf:54
-#, fuzzy, c-format
+#, c-format
msgid " -o - binary OR operator.\n"
-msgstr " -q - xabarsiz.\n"
+msgstr ""
#: ../urpmf:55
-#, fuzzy, c-format
+#, c-format
msgid " ! - unary NOT.\n"
-msgstr " -q - xabarsiz.\n"
+msgstr ""
#: ../urpmf:56
-#, fuzzy, c-format
+#, c-format
msgid " ( ) - left and right parentheses.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
#: ../urpmf:57
-#, fuzzy, c-format
+#, c-format
msgid "List of tags:\n"
-msgstr ""
-"Tiklash uchun ma'lumotlar ro'yxati:\n"
-"\n"
+msgstr "Teglar ro'yxati:\n"
#: ../urpmf:58
-#, fuzzy, c-format
+#, c-format
msgid " --qf - specify a printf-like output format\n"
-msgstr " --X - X interfeysidan foydalanish.\n"
+msgstr ""
#: ../urpmf:59
-#, fuzzy, c-format
+#, c-format
msgid " example: '%%name:%%files'\n"
-msgstr " %s - andoza.\n"
+msgstr " masalan: '%%name:%%files'\n"
#: ../urpmf:60
-#, fuzzy, c-format
+#, c-format
msgid " --arch - architecture\n"
-msgstr " --url - url tegini ko'rsatish: url.\n"
+msgstr ""
#: ../urpmf:61
-#, fuzzy, c-format
+#, c-format
msgid " --buildhost - build host\n"
-msgstr " --files - files tegini ko'rsatish: hamma fayllar.\n"
+msgstr ""
#: ../urpmf:62
#, c-format
@@ -1510,19 +1533,19 @@ msgid " --buildtime - build time\n"
msgstr ""
#: ../urpmf:63
-#, fuzzy, c-format
+#, c-format
msgid " --conffiles - configuration files\n"
-msgstr "Konsolni moslash moduli"
+msgstr ""
#: ../urpmf:64
-#, fuzzy, c-format
+#, c-format
msgid " --conflicts - conflict tags\n"
-msgstr " --files - files tegini ko'rsatish: hamma fayllar.\n"
+msgstr ""
#: ../urpmf:65
-#, fuzzy, c-format
+#, c-format
msgid " --description - package description\n"
-msgstr " --description - description tegini ko'rsatish: ta'rifi.\n"
+msgstr " --description - paket ta'rifi\n"
#: ../urpmf:66
#, c-format
@@ -1530,103 +1553,103 @@ msgid " --distribution - distribution\n"
msgstr ""
#: ../urpmf:67
-#, fuzzy, c-format
+#, c-format
msgid " --epoch - epoch\n"
-msgstr " --size - size tegini ko'rsatish: hajmi.\n"
+msgstr ""
#: ../urpmf:68
-#, fuzzy, c-format
+#, c-format
msgid " --filename - filename of the package\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr ""
#: ../urpmf:69
-#, fuzzy, c-format
+#, c-format
msgid " --files - list of files contained in the package\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr " --files - paketdagi fayllar ro'yxatini ko'rsatish\n"
#: ../urpmf:70
-#, fuzzy, c-format
+#, c-format
msgid " --group - group\n"
-msgstr " --group - group tegini ko'rsatish: guruh.\n"
+msgstr " --group - guruh\n"
#: ../urpmf:71
-#, fuzzy, c-format
+#, c-format
msgid " --name - package name\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr " --name - paketning nomi\n"
#: ../urpmf:72
-#, fuzzy, c-format
+#, c-format
msgid " --obsoletes - obsoletes tags\n"
-msgstr " --files - files tegini ko'rsatish: hamma fayllar.\n"
+msgstr ""
#: ../urpmf:73
-#, fuzzy, c-format
+#, c-format
msgid " --packager - packager\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr ""
#: ../urpmf:74
-#, fuzzy, c-format
+#, c-format
msgid " --provides - provides tags\n"
-msgstr " --files - files tegini ko'rsatish: hamma fayllar.\n"
+msgstr ""
#: ../urpmf:75
-#, fuzzy, c-format
+#, c-format
msgid " --requires - requires tags\n"
-msgstr " --files - files tegini ko'rsatish: hamma fayllar.\n"
+msgstr ""
#: ../urpmf:76
-#, fuzzy, c-format
+#, c-format
msgid " --size - installed size\n"
-msgstr " --size - size tegini ko'rsatish: hajmi.\n"
+msgstr ""
#: ../urpmf:77
-#, fuzzy, c-format
+#, c-format
msgid " --sourcerpm - source rpm name\n"
-msgstr " --group - group tegini ko'rsatish: guruh.\n"
+msgstr ""
#: ../urpmf:78
-#, fuzzy, c-format
+#, c-format
msgid " --summary - summary\n"
-msgstr " --summary - summary tegini ko'rsatish: hisobot.\n"
+msgstr ""
#: ../urpmf:79
-#, fuzzy, c-format
+#, c-format
msgid " --url - url\n"
-msgstr " --url - url tegini ko'rsatish: url.\n"
+msgstr ""
#: ../urpmf:80
-#, fuzzy, c-format
+#, c-format
msgid " --vendor - vendor\n"
-msgstr " --verbose - ortiqcha xabarlar bilan.\n"
+msgstr ""
#: ../urpmf:81
-#, fuzzy, c-format
+#, c-format
msgid " -m - the media in which the package was found\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr " -m - paket qaysi to'plamda topilganini ko'rsatish\n"
-#: ../urpmf:82 ../urpmq:90
-#, fuzzy, c-format
+#: ../urpmf:82 ../urpmq:95
+#, c-format
msgid " -f - print version, release and arch with name.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
#: ../urpmf:137
#, c-format
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:135
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr ""
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
"result\n"
msgstr ""
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -1648,12 +1671,10 @@ msgstr ""
"Foydalanish:\n"
#: ../urpmi:88
-#, fuzzy, c-format
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested packages.\n"
msgstr ""
-" --media - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
-"foydalanish.\n"
#: ../urpmi:91
#, c-format
@@ -1669,9 +1690,9 @@ msgid ""
msgstr " --auto-select - tizimni yangilash uchun paketlarni avto-tanlash.\n"
#: ../urpmi:93
-#, fuzzy, c-format
+#, c-format
msgid " --auto-update - update media then upgrade the system.\n"
-msgstr " --auto-select - tizimni yangilash uchun paketlarni avto-tanlash.\n"
+msgstr ""
#: ../urpmi:94
#, c-format
@@ -1691,9 +1712,9 @@ msgid ""
msgstr ""
#: ../urpmi:97
-#, fuzzy, c-format
+#, c-format
msgid " --no-install - don't install packages (only download)\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr ""
#: ../urpmi:98 ../urpmq:57
#, c-format
@@ -1716,29 +1737,29 @@ msgid " --split-length - small transaction length, default is %d.\n"
msgstr ""
#: ../urpmi:104
-#, fuzzy, c-format
+#, c-format
msgid " --fuzzy, -y - impose fuzzy search.\n"
-msgstr " -a - hamma manbalarni tanlash.\n"
+msgstr ""
#: ../urpmi:105
-#, fuzzy, c-format
+#, c-format
msgid " --src, -s - next package is a source package.\n"
-msgstr " --list - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
+msgstr ""
#: ../urpmi:106
-#, fuzzy, c-format
+#, c-format
msgid " --install-src - install only source package (no binaries).\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr ""
#: ../urpmi:107
-#, fuzzy, c-format
+#, c-format
msgid " --clean - remove rpm from cache before anything else.\n"
-msgstr " --noclean - ishlatilmagan RPM'ni keshda saqlash.\n"
+msgstr " --clean - avvalo paketlarni keshdan olib tashlash.\n"
#: ../urpmi:108
-#, fuzzy, c-format
+#, c-format
msgid " --noclean - don't clean rpms from cache.\n"
-msgstr " --noclean - ishlatilmagan RPM'ni keshda saqlash.\n"
+msgstr " --noclean - paketlar keshdan olib tashlanmasin.\n"
#: ../urpmi:110
#, c-format
@@ -1755,10 +1776,9 @@ msgid ""
msgstr ""
#: ../urpmi:115 ../urpmq:70
-#, fuzzy, c-format
+#, c-format
msgid " --root - use another root for rpm installation.\n"
msgstr ""
-" --wget - masofadagi fayllarni olish uchun wget dasturini ishlatish.\n"
#: ../urpmi:117
#, c-format
@@ -1771,13 +1791,15 @@ msgstr ""
#, c-format
msgid " --wget - use wget to retrieve distant files.\n"
msgstr ""
-" --wget - masofadagi fayllarni olish uchun wget dasturini ishlatish.\n"
+" --wget - masofadagi fayllarni olish uchun wget dasturini "
+"ishlatish.\n"
#: ../urpmi:122 ../urpmi.addmedia:47 ../urpmi.update:34 ../urpmq:77
#, c-format
msgid " --curl - use curl to retrieve distant files.\n"
msgstr ""
-" --curl - masofadagi fayllarni olish uchun curl dasturini ishlatish.\n"
+" --curl - masofadagi fayllarni olish uchun curl dasturini "
+"ishlatish.\n"
#: ../urpmi:123 ../urpmi.addmedia:48 ../urpmi.update:35 ../urpmq:78
#, c-format
@@ -1845,13 +1867,18 @@ msgid ""
" --verify-rpm - verify rpm signature before installation\n"
" (--no-verify-rpm disables it, default is enabled).\n"
msgstr ""
+" --verify-rpm - o'rnatishdan avval paketning elektron imzosini "
+"tekshirish\n"
+" (--no-verify-rpm ushbu amalning teskarisi, andoza "
+"bo'yicha paketning elektron imzosi tekshiriladi).\n"
#: ../urpmi:140
-#, fuzzy, c-format
+#, c-format
msgid ""
" --test - only verify if the installation can be achieved "
"correctly.\n"
-msgstr " --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
+msgstr ""
+" --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
#: ../urpmi:141
#, c-format
@@ -1869,21 +1896,23 @@ msgstr " --excludedocs - qo'llanma fayllarsiz.\n"
#, c-format
msgid " --ignoresize - don't verify disk space before installation.\n"
msgstr ""
+" --ignoresize - o'rnatishdan avval diskda yetarli bo'sh joy borligi "
+"tekshirilmasin.\n"
#: ../urpmi:144
-#, fuzzy, c-format
+#, c-format
msgid " --ignorearch - allow to install rpms for unmatched architectures.\n"
-msgstr " --url - url tegini ko'rsatish: url.\n"
+msgstr ""
#: ../urpmi:145
-#, fuzzy, c-format
+#, c-format
msgid " --noscripts - do not execute package scriptlet(s)\n"
-msgstr " --description - description tegini ko'rsatish: ta'rifi.\n"
+msgstr ""
#: ../urpmi:147
-#, fuzzy, c-format
+#, c-format
msgid " --skip - packages which installation should be skipped\n"
-msgstr " --test - o'rnatishni to'g'ri bajarish imkoniyatini tekshirish.\n"
+msgstr ""
#: ../urpmi:148
#, c-format
@@ -1893,34 +1922,34 @@ msgid ""
msgstr ""
#: ../urpmi:150
-#, fuzzy, c-format
+#, c-format
msgid " --nolock - don't lock rpm db.\n"
-msgstr " --noclean - ishlatilmagan RPM'ni keshda saqlash.\n"
+msgstr ""
#: ../urpmi:151
#, c-format
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
-#: ../urpmi:152 ../urpmq:87
-#, fuzzy, c-format
+#: ../urpmi:152 ../urpmq:92
+#, c-format
msgid " -a - select all matches on command line.\n"
-msgstr " -a - hamma manbalarni tanlash.\n"
+msgstr ""
#: ../urpmi:153
-#, fuzzy, c-format
+#, c-format
msgid " -p - allow search in provides to find package.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
#: ../urpmi:154
-#, fuzzy, c-format
+#, c-format
msgid " -P - do not search in provides to find package.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
#: ../urpmi:155
-#, fuzzy, c-format
+#, c-format
msgid " --quiet, -q - quiet mode.\n"
-msgstr " -q - xabarsiz.\n"
+msgstr ""
#: ../urpmi:157
#, c-format
@@ -1945,18 +1974,16 @@ msgid "You can't install binary rpm files when using --install-src"
msgstr ""
#: ../urpmi:243
-#, fuzzy, c-format
+#, c-format
msgid ""
"Directory [%s] already exists, please use another directory for bug report "
"or delete it"
-msgstr "Guruh allaqachon mavjud, iltimos boshqa guruh nomini tanlang"
+msgstr ""
#: ../urpmi:244
-#, fuzzy, c-format
+#, c-format
msgid "Unable to create directory [%s] for bug report"
msgstr ""
-"Jildni (%s) tekshirish muvaffaqiyatsiz tugadi\n"
-"Xato: %s"
#: ../urpmi:253
#, c-format
@@ -1970,52 +1997,61 @@ msgid ""
"Use --allow-force to force operation."
msgstr ""
-#: ../urpmi:364
+#: ../urpmi:362
#, c-format
msgid "Updating media...\n"
-msgstr ""
+msgstr "To'plam yangilanmoqda...\n"
-#: ../urpmi:439
+#: ../urpmi:437
#, c-format
msgid "%s: %s (to upgrade)"
msgstr "%s: %s (yangilash)"
#. -PO: here format is "<package_name> (to upgrade)"
-#: ../urpmi:441
+#: ../urpmi:439
#, c-format
msgid "%s (to upgrade)"
msgstr "%s (yangilash)"
-#: ../urpmi:443
+#: ../urpmi:441
#, c-format
msgid "%s: %s (to install)"
msgstr "%s: %s (o'rnatish)"
#. -PO: here format is "<package_name> (to install)"
-#: ../urpmi:445
+#: ../urpmi:443
#, c-format
msgid "%s (to install)"
msgstr "%s (o'rnatish)"
-#: ../urpmi:452
+#: ../urpmi:450
#, c-format
msgid "What is your choice? (1-%d) "
msgstr "Nimani tanlaysiz? (1-%d) "
-#: ../urpmi:482
+#: ../urpmi:481
#, c-format
msgid ""
"The following package cannot be installed because it depends on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgid_plural ""
+msgstr ""
+"Quyidagi paketni o'rnatib bo'lmaydi, chunki u o'rnatilgan\n"
+"paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
+"%s"
+
+#: ../urpmi:483
+#, c-format
+msgid ""
"The following packages can't be installed because they depend on packages\n"
"that are older than the installed ones:\n"
"%s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+"Quyidagi paketlarni o'rnatib bo'lmaydi, chunki ular o'rnatilgan\n"
+"paketlardan ko'ra eskiroq paketlarga bog'liq:\n"
+"%s"
-#: ../urpmi:492 ../urpmi:511
+#: ../urpmi:491 ../urpmi:511
#, c-format
msgid ""
"\n"
@@ -2024,66 +2060,75 @@ msgstr ""
"\n"
"Bunga qaramasdan davom etishni istaysizmi?"
-#: ../urpmi:492 ../urpmi:511 ../urpmi:599 ../urpmi.addmedia:137
+#: ../urpmi:491 ../urpmi:511 ../urpmi:604 ../urpmi.addmedia:137
#, c-format
msgid " (Y/n) "
msgstr " (H/y) "
#: ../urpmi:503
-#, fuzzy, c-format
+#, c-format
msgid ""
"A requested package cannot be installed:\n"
"%s"
-msgid_plural ""
-"Some requested packages cannot be installed:\n"
+msgstr ""
+"Talab qilingan paketni o'rnatib bo'lmaydi:\n"
"%s"
-msgstr[0] ""
-"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
+
+#: ../urpmi:504
+#, c-format
+msgid ""
+"Some requested packages cannot be installed:\n"
"%s"
-msgstr[1] ""
+msgstr ""
"Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
"%s"
-#: ../urpmi:534
-#, fuzzy, c-format
+#: ../urpmi:535
+#, c-format
msgid ""
"The installation cannot continue because the following package\n"
"has to be removed for others to be upgraded:\n"
"%s\n"
-msgid_plural ""
+msgstr ""
+"O'rnatishni davom etib bo'lmaydi, chunki boshqa paketlarni yangilash\n"
+"uchun quyidagi paketni olib tashlash kerak:\n"
+"%s\n"
+
+#: ../urpmi:537
+#, c-format
+msgid ""
"The installation cannot continue because the following packages\n"
"have to be removed for others to be upgraded:\n"
"%s\n"
-msgstr[0] ""
-"O'rnatishni davom etib bo'lmaydi, chunki boshqalarni yangilash\n"
-"uchun quyidagi paketlarni olib tashlash kerak:\n"
-"%s\n"
-msgstr[1] ""
-"O'rnatishni davom etib bo'lmaydi, chunki boshqalarni yangilash\n"
+msgstr ""
+"O'rnatishni davom etib bo'lmaydi, chunki boshqa paketlarni yangilash\n"
"uchun quyidagi paketlarni olib tashlash kerak:\n"
"%s\n"
-#: ../urpmi:541
-#, fuzzy, c-format
+#: ../urpmi:544
+#, c-format
msgid ""
"The following package has to be removed for others to be upgraded:\n"
"%s"
-msgid_plural ""
-"The following packages have to be removed for others to be upgraded:\n"
+msgstr ""
+"Boshqa paketlarni yangilash uchun quyidagi paketni olib tashlash kerak:\n"
"%s"
-msgstr[0] ""
-"Boshqalarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
+
+#: ../urpmi:545
+#, c-format
+msgid ""
+"The following packages have to be removed for others to be upgraded:\n"
"%s"
-msgstr[1] ""
-"Boshqalarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
+msgstr ""
+"Boshqa paketlarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
"%s"
-#: ../urpmi:544
+#: ../urpmi:547
#, c-format
msgid "(test only, removal will not be actually done)"
-msgstr ""
+msgstr "(sinov usuli, hech narsa olib tashlanmaydi)"
-#: ../urpmi:586
+#: ../urpmi:589
#, c-format
msgid ""
"You need to be root to install the following dependencies:\n"
@@ -2092,100 +2137,109 @@ msgstr ""
"Quyidagi bog'liqliklarni o'rnatish uchun siz root bo'lishingiz kerak:\n"
"%s\n"
-#: ../urpmi:592
+#: ../urpmi:595
#, c-format
msgid "(test only, installation will not be actually done)"
-msgstr ""
+msgstr "(sinov usuli, hech narsa o'rnatilmaydi)"
-#: ../urpmi:594
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%2$d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi?"
-#: ../urpmi:618
+#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Tayyor bo'lganda ENTER tugmasini bosing..."
-#: ../urpmi:624
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Bekor qilish"
-#: ../urpmi:666
-#, fuzzy, c-format
+#: ../urpmi:671
+#, c-format
msgid "The following package has bad signature"
-msgid_plural "The following packages have bad signatures"
-msgstr[0] "Quyidagi paketlarning imzolari noto'g'ri"
-msgstr[1] "Quyidagi paketlarning imzolari noto'g'ri"
+msgstr "Quyidagi paketning imzosi xato"
-#: ../urpmi:668
+#: ../urpmi:672
+#, c-format
+msgid "The following packages have bad signatures"
+msgstr "Quyidagi paketlarning imzolari noto'g'ri"
+
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "O'rnatishni davom etishni istaysizmi?"
-#: ../urpmi:715
-#, fuzzy, c-format
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+
+#: ../urpmi:711
+#, c-format
msgid "distributing %s"
-msgstr "Ishga tushirilmoqda: %s"
+msgstr ""
-#: ../urpmi:729
-#, fuzzy, c-format
+#: ../urpmi:725
+#, c-format
msgid "installing %s from %s"
-msgstr "%s o'rnatilmoqda"
+msgstr "o'rnatilmoqda: %s, qaerdan: %s"
-#: ../urpmi:731
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "%s o'rnatilmoqda"
-#: ../urpmi:756
-#, c-format
-msgid "Installation failed:"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi:"
-
-#: ../urpmi:763
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Bog'liqliklarni tekshirmasdan o'rnatib ko'raymi? (h/Y) "
-#: ../urpmi:780
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr ""
-#: ../urpmi:819
+#: ../urpmi:815
#, fuzzy, c-format
-msgid "%d installation transactions failed"
-msgstr "O'rnatish muvaffaqiyatsiz tugadi"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "O'rnatish muvaffaqiyatsiz tugadi"
-#: ../urpmi:828
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "O'rnatish mumkin"
-#: ../urpmi:833
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
-msgstr ""
+msgstr "Paketlarni yangilash muhtoji yo'q"
-#: ../urpmi:840
-#, fuzzy, c-format
+#: ../urpmi:838
+#, c-format
msgid "Package %s is already installed"
-msgid_plural "Packages %s are already installed"
-msgstr[0] "Paket %s allaqachon o'rnatilgan"
-msgstr[1] "Paket %s allaqachon o'rnatilgan"
+msgstr "%s paketi allaqachon o'rnatilgan"
-#: ../urpmi:843
-#, fuzzy, c-format
+#: ../urpmi:839
+#, c-format
+msgid "Packages %s are already installed"
+msgstr "%s paketlari allaqachon o'rnatilgan"
+
+#: ../urpmi:842
+#, c-format
msgid "Package %s can not be installed"
-msgid_plural "Packages %s can not be installed"
-msgstr[0] "Hamma narsa allaqachon o'rnatilgan"
-msgstr[1] "Hamma narsa allaqachon o'rnatilgan"
+msgstr "%s paketini o'rnatib bo'lmaydi"
-#: ../urpmi:863
+#: ../urpmi:843
+#, c-format
+msgid "Packages %s can not be installed"
+msgstr "%s paketlarini o'rnatib bo'lmaydi"
+
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "urpmi qaytadan ishga tushmoqda"
@@ -2203,25 +2257,30 @@ msgid ""
"\n"
"and [options] are from\n"
msgstr ""
+"Foydalanish: urpmi.addmedia [amallar] <nomi> <url>\n"
+"<url> quyidagilardan biri\n"
+" [file:/]/<yo'l>\n"
+" ftp://<foydalanuvchi>:<maxfiy so'z>@<xost>/<yo'l>\n"
+" ftp://<xost>/<yo'l>\n"
+" http://<xost>/<yo'l>\n"
+" removable://<yo'l>\n"
+"\n"
+"[amallar] quyidagilar\n"
#: ../urpmi.addmedia:54
#, c-format
msgid " --update - create an update medium.\n"
-msgstr " --update - yangilash manbasini yaratish.\n"
+msgstr " --update - yangilash to'plamini yaratish.\n"
#: ../urpmi.addmedia:55
-#, fuzzy, c-format
+#, c-format
msgid " --probe-synthesis - use synthesis file.\n"
-msgstr ""
-" --probe-synthesis - synthesis faylini topishga va undan foydalanishga urinib "
-"ko'rish.\n"
+msgstr " --probe-synthesis - synthesis faylidan foydalanish.\n"
#: ../urpmi.addmedia:56 ../urpmi.addmedia:58
-#, fuzzy, c-format
+#, c-format
msgid " --probe-hdlist - use hdlist file.\n"
-msgstr ""
-" --probe-hdlist - hdlist faylini topishga va undan foydalanishga urinib "
-"ko'rish.\n"
+msgstr " --probe-hdlist - hdlist faylidan foydalanish.\n"
#: ../urpmi.addmedia:57
#, c-format
@@ -2229,7 +2288,7 @@ msgid " --probe-rpms - use rpm files (instead of synthesis/hdlist).\n"
msgstr ""
#: ../urpmi.addmedia:59
-#, fuzzy, c-format
+#, c-format
msgid " --no-probe - do not try to find any synthesis or hdlist file.\n"
msgstr " --no-probe - synthesis yoki hdlist faylini topishga urinmash.\n"
@@ -2246,9 +2305,9 @@ msgid " --interactive - with --distrib, ask confirmation for each media\n"
msgstr ""
#: ../urpmi.addmedia:64
-#, fuzzy, c-format
+#, c-format
msgid " --all-media - with --distrib, add every listed media\n"
-msgstr " --list-media - mavjud bo'lgan manbalar ro'yxatini ko'rsatish.\n"
+msgstr ""
#: ../urpmi.addmedia:65
#, c-format
@@ -2267,7 +2326,7 @@ msgstr ""
#: ../urpmi.addmedia:69 ../urpmi.update:42
#, c-format
msgid " --no-md5sum - disable MD5SUM file checking.\n"
-msgstr ""
+msgstr " --no-md5sum - MD5SUM faylini tekshirishni o'chirish.\n"
#: ../urpmi.addmedia:70
#, c-format
@@ -2279,17 +2338,17 @@ msgstr ""
msgid " --raw - add the media in config, but don't update it.\n"
msgstr ""
-#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:48
+#: ../urpmi.addmedia:72 ../urpmi.removemedia:42 ../urpmi.update:49
#, c-format
msgid " -c - clean headers cache directory.\n"
msgstr " -c - sarlavhalarning kesh direktoriyasini tozalash.\n"
-#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:50
+#: ../urpmi.addmedia:73 ../urpmi.removemedia:44 ../urpmi.update:51
#, c-format
msgid " -q - quiet mode.\n"
msgstr " -q - xabarsiz.\n"
-#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:51
+#: ../urpmi.addmedia:74 ../urpmi.removemedia:45 ../urpmi.update:52
#, c-format
msgid " -v - verbose mode.\n"
msgstr " -v - ortiqcha xabarlar bilan.\n"
@@ -2297,7 +2356,7 @@ msgstr " -v - ortiqcha xabarlar bilan.\n"
#: ../urpmi.addmedia:86
#, c-format
msgid "unable to update medium \"%s\"\n"
-msgstr "manbani (%s) yangilab bo'lmadi\n"
+msgstr "to'plamni yangilab bo'lmadi: \"%s\"\n"
#: ../urpmi.addmedia:115
#, c-format
@@ -2305,14 +2364,14 @@ msgid "bad <url> (for local directory, the path must be absolute)\n"
msgstr ""
#: ../urpmi.addmedia:118
-#, fuzzy, c-format
+#, c-format
msgid "Only superuser is allowed to add media"
-msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
+msgstr "Paketlar to'plamini faqat root qo'shishi mumkin"
#: ../urpmi.addmedia:121
-#, fuzzy, c-format
+#, c-format
msgid "creating config file [%s]"
-msgstr "moslama fayli (%s) yozilmoqda"
+msgstr "moslama fayli (%s) yaratilmoqda"
#: ../urpmi.addmedia:122
#, c-format
@@ -2330,6 +2389,8 @@ msgid ""
"\n"
"Do you want to add media '%s'"
msgstr ""
+"\n"
+"\"%s\" to'plamini qo'shishni istaysizmi?"
#: ../urpmi.addmedia:166
#, c-format
@@ -2339,12 +2400,12 @@ msgstr "synthesis/hdlist fayliga nisbiy yo'l ko'rsatilmagan\n"
#: ../urpmi.addmedia:169
#, c-format
msgid "Can't use %s with remote medium"
-msgstr ""
+msgstr "Masofadagi to'plam uchun %s amalidan foydalanib bo'lmaydi"
#: ../urpmi.addmedia:190
#, c-format
msgid "unable to create medium \"%s\"\n"
-msgstr "manbani (%s) yaratib bo'lmadi\n"
+msgstr "to'plamni yaratib bo'lmadi: \"%s\"\n"
#: ../urpmi.recover:28
#, c-format
@@ -2368,9 +2429,9 @@ msgid " --checkpoint - set repackaging start now\n"
msgstr ""
#: ../urpmi.recover:35
-#, fuzzy, c-format
+#, c-format
msgid " --noclean - don't clean repackage directory on checkpoint\n"
-msgstr " --noclean - ishlatilmagan RPM'ni keshda saqlash.\n"
+msgstr ""
#: ../urpmi.recover:37
#, c-format
@@ -2379,14 +2440,14 @@ msgid ""
msgstr ""
#: ../urpmi.recover:38
-#, fuzzy, c-format
+#, c-format
msgid " --list-all - list all transactions in rpmdb (long)\n"
-msgstr " --list-url - mavjud bo'lgan manba va uning URL'ni ko'rsatish.\n"
+msgstr ""
#: ../urpmi.recover:39
-#, fuzzy, c-format
+#, c-format
msgid " --list-safe - list transactions since checkpoint\n"
-msgstr " --list-url - mavjud bo'lgan manba va uning URL'ni ko'rsatish.\n"
+msgstr ""
#: ../urpmi.recover:40
#, c-format
@@ -2396,9 +2457,9 @@ msgid ""
msgstr ""
#: ../urpmi.recover:42
-#, fuzzy, c-format
+#, c-format
msgid " --disable - turn off repackaging\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
+msgstr ""
#: ../urpmi.recover:57
#, c-format
@@ -2406,9 +2467,9 @@ msgid "Invalid date or duration [%s]\n"
msgstr ""
#: ../urpmi.recover:65
-#, fuzzy, c-format
+#, c-format
msgid "Repackage directory not defined\n"
-msgstr "%s paketi topilmadi."
+msgstr ""
#: ../urpmi.recover:68
#, c-format
@@ -2422,8 +2483,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr "%d-ta fayl olib tashlandi\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "%d-ta fayl olib tashlandi\n"
#: ../urpmi.recover:82
#, c-format
@@ -2458,17 +2520,17 @@ msgstr ""
#: ../urpmi.recover:130
#, c-format
msgid "You must be superuser to do this"
-msgstr ""
+msgstr "Bundan foydalanish uchun root bo'lish shart"
#: ../urpmi.recover:143 ../urpmi.recover:209
-#, fuzzy, c-format
+#, c-format
msgid "Writing rpm macros file [%s]...\n"
-msgstr "RPM-fayli (%s) olinmoqda..."
+msgstr ""
#: ../urpmi.recover:185
-#, fuzzy, c-format
+#, c-format
msgid "No rollback date found\n"
-msgstr "Fayllar ro'yxati topilmadi\n"
+msgstr ""
#: ../urpmi.recover:188
#, c-format
@@ -2481,34 +2543,34 @@ msgid "Disabling repackaging\n"
msgstr ""
#: ../urpmi.removemedia:38
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.removemedia (-a | <name> ...)\n"
"where <name> is a medium name to remove.\n"
msgstr ""
-"Foydalanish: urpmi.removemedia [-a] <nom>...\n"
-"<nom> - olib tashlanadigan manbaning nomi.\n"
+"Foydalanish: urpmi.removemedia (-a | <nomi> ...)\n"
+"<nomi> - olib tashlanishi kerak bo'lgan to'plamning nomi.\n"
#: ../urpmi.removemedia:41
#, c-format
msgid " -a - select all media.\n"
-msgstr " -a - hamma manbalarni tanlash.\n"
+msgstr " -a - hamma to'plamlarni tanlash.\n"
#: ../urpmi.removemedia:43
-#, fuzzy, c-format
+#, c-format
msgid " -y - fuzzy match on media names.\n"
-msgstr " -q - xabarsiz.\n"
+msgstr ""
#: ../urpmi.removemedia:65
-#, fuzzy, c-format
+#, c-format
msgid "Only superuser is allowed to remove media"
-msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
+msgstr "To'plamni faqat root olib tashlashi mumkin"
#: ../urpmi.removemedia:78
#, c-format
msgid "nothing to remove (use urpmi.addmedia to add a media)\n"
msgstr ""
-"olib tashlash uchun hech narsa yo'q (manbani qo'shish\n"
+"olib tashlash uchun hech narsa yo'q (to'plamni qo'shish\n"
"uchun urpmi.addmedia buyrug'idan foydalaning)\n"
#: ../urpmi.removemedia:84
@@ -2521,18 +2583,18 @@ msgstr ""
"(quyidagilardan bittasi: %s)\n"
#: ../urpmi.update:30
-#, fuzzy, c-format
+#, c-format
msgid ""
"usage: urpmi.update [options] <name> ...\n"
"where <name> is a medium name to update.\n"
msgstr ""
-"Foydalanish: urpmi.removemedia [-a] <nom>...\n"
-"<nom> - olib tashlanadigan manbaning nomi.\n"
+"Foydalanish: urpmi.update [amallar] <nomi> ...\n"
+"<nomi> - yangilanishi kerak bo'lgan to'plamning nomi.\n"
#: ../urpmi.update:41
-#, fuzzy, c-format
+#, c-format
msgid " --update - update only update media.\n"
-msgstr " --update - faqat yangilash manbasidan foydalanish.\n"
+msgstr " --update - faqat yangilash to'plamidan foydalanish.\n"
#: ../urpmi.update:43
#, c-format
@@ -2540,9 +2602,9 @@ msgid " --force-key - force update of gpg key.\n"
msgstr ""
#: ../urpmi.update:44
-#, fuzzy, c-format
+#, c-format
msgid " --ignore - don't update, mark the media as ignored.\n"
-msgstr " --update - faqat yangilash manbasidan foydalanish.\n"
+msgstr ""
#: ../urpmi.update:45
#, c-format
@@ -2550,28 +2612,34 @@ msgid " --no-ignore - don't update, mark the media as enabled.\n"
msgstr ""
#: ../urpmi.update:47
-#, fuzzy, c-format
+#, c-format
+msgid ""
+" --probe-rpms - do not use synthesis/hdlist, use rpm files directly\n"
+msgstr ""
+
+#: ../urpmi.update:48
+#, c-format
msgid " -a - select all non-removable media.\n"
-msgstr " -a - hamma manbalarni tanlash.\n"
+msgstr ""
-#: ../urpmi.update:49
-#, fuzzy, c-format
-msgid " -f - force generation of hdlist files.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+#: ../urpmi.update:50
+#, c-format
+msgid " -f - force updating synthesis/hdlist\n"
+msgstr ""
-#: ../urpmi.update:70
-#, fuzzy, c-format
+#: ../urpmi.update:71
+#, c-format
msgid "Only superuser is allowed to update media"
-msgstr "Faqat boshqaruvchi paketlarni o'rnatishi mumkin"
+msgstr "Faqat boshqaruvchi (root ) to'plami yangilashi mumkin"
-#: ../urpmi.update:78
+#: ../urpmi.update:79
#, c-format
msgid "nothing to update (use urpmi.addmedia to add a media)\n"
msgstr ""
-"yangilash uchun hech narsa yo'q (manbani qo'shish uchun\n"
+"yangilash uchun hech narsa yo'q (to'plamni qo'shish uchun\n"
"urpmi.addmedia buyrug'idan foydalaning)\n"
-#: ../urpmi.update:96
+#: ../urpmi.update:97
#, c-format
msgid ""
"the entry to update is missing\n"
@@ -2580,20 +2648,20 @@ msgstr ""
"yangilash parametri yetishmayapti\n"
"(quyidagilardan bittasi: %s)\n"
-#: ../urpmi.update:100
+#: ../urpmi.update:101
#, c-format
msgid "\"%s\""
msgstr "\"%s\""
-#: ../urpmi.update:101
-#, fuzzy, c-format
+#: ../urpmi.update:102
+#, c-format
msgid "ignoring media %s"
-msgstr "Manba (\"%s\") tuzatilmoqda:"
+msgstr "to'plamga e'tibor berilmaydi: \"%s\""
-#: ../urpmi.update:101
-#, fuzzy, c-format
+#: ../urpmi.update:102
+#, c-format
msgid "enabling media %s"
-msgstr "manba (%s) o'chirilmoqda"
+msgstr ""
#: ../urpmq:43
#, c-format
@@ -2612,13 +2680,11 @@ msgstr ""
"Foydalanish:\n"
#: ../urpmq:51
-#, fuzzy, c-format
+#, c-format
msgid ""
" --searchmedia - use only the given media to search requested (or updated) "
"packages.\n"
msgstr ""
-" --media - faqat ko'rsatilgan, vergul bilan ajratilgan, manbalardan "
-"foydalanish.\n"
#: ../urpmq:56
#, c-format
@@ -2633,22 +2699,23 @@ msgstr " --list - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
#: ../urpmq:60
#, c-format
msgid " --list-media - list available media.\n"
-msgstr " --list-media - mavjud bo'lgan manbalar ro'yxatini ko'rsatish.\n"
+msgstr " --list-media - mavjud bo'lgan to'plamlar ro'yxatini ko'rsatish.\n"
#: ../urpmq:61
#, c-format
msgid " --list-url - list available media and their url.\n"
-msgstr " --list-url - mavjud bo'lgan manba va uning URL'ni ko'rsatish.\n"
+msgstr ""
+" --list-url - mavjud bo'lgan to'plam va uning URL'ni ko'rsatish.\n"
#: ../urpmq:62
-#, fuzzy, c-format
+#, c-format
msgid " --list-nodes - list available nodes when using --parallel.\n"
-msgstr " --list-url - mavjud bo'lgan manba va uning URL'ni ko'rsatish.\n"
+msgstr ""
#: ../urpmq:63
-#, fuzzy, c-format
+#, c-format
msgid " --list-aliases - list available parallel aliases.\n"
-msgstr " --list-media - mavjud bo'lgan manbalar ro'yxatini ko'rsatish.\n"
+msgstr ""
#: ../urpmq:64
#, c-format
@@ -2657,9 +2724,9 @@ msgid ""
msgstr ""
#: ../urpmq:65
-#, fuzzy, c-format
+#, c-format
msgid " --src - next package is a source package (same as -s).\n"
-msgstr " --list - mavjud bo'lgan paketlar ro'yxatini ko'rsatish.\n"
+msgstr ""
#: ../urpmq:66
#, c-format
@@ -2668,9 +2735,9 @@ msgid ""
msgstr ""
#: ../urpmq:68
-#, fuzzy, c-format
+#, c-format
msgid " --ignorearch - allow to query rpms for unmatched architectures.\n"
-msgstr " --url - url tegini ko'rsatish: url.\n"
+msgstr ""
#: ../urpmq:72
#, c-format
@@ -2680,200 +2747,152 @@ msgid ""
msgstr ""
#: ../urpmq:84
-#, fuzzy, c-format
+#, c-format
msgid " --changelog - print changelog.\n"
-msgstr " --all - hamma teglarni ko'rsatish.\n"
+msgstr ""
#: ../urpmq:85
-#, fuzzy, c-format
+#, c-format
msgid " --summary, -S - print summary.\n"
-msgstr " --summary - summary tegini ko'rsatish: hisobot.\n"
+msgstr ""
+
+#: ../urpmq:87
+#, c-format
+msgid " --whatrequires - reverse search to what requires package.\n"
+msgstr ""
#: ../urpmq:88
+#, c-format
+msgid ""
+" --whatrequires-recursive\n"
+" - extended reverse search (includes virtual packages).\n"
+msgstr ""
+
+#: ../urpmq:90
#, fuzzy, c-format
-msgid " -c - complete output with package to be removed.\n"
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
-#: ../urpmq:89
-#, fuzzy, c-format
+#: ../urpmq:93
+#, c-format
+msgid " -c - complete output with package to be removed.\n"
+msgstr ""
+
+#: ../urpmq:94
+#, c-format
msgid " -d - extend query to package dependencies.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
-#: ../urpmq:91
-#, fuzzy, c-format
+#: ../urpmq:96
+#, c-format
msgid " -g - print groups with name also.\n"
-msgstr " -q - xabarsiz.\n"
+msgstr ""
-#: ../urpmq:92
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
-#: ../urpmq:93
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
-#: ../urpmq:94
-#, fuzzy, c-format
-msgid ""
-" -P - do not search in provides to find package (default).\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
-
-#: ../urpmq:95
-#, fuzzy, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+#: ../urpmq:99
+#, c-format
+msgid " -m - equivalent to -du\n"
+msgstr ""
-#: ../urpmq:96
-#, fuzzy, c-format
+#: ../urpmq:100
+#, c-format
msgid " -r - print version and release with name also.\n"
-msgstr " --name - faqat paketning nomini ko'rsatish.\n"
-
-#: ../urpmq:97
-#, fuzzy, c-format
-msgid " -R - reverse search to what requires package.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
-
-#: ../urpmq:98
-#, fuzzy, c-format
-msgid ""
-" -RR - extended reverse search (includes virtual packages).\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
-#: ../urpmq:99
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
-#: ../urpmq:100
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr ""
-#: ../urpmq:101
-#, fuzzy, c-format
+#: ../urpmq:103
+#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
-msgstr " -a - hamma manbalarni tanlash.\n"
+msgstr ""
-#: ../urpmq:102
-#, fuzzy, c-format
+#: ../urpmq:104
+#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
-msgstr " -l - paketdagi fayllarni ko'rsatish.\n"
+msgstr ""
-#: ../urpmq:103
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr ""
-#: ../urpmq:178
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes'dan faqat --parallel bilan birga foydalanib bo'ladi"
-#: ../urpmq:350
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
-msgid_plural "no hdlist for medium \"%s\", only partial result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
+
+#: ../urpmq:362
+#, c-format
+msgid "no hdlist for medium \"%s\", only partial result for packages %s"
+msgstr ""
-#: ../urpmq:353
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
-msgid_plural ""
-"no hdlist for medium \"%s\", unable to return any result for packages %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr ""
-#: ../urpmq:405
+#: ../urpmq:366
#, c-format
-msgid "No filelist found\n"
-msgstr "Fayllar ro'yxati topilmadi\n"
+msgid ""
+"no hdlist for medium \"%s\", unable to return any result for packages %s"
+msgstr ""
-#: ../urpmq:417
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Changelog fayli topilmadi\n"
-#~ msgid ""
-#~ "To satisfy dependencies, the following %d packages are going to be "
-#~ "installed:\n"
-#~ "%s\n"
-#~ msgstr ""
-#~ "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket ham o'rnatiladi:\n"
-#~ "%s\n"
-
-#, fuzzy
-#~ msgid "Installation failed on node %s"
-#~ msgstr "O'rnatish muvaffaqiyatsiz tugadi"
-
-#, fuzzy
-#~ msgid "Installing packages on nodes..."
-#~ msgstr "\"%s\" (%s/%s) paketi o'rnatilmoqda..."
+#~ msgid "No filelist found\n"
+#~ msgstr "Fayllar ro'yxati topilmadi\n"
-#, fuzzy
-#~ msgid "Propagating synthesis to %s..."
-#~ msgstr "synthesis fayli (%s) tekshirilmoqda"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "%d-ta paketni o'rnatish bilan davom etishni istaysizmi? (%d Mb)"
-#, fuzzy
-#~ msgid "Distributing files to %s..."
-#~ msgstr "Ishga tushirilmoqda: %s"
+#~ msgid "(%d packages, %d MB)"
+#~ msgstr "(%d-ta paket, %d Mb)"
-#, fuzzy
-#~ msgid "Performing install on %s..."
-#~ msgstr "Paketni o'rnatish..."
-
-#, fuzzy
-#~ msgid "Installing %s on %s..."
-#~ msgstr "%s o'rnatilmoqda"
-
-#, fuzzy
-#~ msgid "Preparing install on %s..."
-#~ msgstr "Paketni o'rnatish..."
+#~ msgid "medium \"%s\" is not selected"
+#~ msgstr "to'plam tanlanmagan: \"%s\""
#~ msgid ""
-#~ "Some requested packages cannot be installed:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Talab qilingan ba'zi bir paketlarni o'rnatib bo'lmaydi:\n"
-#~ "%s"
-
-#~ msgid ""
-#~ "The installation cannot continue because the following packages\n"
-#~ "have to be removed for others to be upgraded:\n"
+#~ "To satisfy dependencies, the following %d packages are going to be "
+#~ "installed:\n"
#~ "%s\n"
#~ msgstr ""
-#~ "O'rnatishni davom etib bo'lmaydi, chunki boshqalarni yangilash\n"
-#~ "uchun quyidagi paketlarni olib tashlash kerak:\n"
+#~ "Bog'liqliklarni ta'minlash uchun quyidagi %d-ta paket ham o'rnatiladi:\n"
#~ "%s\n"
#~ msgid ""
-#~ "The following packages have to be removed for others to be upgraded:\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Boshqalarni yangilash uchun quyidagi paketlarni olib tashlash kerak:\n"
-#~ "%s"
-
-#~ msgid ""
#~ "To satisfy dependencies, the following packages are going to be installed"
#~ msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paketlar ham o'rnatiladi"
-#~ msgid ""
-#~ "To satisfy dependencies, the following package is going to be installed"
-#~ msgstr "Bog'liqliklarni ta'minlash uchun quyidagi paket ham o'rnatiladi"
-
-#~ msgid "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr "%d-ta paketni o'rnatish bilan davom etishni istaysizmi? (%d Mb)"
-
-#~ msgid "The following packages have bad signatures"
-#~ msgstr "Quyidagi paketlarning imzolari noto'g'ri"
-
-#~ msgid "Packages %s are already installed"
-#~ msgstr "Paketlar %s allaqachon o'rnatilgan"
-
#~ msgid " --probe-synthesis - try to find and use synthesis file.\n"
#~ msgstr ""
#~ " --probe-synthesis - synthesis faylini topishga va undan foydalanishga "
@@ -2885,83 +2904,21 @@ msgstr "Changelog fayli topilmadi\n"
#~ "ko'rish.\n"
#~ msgid ""
-#~ " --no-probe - do not try to find any synthesis or\n"
-#~ " hdlist file.\n"
-#~ msgstr ""
-#~ " --no-probe - synthesis yoki hdlist faylini topishga urinilmasin.\n"
-
-#~ msgid "Will create config file [%s]"
-#~ msgstr "Moslama fayli (%s) yaratilmoqda"
-
-#~ msgid ""
-#~ "usage: urpmi.removemedia [-a] <name> ...\n"
-#~ "where <name> is a medium name to remove.\n"
-#~ msgstr ""
-#~ "Foydalanish: urpmi.removemedia [-a] <nom>...\n"
-#~ "<nom> - olib tashlanadigan manbaning nomi.\n"
-
-#~ msgid ""
#~ "\n"
#~ "unknown options '%s'\n"
#~ msgstr ""
#~ "\n"
#~ "noma'lum parametrlar \"%s\"\n"
-#, fuzzy
-#~ msgid "inconsistent list file for \"%s\", medium ignored"
-#~ msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
-
-#~ msgid ""
-#~ "--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
-#~ "update or --parallel"
-#~ msgstr ""
-#~ "--synthesis'dan --media, --excludemedia, --sortmedia, --update or --"
-#~ "parallel bilan birga foydalanib bo'lmaydi"
-
-#, fuzzy
-#~ msgid "virtual medium \"%s\" is not local, medium ignored"
-#~ msgstr "manba (%s) tanlanmagan"
-
-#~ msgid "added medium %s"
-#~ msgstr "%s manbasi qo'shildi"
-
-#, fuzzy
-#~ msgid "unable to access first installation medium"
-#~ msgstr "RPM-fayliga (%s) murojaat qilib bo'lmadi"
-
#~ msgid "copying source hdlist (or synthesis) of \"%s\"..."
#~ msgstr "'%s' uchun hdlist (yoki synthesis) faylidan nusxa ko'chirilmoqda..."
#~ msgid "retrieval of source hdlist (or synthesis) failed"
-#~ msgstr "...hdlist (yoki synthesis) faylini yozib olish muvaffaqiyatsiz tugadi"
-
-#, fuzzy
-#~ msgid "unable to write list file of \"%s\""
-#~ msgstr "'%s' faylini yozib bo'lmadi"
-
-#, fuzzy
-#~ msgid "nothing written in list file for \"%s\""
-#~ msgstr "manba (%s) uchun ro'yxat fayli yozilmoqda"
+#~ msgstr ""
+#~ "...hdlist (yoki synthesis) faylini yozib olish muvaffaqiyatsiz tugadi"
#~ msgid "found %d headers in cache"
#~ msgstr "keshda %d sarlavha topildi"
#~ msgid "removing %d obsolete headers in cache"
#~ msgstr "keshdagi %d eski sarlavha o'chirilmoqda"
-
-#~ msgid "no package named %s"
-#~ msgstr "%s nomli paket mavjud emas"
-
-#~ msgid "urpmi database locked"
-#~ msgstr "urpmi ma'lumot bazasi qulflangan"
-
-#~ msgid "examining MD5SUM file"
-#~ msgstr "MD5SUM fayli tekshirilmoqda"
-
-#~ msgid "computing md5sum of existing source hdlist (or synthesis)"
-#~ msgstr ""
-#~ "mavjud bo'lgan hdlist (yoki synthesis) fayli uchun md5sum hisoblanmoqda"
-
-#, fuzzy
-#~ msgid "The following package names were assumed: %s"
-#~ msgstr "Quyidagi paketlarda %s bor: %s"
diff --git a/po/vi.po b/po/vi.po
index d98e9f6d..3e8b5cf5 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -6,7 +6,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi-vi\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2005-06-08 15:13+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@yahoo.com>\n"
"Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net>\n"
@@ -101,14 +101,14 @@ msgstr "Bá» _qua"
msgid "Choose location to save file"
msgstr "Chá»n nÆ¡i lÆ°u tập tin"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, fuzzy, c-format
msgid "Unknown option %s"
msgstr ""
"\n"
"tùy chá»n không xác định '%s'\n"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, fuzzy, c-format
msgid "No packages specified"
msgstr "không có gói tin với tên %s"
@@ -139,7 +139,7 @@ msgstr ""
msgid "Warning"
msgstr "Cảnh báo"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "OK"
@@ -231,7 +231,7 @@ msgstr ""
"\n"
"Bạn muốn tiếp tục cài đặt không?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -242,7 +242,7 @@ msgstr ""
"%s\n"
"Có thể bạn nên cập nhật cơ sở dữ liệu của urpmi."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "gỡ bỠ%s"
@@ -262,9 +262,9 @@ msgstr "Äang cài đặt gói `%s' (%s/%s)..."
msgid "_Done"
msgstr "H_oàn thành"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
-#, c-format
-msgid "Installation failed"
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
+#, fuzzy, c-format
+msgid "Installation failed:"
msgstr "Cài đặt không được"
#: ../gurpmi2:344
@@ -321,63 +321,63 @@ msgstr "Chỉ cho phép ngÆ°á»i dùng cao cấp được cài đặt các gói"
msgid "Running urpmi in restricted mode..."
msgstr ""
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "không thể mở rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "tên tập tin rpm [%s] không hợp lệ"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "đang thu thập tập tin rpm [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...hoàn thành việc thu thập"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...không thu thập được: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "không thể truy cập tập tin rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, fuzzy, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "không thể phân tích cú pháp \"%s\" trong tập tin [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "không thể đăng ký tập tin rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr ""
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "lỗi đăng ký các gói tin cục bộ"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr ""
@@ -417,7 +417,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr ""
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
@@ -442,7 +442,7 @@ msgstr "Không thể ghi tập tin cấu hình [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "Không thể ghi tập tin cấu hình [%s]"
@@ -572,7 +572,7 @@ msgstr "có nhiá»u gói vá»›i cùng tên tập tin rpm \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "không thể phân tích đúng [%s] trên giá trị \"%s\""
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "không thể truy cập tập tin danh sách của \"%s\", phương tiện bị bỠqua"
@@ -709,7 +709,7 @@ msgstr "cảnh báo: không có md5sum của %s trong tập tin MD5SUM"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "tính toán md5sum của hdlist (hoặc synthesis) của nguồn hiện có"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -718,104 +718,104 @@ msgstr ""
"phương tiện ảo \"%s\" đáng ra không nên định nghĩa tập tin hdlist hay list, "
"phương tiện bị bỠqua"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "phương tiện ảo \"%s\" nên có URL rõ ràng, phương tiện bị bỠqua"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "tên tập tin rpm [%s] không hợp lệ"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "không thể tìm thấy tập tin danh sách cho \"%s\", phương tiện bị bỠqua"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "Ä‘ang thá»­ chá»n phÆ°Æ¡ng tiện không tồn tại \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "build tập tin tổng hợp hdlist cho phương tiện \"%s\""
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "không thể truy cập tập tin hdlist của \"%s\", phương tiện bị bỠqua"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "không thể phân tích tập tin hdlist của \"%s\""
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"phương tiện \"%s\" cố sử dụng hdlist đã được dùng rồi, phương tiện bị bỠqua"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"phương tiện \"%s\" cố sử dụng một danh sách đang dùng, phương tiện bị bỠqua"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, fuzzy, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "đang cố bỠqua phương tiện đang tồn tại \"%s\", tránh"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "có quá nhiá»u Ä‘iểm gắn kết cho phÆ°Æ¡ng tiện tháo lắp \"%s\""
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "coi phương tiện tháo lắp là \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Phương tiện \"%s\" là ISO image, sẽ được mount nhanh (on-the-fly)"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "sử dụng thiết bị tháo lắp khác [%s] cho \"%s\""
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "không thể thu thập tên Ä‘Æ°á»ng dẫn cho phÆ°Æ¡ng tiện tháo lắp \"%s\""
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "ghi tập tin cấu hình [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Không thể dùng parallel mode với use-distrib mode"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "đang dùng phương tiện liên quan cho chế độ song song: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, fuzzy, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -824,145 +824,145 @@ msgstr ""
"--synthesis không thể dùng với --media, --excludemedia, --sortmedia, --"
"update hoặc --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Tìm kiếm bắt đầu: %s kết thúc: %s "
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "thực hiện pass thứ hai để tính toán các phụ thuộc\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "bỠqua gói tin %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "nên cài đặt thay vì nâng cấp gói %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "phương tiện \"%s\" đã tồn tại rồi"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "phương tiện ảo phải là cục bộ"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "Ä‘ang Ä‘á»c các header từ phÆ°Æ¡ng tiện \"%s\""
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "gỡ bỠphương tiện \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "không thể truy cập phương tiện cài đặt đầu tiên"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr ""
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, fuzzy, c-format
msgid "retrieving media.cfg file..."
msgstr "đang lấy vỠtập tin hdlists..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, fuzzy, c-format
msgid "unable to parse media.cfg"
msgstr "không thể mở rpmdb"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"không thể truy cập phương tiện cài đặt thứ nhất (không thấy tập tin hdlists)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "Ä‘ang thá»­ chá»n phÆ°Æ¡ng tiện không tồn tại \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "Ä‘ang chá»n Ä‘a phÆ°Æ¡ng tiện: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "gỡ bỠphương tiện \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "đang cấu hình lại urpmi cho phương tiện \"%s\""
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...không cấu hình lại được"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "hoàn thành việc cấu hình lại"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "phÆ°Æ¡ng tiện \"%s\" không được chá»n"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "đang kiểm tra tập tin hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "đang kiểm tra tập tin tổng hợp [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "building hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -971,77 +971,77 @@ msgstr ""
"Không thể build tập tin synthesis cho phương tiện \"%s\". Tập tin hdlist có "
"thể bị há»ng."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "trục trặc khi Ä‘á»c tập tin synthesis hay hdlist của phÆ°Æ¡ng tiện \"%s\""
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...sao chép không được"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "đang sao chép tập tin mô tả của \"%s\"..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...sao chép hoàn thành"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "lá»—i sao chép [%s] (có lẽ tập tin nhá»)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn được sao chép"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "Lỗi bản sao của [%s] (md5sum không so khớp)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "tính toán md5sum của hdlist (hoặc synthesis) nguồn thu thập được"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...không thu thập được: md5sum không khớp"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "không tìm thấy các tập tin rpm từ [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "Ä‘ang Ä‘á»c các tập tin rpm từ [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "không thể Ä‘á»c các tập tin rpm từ [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "không có Ä‘á»c rpms"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1051,67 +1051,67 @@ msgstr ""
"không thể truy cập phương tiện \"%s\",\n"
"Truy cập được nếu bạn tự gắn kết thư mục khi tạo phương tiện."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "đang thu thập hdlist (hoặc synthesis) nguồn của \"%s\"..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "đã tìm thấy hdlist (hoặc synthesis) nguồn được dò là %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "không tìm thấy tập tin hdlist cho phương tiện \"%s\""
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "đang kiểm tra tập tin pubkey của \"%s\"..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...đã nhập key %s từ tập tin pubkey của \"%s\""
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "không thể nhập tập tin pubkey của \"%s\""
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "đang ghi tập tin danh sách cho phương tiện \"%s\""
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "đã thêm phương tiện %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "không thể phân tích tập tin hdlist của \"%s\""
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "trục trặc khi Ä‘á»c tập tin tổng hợp của phÆ°Æ¡ng tiện \"%s\""
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "Ä‘ang Ä‘á»c các header từ phÆ°Æ¡ng tiện \"%s\""
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "NnKk"
@@ -1120,13 +1120,13 @@ msgstr "NnKk"
# you can put here the letters for 'yes' for your language, so people
# can hit those keys in their keyboard to reply.
# please keep the 'Yy' for compatibility reasons
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "YyVvDdCc"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Xin lá»—i, lá»±a chá»n sai, hãy thá»­ lại\n"
@@ -1183,47 +1183,47 @@ msgstr ""
msgid "unable to access medium \"%s\""
msgstr "không thể truy cập phương tiện \"%s\""
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Không có gói tin với tên %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Các gói tin sau đây chứa %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "do thiếu %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "vì không thá»a mãn %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "thử xúc tiến %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "để giữ %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "để cài đặt %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "vì xung đột với %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "thôi yêu cầu"
@@ -1370,24 +1370,30 @@ msgstr "Không có gì để gỡ bá»"
msgid "Checking to remove the following packages"
msgstr "Äang kiểm tra để gỡ bá» các gói tin sau đây"
-#: ../urpme:132
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "Äể thá»a mãn các phụ thuá»™c, %d gói sau đây sẽ được gỡ bá» (%d MB)"
+
+#: ../urpme:135 ../urpmi:600
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "Äể thá»a mãn các phụ thuá»™c, %d gói sau đây sẽ được gỡ bá» (%d MB)"
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "gỡ bỠgói %s"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (Có/Không) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Gỡ bỠkhông được"
@@ -1645,7 +1651,7 @@ msgstr " --verbose - phương thức verbose.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -l - liệt kê các tập tin trong gói tin.\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
@@ -1655,12 +1661,12 @@ msgstr " -f - in phiên bản, phát hành và arch với tên.\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "Ä‘ang dùng môi trÆ°á»ng đặc hiệu trên %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1669,7 +1675,7 @@ msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "Bạn có thể muốn dùng --name để tìm tên gói tin.\n"
@@ -1969,7 +1975,7 @@ msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr ""
" --strict-arch - chỉ nâng cấp các gói có cùng cấu trúc (architecture).\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - chá»n toàn bá»™ các tÆ°Æ¡ng hợp trong dòng lệnh.\n"
@@ -2182,15 +2188,10 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr ""
-#: ../urpmi:598
+#: ../urpmi:597
#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr ""
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
msgstr[0] ""
#: ../urpmi:623
@@ -2198,92 +2199,93 @@ msgstr[0] ""
msgid "Press Enter when ready..."
msgstr "Nhấn Enter khi sẵn sàng ..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Bá» qua"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "Các gói tin sau đây có các chữ ký tồi"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Các gói tin sau đây có các chữ ký tồi"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Bạn muốn tiếp tục cài đặt không ?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "Cài đặt không được"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "phân phối %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "cài đặt %s từ %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "đang cài đặt %s"
-#: ../urpmi:762
-#, fuzzy, c-format
-msgid "Installation failed:"
-msgstr "Cài đặt không được"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Thử cài đặt mà không cần kiểm tra các phụ thuộc? (Có/Không)"
-#: ../urpmi:786
+#: ../urpmi:776
#, fuzzy, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Thử cố gắng cài đặt (--force)? (Có/[Không])"
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d phiên giao dịch cài đặt lỗi"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d phiên giao dịch cài đặt lỗi"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "Có khả năng cài đặt"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "Má»i thứ đã được cài đặt rồi"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "Má»i thứ đã được cài đặt rồi"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "Má»i thứ đã được cài đặt rồi"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "Má»i thứ đã được cài đặt rồi"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "khởi chạy lại urpmi"
@@ -2537,8 +2539,9 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
#: ../urpmi.recover:82
#, c-format
@@ -2832,52 +2835,54 @@ msgstr ""
" --whatrequires-recursive\n"
" - tìm kiếm Ä‘á»a ngược mở rá»™ng (gồm cả các gói ảo).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - tìm gói tin từ các nhà cung cấp.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - hoàn thành output vá»›i gói sẽ được gỡ bá».\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - tra vấn mở rộng tới các phụ thuộc của gói tin.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - in ra các nhóm với tên.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - in ra thông tin có ích mà ngÆ°á»i dùng Ä‘á»c được.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - liệt kê các tập tin trong gói tin.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - chế độ yên lặng.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - tìm gói tin từ các nhà cung cấp.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - in ra phiên bản và phát hành với tên.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - gói tin tiếp theo kà gói nguồn (giống như --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2886,44 +2891,44 @@ msgstr ""
" -u - bỠgói tin nếu có phiên bản mới hơn đã được cài đặt "
"rồi.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - tác động tìm kiếm fuzzy (giống như --fuzzy.\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - giống -y, nhÆ°ng ép buá»™c phải khá»›p chứ hoa thÆ°á»ng.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " tên hay tập tin rpm có trong dòng lệnh được yêu cầu.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes chỉ được dùng với --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -2931,16 +2936,14 @@ msgstr ""
"Lưu ý: vì không có phương tiện được tìm kiếm dùng hdlists, urpmf không thể "
"trả lại kết quả\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Không thấy filelist\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Không thấy changelog\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "Không thấy filelist\n"
+
#~ msgid "medium \"%s\" is not selected"
#~ msgstr "phÆ°Æ¡ng tiện \"%s\" không được chá»n"
diff --git a/po/wa.po b/po/wa.po
index d442bc12..d5c0b284 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -12,7 +12,7 @@ msgid ""
msgstr ""
"Project-Id-Version: urpmi 3.3\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2004-08-08 20:26+0200\n"
"Last-Translator: Pablo Saratxaga <pablo@walon.org>\n"
"Language-Team: Walloon <linux-wa@walon.org>\n"
@@ -108,12 +108,12 @@ msgstr "_Rinoncî"
msgid "Choose location to save file"
msgstr "Tchoezixhoz l' plaece wice schaper l' fitchî"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "Tchuze nén cnoxhowe %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "Nou pacaedje di scpecifyî"
@@ -144,7 +144,7 @@ msgstr ""
msgid "Warning"
msgstr "Adviertixhmint"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "'l est bon"
@@ -238,7 +238,7 @@ msgstr ""
"\n"
"Voloz vs continouwer avou l' astalaedje?"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -249,7 +249,7 @@ msgstr ""
"%s\n"
"Vos dvrîz motoit mete a djoû li båze di dnêyes urpmi."
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "dji oistêye li pacaedje %s"
@@ -269,10 +269,10 @@ msgstr "Dj' astale li pacaedje «%s» (%s/%s)..."
msgid "_Done"
msgstr "_Fwait"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "L' astalåcion a fwait berwete"
+msgid "Installation failed:"
+msgstr "L' astalåcion a fwait berwete:"
#: ../gurpmi2:344
#, c-format
@@ -329,64 +329,64 @@ msgstr "Seulmint li super-uzeu a l' droet d' astaler des pacaedjes"
msgid "Running urpmi in restricted mode..."
msgstr "Enondant urpmi e môde rastrindou..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "dji n' sai drovi l' båze rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
"dj' a trové %d tiestires rpm e muchete, dji oistêye %d tiestires obsoletes"
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "no d' fitchî rpm nén valåbe [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "aberwetaedje di fitchî rpm [%s]..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...l' aberwetaedje a stî comifåt"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...l' aberwetaedje a fwait berwete: %s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "dji n' sai aveur accès å fitchî rpm [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "dji n' sai analijhî l' fitchî spec «%s» [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "dji n' sai redjîstrer l' fitchî rpm"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "Årtchitecteure nén copatibe pol rpm [%s]"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "åk n' a nén stî tot-z eredjistrant les pacaedjes locås"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "Ciste operåcion ci n' est nén possibe e môde rastrindou"
@@ -426,7 +426,7 @@ msgstr "Dji n' sai eployî %s avou %s"
msgid "Too many arguments\n"
msgstr "Pår trop d' årgumints\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "dji fwai li fitchî d' sinteze hdlist pol sopoirt «%s»"
@@ -451,7 +451,7 @@ msgstr "dji n' sai lére li fitchî d' apontiaedje [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr "li sopoirt «%s» est defini deus côps, dji lai toumer"
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "dji n' sai scrire li fitchî d' apontiaedje [%s]"
@@ -581,7 +581,7 @@ msgstr "i gn a pus d' on pacaedje avou l' minme no d' fitchî rpm «%s»"
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "dji n' sai analijhî comifåt [%s] pol valixhance «%s»"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr ""
@@ -723,7 +723,7 @@ msgstr ""
"carculaedje do md5sum do fitchî «hdlist» (ou del sinteze) k' egzistêye dedja "
"[%s]"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
@@ -732,109 +732,109 @@ msgstr ""
"li forveyou sopoirt «%s» èn doet nén aveur defini di fitchî hdlist ou di "
"djivêye des fitchîs, dji passe houte do sopoirt"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr ""
"li forveyou sopoirt «%s» duvreut aveur ene hårdêye valide, dji passe houte "
"do sopoirt"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, c-format
msgid "invalid hdlist name"
msgstr "no d' fitchî «hdlist» nén valide"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr ""
"dji n' sai trover li fitchî di djivêye di «%s», dji passe houte do sopoirt"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "«synthesis» èn divreut nén esse defini (sopoirt «%s»)"
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "«synthesis» divreut esse defini (sopoirt «%s»)"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "dji n' sai aveur li fitchî hdlist di «%s», dji passe houte do sopoirt"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, c-format
msgid "unable to access list file of \"%s\""
msgstr "dji n' sai aveur li fitchî hdlist di «%s»"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr ""
"li sopoirt «%s» saye d' eployî on fitchî hdlist dedja eployî, dji passe "
"houte do sopoirt"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr ""
"li sopoirt «%s» saye d' eployî ene djivêye dedja eployeye, dji passe houte "
"do sopoirt"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "dji saye di passer houte do sopoirt «%s», dji passe houte"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "trop di ponts di montaedje pol sopoirt bodjåve «%s»"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "dji prind li bodjåve sopoirt come «%s»"
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "Li sopoirt «%s» est ene imådje ISO, i serè monté al volêye"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "eployant èn éndjin bodjåve diferin [%s] po «%s»"
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "dji n' sai aveur li tchmin pol sopoirt bodjåve «%s»"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr "dj' a scrît %s"
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "sicrijhaedje do fitchî d' apontiaedje [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "Dji n' sai eployî li môde paralele avou l' môde «use-distrib»"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "eployaedje do sopoirt assocyî å môde paralele: %s"
-#: ../urpm/media.pm:520
+#: ../urpm/media.pm:521
#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
@@ -843,146 +843,146 @@ msgstr ""
"--synthesis èn pout nén esse eployî avou --media, --excludemedia, --"
"sortmedia, --update, --use-distrib ou --parallel"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"Note: pont d' fitchî hdlist pol sopoirt «%s», nén moyén di rtourner des "
"rzultats"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "Cweraedje kimincî: %s fini: %s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "dji fwait l' deujhinme passe po carculer les aloyances\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "dji passe houte do pacaedje %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "dji va-st astaler purade ki mete a djoû l' pacaedje %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "li sopoirt «%s» egzistêye dedja"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "les forveyous sopoirts divént esse locås"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr "(ignoré come prémetowe dujhance)"
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "radjoutant l' sopoirt «%s» divant l' sopoirt då lon «%s»"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, c-format
msgid "adding medium \"%s\""
msgstr "radjoutaedje do sopoirt «%s»"
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, c-format
msgid "unable to mount the distribution medium"
msgstr "dji n' a savou monter l' sopoirt d' astalaedje del distribucion"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "i shonne ki cist eplaeçmint la n' a nole distribucion"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "aberwetaedje do fitchî media.cfg..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "dji n' sai analijhî l' fitchî media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr ""
"dji n' a savou trover l' sopoirt d' astalaedje (nou fitchî media.cfg di "
"trové)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "dji saye di tchoezi l' sopoirt «%s» ki n' egzistêye nén"
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "dji tchoezixh des sopoirts multipes: %s"
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "dji bodje li sopoirt «%s»"
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "rapontiaedje d' urpmi pol sopoirt «%s»"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "...li rapontiaedje a fwait berwete"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "li rapontiaedje a stî fwait"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr ""
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr ""
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "li sopoirt «%s» est a djoû"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "corwaitaedje do fitchî hdlist [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "corwaitaedje do fitchî d' sinteze [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "dji fwai l' fitchî hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
@@ -991,82 +991,82 @@ msgstr ""
"Dji n' a savou fé l' fitchî d' sinteze pol sopoirt «%s». Motoit ki vosse "
"fitchî hdlist est cron."
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr ""
"åk n' a nén stî tot léjhant li fitchî hdlist ou di sinteze do sopoirt «%s»"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...li copiaedje a fwait berwete"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "copiaedje do fitchî di discrijhaedjes di «%s»..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...li copiaedje a stî comifåt"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "dji copeye [%s] pol sopoirt «%s»..."
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr ""
"li copeye di [%s] a fwait berwete (li fitchî est pår pitit ki s' end est "
"bizåre)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "carculaedje do fitchî «hdlist» (ou del sinteze) ki vént d' esse copyî"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "li copeye di [%s] a fwait berwete (li md5sum ni corespond nén)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr ""
"dji carcule li md5sum do fitchî «hdlist» (ou del sinteze) ki vént d' esse "
"aberweté"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...l' aberwetaedje a fwait berwete: li md5sum ni corespond nén"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "nou fitchî rpm di trové foû di [%s]"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "lijhant les fitchîs rpm foû di [%s]"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "dji n' sai lére les fitchîs rpm foû di [%s]: %s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "nou rpm di léjhou"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1077,78 +1077,78 @@ msgstr ""
"çoula pout ariver metans si vos avoz monté al mwin li ridant divant di "
"radjouter l' sopoirt d' astalaedje."
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "fitchî hdlist %s nén valide pol sopoirt «%s»"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "aberwetaedje do sourdant «hdlist» (ou del sinteze) po «%s»..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "«hdlist» (ou sinteze) ki vént d' esse sayî trové come «%s»"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "nou fitchî hdlist di trové pol sopoirt «%s»"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "corwaitaedje do fitchî avou l' clé publike da «%s»..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...aberwetaedje del clé %s do fitchî di clés publikes da «%s»"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "dji n' sai aberweter li clé publike da «%s»"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "dji screye li fitchî d' djivêye («list») pol sopoirt «%s»"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, c-format
msgid "updated medium \"%s\""
msgstr "sopoirt «%s» metou a djoû"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "dji n' sai analijhî li fitchî hdlist di «%s»"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "åk n' a nén stî tot lijhant li fitchî di sinteze do sopoirt «%s»"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "dji lét les tiestires do sopoirt «%s»"
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nn"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "OoAaYyWw"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "Mwaijhe tchuze, sayîz co ene feye\n"
@@ -1203,47 +1203,47 @@ msgstr "sopoirt «%s» nén cowerant, metou come bodjåve mins nel est nén vorm
msgid "unable to access medium \"%s\""
msgstr "dji n' sai aveur accès å sopoirt «%s»"
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "Nou pacaedje lomé %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "Les pacaedjes ki shuvèt ont å dvins %s: %s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "cåze di %s ki n' est nén la"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "cåze di %s ki n' est nén satisfyî"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "dji saye di promouvwer %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "po wårder %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "po-z astaler %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "cåze di conflits avou %s"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "nén dmandé"
@@ -1394,27 +1394,36 @@ msgstr "Rén a oister"
msgid "Checking to remove the following packages"
msgstr "Verifiaedje po oister les pacaedjes ki shuvèt"
-#: ../urpme:132
-#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr ""
+#: ../urpme:133
+#, fuzzy, c-format
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] ""
"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
"(%d Mo)"
+msgstr[1] ""
+"Po satisfyî les aloyaedjes, les %d pacaedjes ki shuvèt vont esse disastalés "
+"(%d Mo)"
+
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr ""
-#: ../urpme:134
+#: ../urpme:137
#, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "Oister %d pacaedje?"
msgstr[1] "Oister %d pacaedjes?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (o/N) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "Li oistaedje a fwait berwete"
@@ -1679,7 +1688,7 @@ msgstr " --vendor - vindeu do pacaedje.\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - li sopoirt wice ki l' pacaedje a stî trové\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr ""
@@ -1692,12 +1701,12 @@ msgid "Incorrect format: you may use only one multi-valued tag"
msgstr ""
"Cogne nén comifåt: vos n' poloz eployî k' ene seule etike multi-valixhances"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "eployant on evironmint specifike so %s\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1706,7 +1715,7 @@ msgstr ""
"Note: come nou sopoirt des cis cwerous n' eploye des hdlist, urpmf n' a nén "
"savou rtourner des rzultats\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr ""
@@ -2019,7 +2028,7 @@ msgstr ""
" --strict-arch - mete a djoû seulmint les pacaedjes pol minme "
"Ã¥rtchitecteure.\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - eployî --all-matches pol roye di comande.\n"
@@ -2239,109 +2248,106 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(c' est seulmint ene saye, l' astalaedje n' est nén fwait)"
-#: ../urpmi:598
-#, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
-
-#: ../urpmi:599
-#, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "Continouwer avou l' astalaedje d' %d pacaedje? (%d Mo)"
-msgstr[1] "Continouwer avou l' astalaedje di %d pacaedjes? (%d Mo)"
+#: ../urpmi:597
+#, fuzzy, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
+msgstr[1] "Continouwer avou l' astalaedje d' on pacaedje? (%d Mo)"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "Tapez so «enter» cwand c' est fwait..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "Rinoncî"
-#: ../urpmi:672
+#: ../urpmi:671
#, c-format
msgid "The following package has bad signature"
msgstr "Li pacaedje ki shût a-st ene mwaijhe sinateure"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "Les pacaedjes ki shuvèt ont ene mwaijhe sinateure"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "Voloz vs continouwer avou l' astalaedje?"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "L' astalåcion a fwait berwete"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "dji distribouwe %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "dj' astale %s a pårti di %s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "dj' astale %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "L' astalåcion a fwait berwete:"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "Sayî d' astaler sin verifyî les aloyaedjes? (o/N) "
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "Sayî d' astaler co pus foirt (--force)? (o/N) "
-#: ../urpmi:825
-#, c-format
-msgid "%d installation transactions failed"
-msgstr "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
+#: ../urpmi:815
+#, fuzzy, c-format
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
+msgstr[1] "I gn a-st avou %d transaccions d' astalaedje k' ont fwait berwete"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "L' astalaedje est possibe"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr "Les pacaedjes sont-st a djoû"
-#: ../urpmi:847
+#: ../urpmi:838
#, c-format
msgid "Package %s is already installed"
msgstr "Li pacaedje %s a ddja stî astalé"
-#: ../urpmi:848
+#: ../urpmi:839
#, c-format
msgid "Packages %s are already installed"
msgstr "Les pacaedjes %s ont ddja stî astalés"
-#: ../urpmi:851
+#: ../urpmi:842
#, c-format
msgid "Package %s can not be installed"
msgstr "Li pacaedje %s èn pout nén esse astalé"
-#: ../urpmi:852
+#: ../urpmi:843
#, c-format
msgid "Packages %s can not be installed"
msgstr "Les pacaedjes %s èn polèt nén esse astalés"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "renondant urpmi"
@@ -2598,8 +2604,10 @@ msgstr ""
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr ""
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] ""
+msgstr[1] ""
#: ../urpmi.recover:82
#, c-format
@@ -2900,59 +2908,61 @@ msgstr ""
" - ricweraedje å rvier sitindou (eto les forveyous "
"pacaedjes).\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr ""
+" -p - permete les rcweraedjes ezès aloyances po trover on "
+"pacaedje.\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - rexhowe en etir avou l' pacaedjes a oister.\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr ""
" -d - sitinde li cweraedje åzès aloyances des pacaedjes.\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - håyner les groupes ossu avou l' no.\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr ""
" -i - håyner des ahessåvès informåcions, dins ene cogne po les "
"djins.\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - djivêye des pacaedjes k' i gn a.\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, c-format
msgid " -m - equivalent to -du\n"
msgstr " -m - ekivalint a -du.\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr ""
-" -p - permete les rcweraedjes ezès aloyances po trover on "
-"pacaedje.\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - mostere li no, limeros di modêye eyet release.\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr ""
" -s - li pacaedje shuvant est on pacaedje sourdant\n"
" (parey ki --src).\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
@@ -2961,49 +2971,49 @@ msgstr ""
" -u - bodjî l' pacaedje foû del djivêye si ene modêye\n"
" pus nouve est ddja astalêye.\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - foirci des cweraedjes rishonnants (come --fuzzy).\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr ""
" -Y - come «-y» mins sins fé d' diferince inte grandes et "
"ptitès letes.\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " les nos ou fitchîs rpm dinés sol roye di comande sont rcwerous.\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes pout esse eployî seulmint avou --parallel"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a k' on rzultat parciel pol "
"pacaedje %s"
-#: ../urpmq:361
+#: ../urpmq:362
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a k' on rzultat parciel po "
"les pacaedjes %s"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a nou rzultat pol pacaedje %s"
-#: ../urpmq:365
+#: ../urpmq:366
#, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
@@ -3011,16 +3021,19 @@ msgstr ""
"pont d' fitchî «hdlist» pol sopoirt «%s», i n' a nou rzultat po les "
"pacaedjes %s"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "Nole djivêye di fitchîs di trovêye\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "Nou djournå des candjmints di trové\n"
+#~ msgid "Proceed with the installation of the %d package? (%d MB)"
+#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
+#~ msgstr[0] "Continouwer avou l' astalaedje d' %d pacaedje? (%d Mo)"
+#~ msgstr[1] "Continouwer avou l' astalaedje di %d pacaedjes? (%d Mo)"
+
+#~ msgid "No filelist found\n"
+#~ msgstr "Nole djivêye di fitchîs di trovêye\n"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d pacaedjes, %d Mo)"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7690691a..a525e4c2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -22,7 +22,7 @@ msgid ""
msgstr ""
"Project-Id-Version: zh_TW\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-21 13:05+0100\n"
+"POT-Creation-Date: 2007-03-18 11:32+0100\n"
"PO-Revision-Date: 2006-09-01 21:32+0800\n"
"Last-Translator: Shiva Huang <shivahuang@gmail.com>\n"
"Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -118,12 +118,12 @@ msgstr "å–消 (_C)"
msgid "Choose location to save file"
msgstr "é¸æ“‡å­˜æª”çš„ä½ç½®"
-#: ../gurpmi.pm:79
+#: ../gurpmi.pm:80
#, c-format
msgid "Unknown option %s"
msgstr "未知的é¸é … %s"
-#: ../gurpmi.pm:89
+#: ../gurpmi.pm:90
#, c-format
msgid "No packages specified"
msgstr "未指定套件"
@@ -154,7 +154,7 @@ msgstr ""
msgid "Warning"
msgstr "警告"
-#: ../gurpmi2:112 ../urpmi:629
+#: ../gurpmi2:112 ../urpmi:628
#, c-format
msgid "Ok"
msgstr "確定"
@@ -246,7 +246,7 @@ msgstr ""
"\n"
"您è¦ç¹¼çºŒå®‰è£å—Žï¼Ÿ"
-#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:690 ../urpmi:820
+#: ../gurpmi2:286 ../gurpmi2:341 ../urpmi:810
#, c-format
msgid ""
"Installation failed, some files are missing:\n"
@@ -257,7 +257,7 @@ msgstr ""
"%s\n"
"您或許è¦æ›´æ–°æ‚¨çš„ urpmi 資料庫"
-#: ../gurpmi2:292 ../urpme:138 ../urpmi:741
+#: ../gurpmi2:292 ../urpme:141 ../urpmi:731
#, c-format
msgid "removing %s"
msgstr "正在移除 %s"
@@ -277,10 +277,10 @@ msgstr "正在安è£å¥—件 `%s' (%s/%s)..."
msgid "_Done"
msgstr "å®Œæˆ (_D)"
-#: ../gurpmi2:339 ../urpmi:702 ../urpmi:780 ../urpmi:797
+#: ../gurpmi2:339 ../urpmi:752 ../urpmi:770 ../urpmi:787
#, c-format
-msgid "Installation failed"
-msgstr "安è£å¤±æ•—"
+msgid "Installation failed:"
+msgstr "安è£å¤±æ•—ï¼›"
#: ../gurpmi2:344
#, c-format
@@ -336,63 +336,63 @@ msgstr "åªæœ‰æ“有管ç†è€…權é™çš„使用者æ‰èƒ½å®‰è£å¥—件"
msgid "Running urpmi in restricted mode..."
msgstr "以é™åˆ¶æ¨¡å¼åŸ·è¡Œ urpmi..."
-#: ../urpm.pm:92
+#: ../urpm.pm:91
#, c-format
msgid "unable to open rpmdb"
msgstr "無法開啟 rpmdb"
-#: ../urpm.pm:111
+#: ../urpm.pm:110
#, c-format
msgid "found %d rpm headers in cache, removing %d obsolete headers"
msgstr ""
-#: ../urpm.pm:127
+#: ../urpm.pm:126
#, c-format
msgid "invalid rpm file name [%s]"
msgstr "無效的 rpm 檔案å稱 [%s]"
-#: ../urpm.pm:133
+#: ../urpm.pm:132
#, c-format
msgid "retrieving rpm file [%s] ..."
msgstr "æ­£åœ¨æ“·å– rpm 檔案 [%s] ..."
-#: ../urpm.pm:135 ../urpm/get_pkgs.pm:183
+#: ../urpm.pm:134 ../urpm/get_pkgs.pm:183
#, c-format
msgid "...retrieving done"
msgstr "...æ“·å–完æˆ"
-#: ../urpm.pm:138 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
-#: ../urpm/media.pm:746 ../urpm/media.pm:1259 ../urpm/media.pm:1481
+#: ../urpm.pm:137 ../urpm/download.pm:603 ../urpm/get_pkgs.pm:185
+#: ../urpm/media.pm:747 ../urpm/media.pm:1260 ../urpm/media.pm:1482
#, c-format
msgid "...retrieving failed: %s"
msgstr "...æ“·å–失敗:%s"
-#: ../urpm.pm:143
+#: ../urpm.pm:142
#, c-format
msgid "unable to access rpm file [%s]"
msgstr "ç„¡æ³•å­˜å– rpm 檔案 [%s]"
-#: ../urpm.pm:148
+#: ../urpm.pm:147
#, c-format
msgid "unable to parse spec file %s [%s]"
msgstr "ç„¡æ³•è§£æž spec 檔案 %s [%s]"
-#: ../urpm.pm:158
+#: ../urpm.pm:157
#, c-format
msgid "unable to register rpm file"
msgstr "無法註冊 rpm 檔案"
-#: ../urpm.pm:160
+#: ../urpm.pm:159
#, c-format
msgid "Incompatible architecture for rpm [%s]"
msgstr "與 RPM 檔案 [%s] ä¸ç›¸å®¹çš„硬體架構"
-#: ../urpm.pm:164
+#: ../urpm.pm:163
#, c-format
msgid "error registering local packages"
msgstr "註冊本地端套件錯誤"
-#: ../urpm.pm:260
+#: ../urpm.pm:259
#, c-format
msgid "This operation is forbidden while running in restricted mode"
msgstr "使用é™åˆ¶æ¨¡å¼åŸ·è¡Œæ™‚ç¦æ­¢è©²æ“作程åº"
@@ -432,7 +432,7 @@ msgstr ""
msgid "Too many arguments\n"
msgstr "åƒæ•¸å¤ªå¤š\n"
-#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1142
+#: ../urpm/bug_report.pm:36 ../urpm/media.pm:1143
#, c-format
msgid "built hdlist synthesis file for medium \"%s\""
msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
@@ -457,7 +457,7 @@ msgstr "無法寫入設定檔 [%s]"
msgid "medium `%s' is defined twice, aborting"
msgstr ""
-#: ../urpm/cfg.pm:226 ../urpm/media.pm:449
+#: ../urpm/cfg.pm:226 ../urpm/media.pm:450
#, c-format
msgid "unable to write config file [%s]"
msgstr "無法寫入設定檔 [%s]"
@@ -587,7 +587,7 @@ msgstr "有多個套件具有相åŒçš„ rpm 檔å \"%s\""
msgid "unable to correctly parse [%s] on value \"%s\""
msgstr "在值 \"%2$s\" ä¸Šç„¡æ³•æ­£ç¢ºè§£æž [%1$s]"
-#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:219
+#: ../urpm/get_pkgs.pm:100 ../urpm/media.pm:220
#, c-format
msgid "unable to access list file of \"%s\", medium ignored"
msgstr "ç„¡æ³•å­˜å– \"%s\" 的列表,忽略這個媒體"
@@ -722,331 +722,331 @@ msgstr "警告:在 MD5SUM 檔案中找ä¸åˆ° %s çš„ md5sum"
msgid "computing md5sum of existing source hdlist (or synthesis) [%s]"
msgstr "è¨ˆç®—ä¾†æº hdlist (或 synthesis) çš„ md5sum"
-#: ../urpm/media.pm:171
+#: ../urpm/media.pm:172
#, c-format
msgid ""
"virtual medium \"%s\" should not have defined hdlist or list file, medium "
"ignored"
msgstr "虛擬媒體 \"%s\" ä¸æ‡‰è©²æŒ‡å®š hdlist 或列表檔案,忽略這個媒體"
-#: ../urpm/media.pm:175
+#: ../urpm/media.pm:176
#, c-format
msgid "virtual medium \"%s\" should have a clear url, medium ignored"
msgstr "虛擬媒體 \"%s\" 應該有一個清楚的 url,忽略這個媒體"
-#: ../urpm/media.pm:183
+#: ../urpm/media.pm:184
#, fuzzy, c-format
msgid "invalid hdlist name"
msgstr "無效的 rpm 檔案å稱 [%s]"
-#: ../urpm/media.pm:190
+#: ../urpm/media.pm:191
#, c-format
msgid "unable to find list file for \"%s\", medium ignored"
msgstr "無法找到 \"%s\" 的列表檔案,忽略這個媒體"
-#: ../urpm/media.pm:203
+#: ../urpm/media.pm:204
#, fuzzy, c-format
msgid "\"synthesis\" should not be set (medium \"%s\")"
msgstr "正在嘗試é¸æ“‡ä¸å­˜åœ¨çš„媒體 \"%s\""
-#: ../urpm/media.pm:206
+#: ../urpm/media.pm:207
#, fuzzy, c-format
msgid "\"synthesis\" should be set (medium \"%s\")"
msgstr "為媒體 \"%s\" 建立 hdlist synthesis 檔"
-#: ../urpm/media.pm:209 ../urpm/media.pm:1419 ../urpm/media.pm:1507
+#: ../urpm/media.pm:210 ../urpm/media.pm:1420 ../urpm/media.pm:1508
#, c-format
msgid "unable to access hdlist file of \"%s\", medium ignored"
msgstr "ç„¡æ³•å­˜å– \"%s\" çš„ hdlist 檔案,忽略這個媒體"
-#: ../urpm/media.pm:215
+#: ../urpm/media.pm:216
#, fuzzy, c-format
msgid "unable to access list file of \"%s\""
msgstr "ç„¡æ³•è§£æž \"%s\" çš„ hdlist 檔案"
-#: ../urpm/media.pm:229
+#: ../urpm/media.pm:230
#, c-format
msgid "medium \"%s\" trying to use an already used hdlist, medium ignored"
msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的 hdlist,忽略這個媒體"
-#: ../urpm/media.pm:230
+#: ../urpm/media.pm:231
#, c-format
msgid "medium \"%s\" trying to use an already used list, medium ignored"
msgstr "媒體 \"%s\" 正在嘗試使用一個已經被使用的列表,忽略這個媒體"
-#: ../urpm/media.pm:255
+#: ../urpm/media.pm:256
#, c-format
msgid "trying to override existing medium \"%s\", skipping"
msgstr "正在嘗試跳éŽå·²å­˜åœ¨åª’é«” \"%s\",正在跳éŽ"
-#: ../urpm/media.pm:398
+#: ../urpm/media.pm:399
#, c-format
msgid "too many mount points for removable medium \"%s\""
msgstr "å¯ç§»é™¤å¼åª’é«” \"%s\" 的掛載點éŽå¤š"
-#: ../urpm/media.pm:399
+#: ../urpm/media.pm:400
#, c-format
msgid "taking removable device as \"%s\""
msgstr "å°‡å¯ç§»é™¤å¼è£ç½®ç•¶æˆ \"%s\""
-#: ../urpm/media.pm:402
+#: ../urpm/media.pm:403
#, c-format
msgid "Medium \"%s\" is an ISO image, will be mounted on-the-fly"
msgstr "媒體 \"%s\" 是一個光碟映åƒæª”,將立å³æŽ›è¼‰èµ·ä¾†"
-#: ../urpm/media.pm:405
+#: ../urpm/media.pm:406
#, c-format
msgid "using different removable device [%s] for \"%s\""
msgstr "使用ä¸åŒçš„å¯ç§»é™¤å¼è£ç½® [%s] æ–¼ \"%s\" "
-#: ../urpm/media.pm:410 ../urpm/media.pm:413
+#: ../urpm/media.pm:411 ../urpm/media.pm:414
#, c-format
msgid "unable to retrieve pathname for removable medium \"%s\""
msgstr "無法擷å–å¯ç§»é™¤å¼åª’é«” \"%s\" 的路徑å稱"
-#: ../urpm/media.pm:428
+#: ../urpm/media.pm:429
#, c-format
msgid "wrote %s"
msgstr ""
-#: ../urpm/media.pm:451
+#: ../urpm/media.pm:452
#, c-format
msgid "wrote config file [%s]"
msgstr "寫入設定檔 [%s]"
-#: ../urpm/media.pm:496
+#: ../urpm/media.pm:497
#, c-format
msgid "Can't use parallel mode with use-distrib mode"
msgstr "無法於 use-distrib 模å¼ä¸‹ä½¿ç”¨åŒæ­¥ç®¡ç†æ¨¡å¼"
-#: ../urpm/media.pm:504
+#: ../urpm/media.pm:505
#, c-format
msgid "using associated media for parallel mode: %s"
msgstr "æ–¼åŒæ­¥ç®¡ç†æ¨¡å¼ä½¿ç”¨ç›¸é—œé€£çš„媒體:%s"
-#: ../urpm/media.pm:520
-#, fuzzy, c-format
+#: ../urpm/media.pm:521
+#, c-format
msgid ""
"--synthesis cannot be used with --media, --excludemedia, --sortmedia, --"
"update, --use-distrib or --parallel"
msgstr ""
-"--synthesis ä¸èƒ½å¤ èˆ‡ --mediaã€--excludemediaã€--sortmediaã€--update ä»¥åŠ --"
-"parallel 一起使用"
+"--synthesis ä¸èƒ½å¤ èˆ‡ --mediaã€--excludemediaã€--sortmediaã€--updateã€--use-"
+"distrib ä»¥åŠ --parallel 一起使用"
-#: ../urpm/media.pm:586
+#: ../urpm/media.pm:587
#, fuzzy, c-format
msgid "Note: no hdlist for medium \"%s\", unable to return any result for it"
msgstr ""
"注æ„:因為所有æœå°‹éŽçš„媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何çµæžœ\n"
-#: ../urpm/media.pm:596
+#: ../urpm/media.pm:597
#, c-format
msgid "Search start: %s end: %s"
msgstr "æœå°‹é–‹å§‹æ–¼ï¼š%s çµæŸæ–¼ï¼š%s"
-#: ../urpm/media.pm:605 ../urpm/media.pm:1802
+#: ../urpm/media.pm:606 ../urpm/media.pm:1803
#, c-format
msgid "performing second pass to compute dependencies\n"
msgstr "正在進行第二個步驟,相ä¾æ€§çš„計算\n"
-#: ../urpm/media.pm:621
+#: ../urpm/media.pm:622
#, c-format
msgid "skipping package %s"
msgstr "正在略éŽå¥—件 %s"
-#: ../urpm/media.pm:637
+#: ../urpm/media.pm:638
#, c-format
msgid "would install instead of upgrade package %s"
msgstr "將會安è£è€Œéžå‡ç´šå¥—件 %s"
-#: ../urpm/media.pm:662
+#: ../urpm/media.pm:663
#, c-format
msgid "medium \"%s\" already exists"
msgstr "媒體 \"%s\" 已經存在"
-#: ../urpm/media.pm:677
+#: ../urpm/media.pm:678
#, c-format
msgid "virtual medium needs to be local"
msgstr "虛擬媒體必須在本地端"
-#: ../urpm/media.pm:691
+#: ../urpm/media.pm:692
#, c-format
msgid "(ignored by default)"
msgstr ""
-#: ../urpm/media.pm:697
+#: ../urpm/media.pm:698
#, fuzzy, c-format
msgid "adding medium \"%s\" before remote medium \"%s\""
msgstr "正在讀å–媒體 \"%s\" 的標頭"
-#: ../urpm/media.pm:703
+#: ../urpm/media.pm:704
#, fuzzy, c-format
msgid "adding medium \"%s\""
msgstr "移除媒體 \"%s\""
-#: ../urpm/media.pm:729
+#: ../urpm/media.pm:730
#, fuzzy, c-format
msgid "unable to mount the distribution medium"
msgstr "無法存å–第一個安è£åª’é«”"
-#: ../urpm/media.pm:732
+#: ../urpm/media.pm:733
#, fuzzy, c-format
msgid "this location doesn't seem to contain any distribution"
msgstr "這個 url 看起來並沒有包å«ä»»ä½•æ•£ä½ˆå¥—件"
-#: ../urpm/media.pm:739
+#: ../urpm/media.pm:740
#, c-format
msgid "retrieving media.cfg file..."
msgstr "æ­£åœ¨æ“·å– media.cfg 檔案..."
-#: ../urpm/media.pm:744
+#: ../urpm/media.pm:745
#, c-format
msgid "unable to parse media.cfg"
msgstr "ç„¡æ³•è§£æž media.cfg"
-#: ../urpm/media.pm:747
+#: ../urpm/media.pm:748
#, fuzzy, c-format
msgid "unable to access the distribution medium (no media.cfg file found)"
msgstr "無法存å–第一個安è£åª’é«” (找ä¸åˆ° hdlists 檔案)"
-#: ../urpm/media.pm:826
+#: ../urpm/media.pm:827
#, c-format
msgid "trying to select nonexistent medium \"%s\""
msgstr "正在嘗試é¸æ“‡ä¸å­˜åœ¨çš„媒體 \"%s\""
-#: ../urpm/media.pm:829
+#: ../urpm/media.pm:830
#, c-format
msgid "selecting multiple media: %s"
msgstr "正在é¸æ“‡å¤šå€‹åª’體:\"%s\""
-#: ../urpm/media.pm:849
+#: ../urpm/media.pm:850
#, c-format
msgid "removing medium \"%s\""
msgstr "移除媒體 \"%s\""
-#: ../urpm/media.pm:940
+#: ../urpm/media.pm:941
#, c-format
msgid "reconfiguring urpmi for media \"%s\""
msgstr "正在é‡æ–°è¨­å®šåª’é«” \"%s\" çš„ urpmi 設定"
-#: ../urpm/media.pm:979
+#: ../urpm/media.pm:980
#, c-format
msgid "...reconfiguration failed"
msgstr "é‡æ–°è¨­å®šå¤±æ•—"
-#: ../urpm/media.pm:985
+#: ../urpm/media.pm:986
#, c-format
msgid "reconfiguration done"
msgstr "é‡æ–°è¨­å®šå®Œæˆ"
-#: ../urpm/media.pm:1033
+#: ../urpm/media.pm:1034
#, c-format
msgid "Error generating names file: dependency %d not found"
msgstr "生æˆå稱檔案時發生錯誤:相ä¾æ€§ %d 沒有找到"
-#: ../urpm/media.pm:1037
+#: ../urpm/media.pm:1038
#, c-format
msgid "Error generating names file: Can't write to file (%s)"
msgstr "生æˆå稱檔案時發生錯誤:無法寫入檔案 (%s)"
-#: ../urpm/media.pm:1072
+#: ../urpm/media.pm:1073
#, fuzzy, c-format
msgid "medium \"%s\" is up-to-date"
msgstr "媒體 \"%s\" 沒有被é¸å–"
-#: ../urpm/media.pm:1092
+#: ../urpm/media.pm:1093
#, c-format
msgid "examining hdlist file [%s]"
msgstr "檢驗 hdlist 檔案 [%s]"
-#: ../urpm/media.pm:1102
+#: ../urpm/media.pm:1103
#, c-format
msgid "examining synthesis file [%s]"
msgstr "檢驗 synthesis 檔案 [%s]"
-#: ../urpm/media.pm:1119
+#: ../urpm/media.pm:1120
#, c-format
msgid "building hdlist [%s]"
msgstr "正在建立 hdlist [%s]"
-#: ../urpm/media.pm:1138
+#: ../urpm/media.pm:1139
#, c-format
msgid ""
"Unable to build synthesis file for medium \"%s\". Your hdlist file may be "
"corrupted."
msgstr "無法為媒介 \"%s\" 建立 synthesis 檔。您的 hdlist 檔å¯èƒ½ä¸¦ä¸æ¨™æº–。"
-#: ../urpm/media.pm:1157
+#: ../urpm/media.pm:1158
#, c-format
msgid "problem reading hdlist or synthesis file of medium \"%s\""
msgstr "è®€å– \"%s\" 媒體的 hdlist 或 synthesis 檔案時發生å•é¡Œ"
-#: ../urpm/media.pm:1169 ../urpm/media.pm:1207 ../urpm/media.pm:1494
+#: ../urpm/media.pm:1170 ../urpm/media.pm:1208 ../urpm/media.pm:1495
#, c-format
msgid "...copying failed"
msgstr "...複製失敗"
-#: ../urpm/media.pm:1203
+#: ../urpm/media.pm:1204
#, c-format
msgid "copying description file of \"%s\"..."
msgstr "正在複製 \"%s\" 的敘述檔案..."
-#: ../urpm/media.pm:1205 ../urpm/media.pm:1236
+#: ../urpm/media.pm:1206 ../urpm/media.pm:1237
#, c-format
msgid "...copying done"
msgstr "...複製完æˆ"
-#: ../urpm/media.pm:1232
+#: ../urpm/media.pm:1233
#, fuzzy, c-format
msgid "copying [%s] for medium \"%s\"..."
msgstr "正在寫入媒體 \"%s\" 的列表檔"
-#: ../urpm/media.pm:1238
+#: ../urpm/media.pm:1239
#, c-format
msgid "copy of [%s] failed (file is suspiciously small)"
msgstr "複製 [%s] 失敗 (檔案å°å¾—å¯ç–‘)"
-#: ../urpm/media.pm:1271
+#: ../urpm/media.pm:1272
#, c-format
msgid "computing md5sum of copied source hdlist (or synthesis)"
msgstr "æ­£åœ¨è¨ˆç®—è¤‡è£½çš„ä¾†æº hdlist (或 synthesis) çš„ md5sum"
-#: ../urpm/media.pm:1273
+#: ../urpm/media.pm:1274
#, c-format
msgid "copy of [%s] failed (md5sum mismatch)"
msgstr "複製 [%s] 失敗 (md5sum ä¸åˆ)"
-#: ../urpm/media.pm:1285
+#: ../urpm/media.pm:1286
#, c-format
msgid "computing md5sum of retrieved source hdlist (or synthesis)"
msgstr "æ­£åœ¨è¨ˆç®—ä¾†æº hdlist (或 synthesis) çš„ md5sum"
-#: ../urpm/media.pm:1287
+#: ../urpm/media.pm:1288
#, c-format
msgid "...retrieving failed: md5sum mismatch"
msgstr "...æ“·å–失敗:md5sum ä¸åˆ"
-#: ../urpm/media.pm:1302
+#: ../urpm/media.pm:1303
#, c-format
msgid "no rpm files found from [%s]"
msgstr "在 [%s] 內找ä¸åˆ° rpm 檔案"
-#: ../urpm/media.pm:1309
+#: ../urpm/media.pm:1310
#, c-format
msgid "reading rpm files from [%s]"
msgstr "ç”± [%s] è®€å– rpm 檔案"
-#: ../urpm/media.pm:1324
+#: ../urpm/media.pm:1325
#, c-format
msgid "unable to read rpm files from [%s]: %s"
msgstr "無法由 [%s] è®€å– rpm 套件:%s"
-#: ../urpm/media.pm:1334
+#: ../urpm/media.pm:1335
#, c-format
msgid "no rpms read"
msgstr "沒有讀å–到任何的 rpm"
-#: ../urpm/media.pm:1364
+#: ../urpm/media.pm:1365
#, c-format
msgid ""
"unable to access medium \"%s\",\n"
@@ -1056,78 +1056,78 @@ msgstr ""
"無法存å–媒體 \"%s\",\n"
"這å¯èƒ½æ˜¯å› ç‚ºæ‚¨å»ºç«‹åª’體時是手動將這個目錄掛載到系統裡的。"
-#: ../urpm/media.pm:1377
+#: ../urpm/media.pm:1378
#, fuzzy, c-format
msgid "invalid hdlist file %s for medium \"%s\""
msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
-#: ../urpm/media.pm:1457
+#: ../urpm/media.pm:1458
#, c-format
msgid "retrieving source hdlist (or synthesis) of \"%s\"..."
msgstr "æ­£åœ¨æ“·å– \"%s\" çš„ä¾†æº hdlist (或 synthesis)..."
-#: ../urpm/media.pm:1473
+#: ../urpm/media.pm:1474
#, c-format
msgid "found probed hdlist (or synthesis) as %s"
msgstr "發ç¾å°‹æ‰¾åˆ°çš„ hdlist (或 synthesis) 為 %s"
-#: ../urpm/media.pm:1480 ../urpm/media.pm:1612
+#: ../urpm/media.pm:1481 ../urpm/media.pm:1613
#, c-format
msgid "no hdlist file found for medium \"%s\""
msgstr "沒有找到媒體 \"%s\" 的 hdlist 檔案"
-#: ../urpm/media.pm:1532
+#: ../urpm/media.pm:1533
#, c-format
msgid "examining pubkey file of \"%s\"..."
msgstr "檢驗 \"%s\" 的公鑰..."
-#: ../urpm/media.pm:1544
+#: ../urpm/media.pm:1545
#, c-format
msgid "...imported key %s from pubkey file of \"%s\""
msgstr "...由 \"%2$s\" 的公鑰檔案匯入鑰匙 %1$s"
-#: ../urpm/media.pm:1547
+#: ../urpm/media.pm:1548
#, c-format
msgid "unable to import pubkey file of \"%s\""
msgstr "無法匯入 \"%s\" 的公鑰"
-#: ../urpm/media.pm:1563
+#: ../urpm/media.pm:1564
#, c-format
msgid "writing list file for medium \"%s\""
msgstr "正在寫入媒體 \"%s\" 的列表檔"
-#: ../urpm/media.pm:1621 ../urpm/media.pm:1651
+#: ../urpm/media.pm:1622 ../urpm/media.pm:1652
#, fuzzy, c-format
msgid "updated medium \"%s\""
msgstr "加入的媒體 %s"
-#: ../urpm/media.pm:1638
+#: ../urpm/media.pm:1639
#, c-format
msgid "unable to parse hdlist file of \"%s\""
msgstr "ç„¡æ³•è§£æž \"%s\" çš„ hdlist 檔案"
-#: ../urpm/media.pm:1644
+#: ../urpm/media.pm:1645
#, c-format
msgid "problem reading synthesis file of medium \"%s\""
msgstr "è®€å– \"%s\" 媒體的 synthesis 檔案時發生å•é¡Œ"
-#: ../urpm/media.pm:1709
+#: ../urpm/media.pm:1710
#, c-format
msgid "reading headers from medium \"%s\""
msgstr "正在讀å–媒體 \"%s\" 的標頭"
-#: ../urpm/msg.pm:51 ../urpmi:488 ../urpmi:508 ../urpmi:602
+#: ../urpm/msg.pm:62 ../urpmi:488 ../urpmi:508 ../urpmi:602
#, c-format
msgid "Nn"
msgstr "Nnå¦"
-#: ../urpm/msg.pm:52 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
-#: ../urpmi:603 ../urpmi:681 ../urpmi:768 ../urpmi.addmedia:134
+#: ../urpm/msg.pm:63 ../urpme:36 ../urpmi:489 ../urpmi:509 ../urpmi:552
+#: ../urpmi:603 ../urpmi:680 ../urpmi:758 ../urpmi.addmedia:134
#, c-format
msgid "Yy"
msgstr "Yy是"
-#: ../urpm/msg.pm:101
+#: ../urpm/msg.pm:112
#, c-format
msgid "Sorry, bad choice, try again\n"
msgstr "抱歉,é¸æ“‡éŒ¯èª¤ï¼Œè«‹å†è©¦ä¸€æ¬¡\n"
@@ -1182,47 +1182,47 @@ msgstr "自相矛盾的媒體 \"%s\" 標示為å¯ç§»é™¤ä½†æ˜¯äº‹å¯¦ä¸Šå»ä¸æ˜¯é
msgid "unable to access medium \"%s\""
msgstr "無法存å–媒體 \"%s\" "
-#: ../urpm/select.pm:115
+#: ../urpm/select.pm:113
#, c-format
msgid "No package named %s"
msgstr "沒有套件命å為 %s"
-#: ../urpm/select.pm:117 ../urpme:112
+#: ../urpm/select.pm:115 ../urpme:112
#, c-format
msgid "The following packages contain %s: %s"
msgstr "ä»¥ä¸‹å¥—ä»¶åŒ…å« %s:%s"
-#: ../urpm/select.pm:398 ../urpm/select.pm:438
+#: ../urpm/select.pm:394 ../urpm/select.pm:434
#, c-format
msgid "due to missing %s"
msgstr "由於éºå¤±äº† %s"
-#: ../urpm/select.pm:399 ../urpm/select.pm:436
+#: ../urpm/select.pm:395 ../urpm/select.pm:432
#, c-format
msgid "due to unsatisfied %s"
msgstr "由於未滿足 %s"
-#: ../urpm/select.pm:405
+#: ../urpm/select.pm:401
#, c-format
msgid "trying to promote %s"
msgstr "正在試著促進 %s"
-#: ../urpm/select.pm:406
+#: ../urpm/select.pm:402
#, c-format
msgid "in order to keep %s"
msgstr "為了è¦ä¿ç•™ %s"
-#: ../urpm/select.pm:432
+#: ../urpm/select.pm:428
#, c-format
msgid "in order to install %s"
msgstr "為了è¦å®‰è£ %s"
-#: ../urpm/select.pm:442
+#: ../urpm/select.pm:438
#, c-format
msgid "due to conflicts with %s"
msgstr "由於與 %s 發生è¡çª"
-#: ../urpm/select.pm:444
+#: ../urpm/select.pm:440
#, c-format
msgid "unrequested"
msgstr "未被è¦æ±‚"
@@ -1365,24 +1365,30 @@ msgstr "沒有æ±è¥¿å¯ç§»é™¤"
msgid "Checking to remove the following packages"
msgstr "正在檢查以移除下列套件"
-#: ../urpme:132
+#: ../urpme:133
#, c-format
-msgid ""
-"To satisfy dependencies, the following %d packages will be removed (%d MB)"
-msgstr "為了滿足相ä¾æ€§ï¼Œä¸‹åˆ— %d 個套件將被移除 (%d MB)"
+msgid "To satisfy dependencies, the following package will be removed"
+msgid_plural ""
+"To satisfy dependencies, the following %d packages will be removed"
+msgstr[0] "為了滿足相ä¾æ€§ï¼Œä¸‹åˆ— %d 個套件將被移除"
-#: ../urpme:134
+#: ../urpme:135 ../urpmi:600
+#, c-format
+msgid " (%d MB)"
+msgstr " (%d MB)"
+
+#: ../urpme:137
#, fuzzy, c-format
msgid "Remove %d package?"
msgid_plural "Remove %d packages?"
msgstr[0] "è¦ç§»é™¤é€™ %d 個套件嗎?"
-#: ../urpme:134 ../urpmi:553 ../urpmi:682 ../urpmi.addmedia:137
+#: ../urpme:137 ../urpmi:553 ../urpmi:681 ../urpmi.addmedia:137
#, c-format
msgid " (y/N) "
msgstr " (y/N) (是/å¦) "
-#: ../urpme:156
+#: ../urpme:159
#, c-format
msgid "Removal failed"
msgstr "移除失敗"
@@ -1632,7 +1638,7 @@ msgstr " --vendor - æ供者\n"
msgid " -m - the media in which the package was found\n"
msgstr " -m - 這個套件被找到的媒介\n"
-#: ../urpmf:82 ../urpmq:93
+#: ../urpmf:82 ../urpmq:95
#, c-format
msgid " -f - print version, release and arch with name.\n"
msgstr " -f - 顯示版本ã€ç™¼è¡Œç·¨è™Ÿèˆ‡å¹³å°ã€‚\n"
@@ -1642,12 +1648,12 @@ msgstr " -f - 顯示版本ã€ç™¼è¡Œç·¨è™Ÿèˆ‡å¹³å°ã€‚\n"
msgid "Incorrect format: you may use only one multi-valued tag"
msgstr "æ ¼å¼éŒ¯èª¤ï¼šæ‚¨åªèƒ½ä½¿ç”¨ä¸€å€‹å¤šå€¼æ¨™ç±¤"
-#: ../urpmf:186 ../urpmi:254 ../urpmq:136
+#: ../urpmf:186 ../urpmi:254 ../urpmq:137
#, c-format
msgid "using specific environment on %s\n"
msgstr "正在 %s 上使用特定的環境\n"
-#: ../urpmf:226
+#: ../urpmf:223
#, c-format
msgid ""
"Note: since no media searched uses hdlists, urpmf was unable to return any "
@@ -1655,7 +1661,7 @@ msgid ""
msgstr ""
"注æ„:因為所有æœå°‹éŽçš„媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何çµæžœ\n"
-#: ../urpmf:227
+#: ../urpmf:224
#, c-format
msgid "You may want to use --name to search for package names.\n"
msgstr "您或許想è¦ä½¿ç”¨ --name åƒæ•¸ä¾†æœå°‹å¥—件å稱。\n"
@@ -1940,7 +1946,7 @@ msgstr " --nolock - ä¸éŽ–定 RPM 資料庫。\n"
msgid " --strict-arch - upgrade only packages with the same architecture.\n"
msgstr " --strict-arch - åªå‡ç´šç›¸åŒå¹³å°çš„套件。\n"
-#: ../urpmi:152 ../urpmq:90
+#: ../urpmi:152 ../urpmq:92
#, c-format
msgid " -a - select all matches on command line.\n"
msgstr " -a - é¸æ“‡å‘½ä»¤åˆ—中所有符åˆçš„項目。\n"
@@ -2149,108 +2155,104 @@ msgstr ""
msgid "(test only, installation will not be actually done)"
msgstr "(僅測試,安è£å‹•ä½œä¸¦ä¸æœƒçœŸçš„執行)"
-#: ../urpmi:598
-#, fuzzy, c-format
-msgid "Proceed with the installation of 1 package? (%d MB)"
-msgstr "繼續安è£é€™ %d 個套件?(å…± %d MB)"
-
-#: ../urpmi:599
-#, fuzzy, c-format
-msgid "Proceed with the installation of the %d package? (%d MB)"
-msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-msgstr[0] "繼續安è£é€™ %d 個套件?(å…± %d MB)"
+#: ../urpmi:597
+#, c-format
+msgid "Proceed with the installation of one package?"
+msgid_plural "Proceed with the installation of the %d packages?"
+msgstr[0] "繼續安è£é€™ %d 個套件?"
#: ../urpmi:623
#, c-format
msgid "Press Enter when ready..."
msgstr "準備好時請按 Enter..."
-#: ../urpmi:629
+#: ../urpmi:628
#, c-format
msgid "Cancel"
msgstr "å–消"
-#: ../urpmi:672
+#: ../urpmi:671
#, fuzzy, c-format
msgid "The following package has bad signature"
msgstr "下列套件有ä¸æ­£ç¢ºçš„簽章"
-#: ../urpmi:673
+#: ../urpmi:672
#, c-format
msgid "The following packages have bad signatures"
msgstr "下列套件有ä¸æ­£ç¢ºçš„簽章"
-#: ../urpmi:674
+#: ../urpmi:673
#, c-format
msgid "Do you want to continue installation ?"
msgstr "您è¦ç¹¼çºŒå®‰è£å—Žï¼Ÿ"
-#: ../urpmi:721
+#: ../urpmi:692
+#, c-format
+msgid "Installation failed"
+msgstr "安è£å¤±æ•—"
+
+#: ../urpmi:711
#, c-format
msgid "distributing %s"
msgstr "正在發佈 %s"
-#: ../urpmi:735
+#: ../urpmi:725
#, c-format
msgid "installing %s from %s"
msgstr "正在由 %2$s å®‰è£ %1$s"
-#: ../urpmi:737
+#: ../urpmi:727
#, c-format
msgid "installing %s"
msgstr "æ­£åœ¨å®‰è£ %s"
-#: ../urpmi:762
-#, c-format
-msgid "Installation failed:"
-msgstr "安è£å¤±æ•—ï¼›"
-
-#: ../urpmi:769
+#: ../urpmi:759
#, c-format
msgid "Try installation without checking dependencies? (y/N) "
msgstr "嘗試ä¸æª¢æŸ¥ç›¸ä¾æ€§ç›´æŽ¥å®‰è£ï¼Ÿ (y/N)(是/å¦)"
-#: ../urpmi:786
+#: ../urpmi:776
#, c-format
msgid "Try harder to install (--force)? (y/N) "
msgstr "嘗試採用強制安è£çš„æ–¹å¼ (--force)? (y/N)(是/å¦)"
-#: ../urpmi:825
+#: ../urpmi:815
#, c-format
-msgid "%d installation transactions failed"
-msgstr "%d 個安è£ç¨‹åºå¤±æ•—"
+msgid "%d installation transaction failed"
+msgid_plural "%d installation transactions failed"
+msgstr[0] "%d 個安è£ç¨‹åºå¤±æ•—"
-#: ../urpmi:834
+#: ../urpmi:825
#, c-format
msgid "Installation is possible"
msgstr "å¯ä»¥å®‰è£"
-#: ../urpmi:839
+#: ../urpmi:830
#, c-format
msgid "Packages are up to date"
msgstr ""
-#: ../urpmi:847
+#: ../urpmi:838
#, fuzzy, c-format
msgid "Package %s is already installed"
msgstr "æ¯å€‹å¥—件都已經安è£äº†"
-#: ../urpmi:848
+#: ../urpmi:839
#, fuzzy, c-format
msgid "Packages %s are already installed"
msgstr "æ¯å€‹å¥—件都已經安è£äº†"
-#: ../urpmi:851
+#: ../urpmi:842
#, fuzzy, c-format
msgid "Package %s can not be installed"
msgstr "æ¯å€‹å¥—件都已經安è£äº†"
-#: ../urpmi:852
+#: ../urpmi:843
#, fuzzy, c-format
msgid "Packages %s can not be installed"
msgstr "æ¯å€‹å¥—件都已經安è£äº†"
-#: ../urpmi:871
+#: ../urpmi:862
#, c-format
msgid "restarting urpmi"
msgstr "正在é‡æ–°å•Ÿå‹• urpmi"
@@ -2499,8 +2501,9 @@ msgstr "正在清除é‡æ–°æ‰“包目錄 [%s]...\n"
#: ../urpmi.recover:72
#, c-format
-msgid "%d files removed\n"
-msgstr "移除了 %d 個檔案\n"
+msgid "%d file removed\n"
+msgid_plural "%d files removed\n"
+msgstr[0] "移除了 %d 個檔案\n"
#: ../urpmi.recover:82
#, c-format
@@ -2782,119 +2785,118 @@ msgstr ""
" --whatrequires-recursive\n"
" - 進階逆å‘æœå°‹ (包å«è™›æ“¬å¥—件)。\n"
-#: ../urpmq:91
+#: ../urpmq:90
+#, fuzzy, c-format
+msgid ""
+" --whatprovides, -p\n"
+" - search in provides to find package.\n"
+msgstr " -p - æ–¼ provides 中æœå°‹å¥—件。\n"
+
+#: ../urpmq:93
#, c-format
msgid " -c - complete output with package to be removed.\n"
msgstr " -c - 完整輸出è¦ç§»é™¤çš„套件。\n"
-#: ../urpmq:92
+#: ../urpmq:94
#, c-format
msgid " -d - extend query to package dependencies.\n"
msgstr " -d - 延伸套件相ä¾æ€§çš„查詢。\n"
-#: ../urpmq:94
+#: ../urpmq:96
#, c-format
msgid " -g - print groups with name also.\n"
msgstr " -g - 顯示群組å稱。\n"
-#: ../urpmq:95
+#: ../urpmq:97
#, c-format
msgid " -i - print useful information in human readable form.\n"
msgstr " -i - 以人類å¯è®€çš„å½¢å¼é¡¯ç¤ºæœ‰ç”¨è³‡è¨Šã€‚\n"
-#: ../urpmq:96
+#: ../urpmq:98
#, c-format
msgid " -l - list files in package.\n"
msgstr " -l - 列出套件內包å«çš„檔案。\n"
-#: ../urpmq:97
+#: ../urpmq:99
#, fuzzy, c-format
msgid " -m - equivalent to -du\n"
msgstr " -q - 安éœæ¨¡å¼ã€‚\n"
-#: ../urpmq:98
-#, c-format
-msgid " -p - search in provides to find package.\n"
-msgstr " -p - æ–¼ provides 中æœå°‹å¥—件。\n"
-
-#: ../urpmq:99
+#: ../urpmq:100
#, c-format
msgid " -r - print version and release with name also.\n"
msgstr " -r - 顯示å稱時一併顯示版本號與發行編號。\n"
-#: ../urpmq:100
+#: ../urpmq:101
#, c-format
msgid " -s - next package is a source package (same as --src).\n"
msgstr " -s - 下個套件是原始碼套件 (與 --src 相åŒ)。\n"
-#: ../urpmq:101
+#: ../urpmq:102
#, c-format
msgid ""
" -u - remove package if a more recent version is already "
"installed.\n"
msgstr " -u - 若已經安è£è¼ƒæ–°çš„版本則移除套件。\n"
-#: ../urpmq:102
+#: ../urpmq:103
#, c-format
msgid " -y - impose fuzzy search (same as --fuzzy).\n"
msgstr " -y - 加上模糊æœå°‹ (與 --fuzzy 相åŒ)。\n"
-#: ../urpmq:103
+#: ../urpmq:104
#, c-format
msgid " -Y - like -y, but forces to match case-insensitively.\n"
msgstr " -Y - é¡žä¼¼ -y åƒæ•¸ï¼Œä½†å¼·åˆ¶æ¯”å°å¤§å°å¯«ã€‚\n"
-#: ../urpmq:104
+#: ../urpmq:105
#, c-format
msgid " names or rpm files given on command line are queried.\n"
msgstr " 查詢命令列給予的套件å稱或 RPM 檔案。\n"
-#: ../urpmq:179
+#: ../urpmq:180
#, c-format
msgid "--list-nodes can only be used with --parallel"
msgstr "--list-nodes åƒæ•¸åªèƒ½å¤ é…åˆ --parallel åƒæ•¸ä¸€èµ·ä½¿ç”¨"
-#: ../urpmq:360
+#: ../urpmq:361
#, c-format
msgid "no hdlist for medium \"%s\", only partial result for package %s"
msgstr ""
-#: ../urpmq:361
+#: ../urpmq:362
#, fuzzy, c-format
msgid "no hdlist for medium \"%s\", only partial result for packages %s"
msgstr ""
"注æ„:因為所有æœå°‹éŽçš„媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何çµæžœ\n"
-#: ../urpmq:364
+#: ../urpmq:365
#, c-format
msgid "no hdlist for medium \"%s\", unable to return any result for package %s"
msgstr ""
-#: ../urpmq:365
+#: ../urpmq:366
#, fuzzy, c-format
msgid ""
"no hdlist for medium \"%s\", unable to return any result for packages %s"
msgstr ""
"注æ„:因為所有æœå°‹éŽçš„媒體都沒有使用 hdlists,所以 urpmf 無法回傳任何çµæžœ\n"
-#: ../urpmq:416
-#, c-format
-msgid "No filelist found\n"
-msgstr "沒有找到檔案列表\n"
-
-#: ../urpmq:428
+#: ../urpmq:427
#, c-format
msgid "No changelog found\n"
msgstr "沒有找到更新紀錄\n"
+#~ msgid "No filelist found\n"
+#~ msgstr "沒有找到檔案列表\n"
+
+#~ msgid ""
+#~ "To satisfy dependencies, the following %d packages will be removed (%d MB)"
+#~ msgstr "為了滿足相ä¾æ€§ï¼Œä¸‹åˆ— %d 個套件將被移除 (%d MB)"
+
#~ msgid "(%d packages, %d MB)"
#~ msgstr "(%d 個套件,共 %d MB)"
-#, fuzzy
-#~ msgid "Proceed with the installation of 1 package? (%2$d MB)"
-#~ msgid_plural "Proceed with the installation of the %d packages? (%d MB)"
-#~ msgstr[0] "繼續安è£é€™ %d 個套件?(å…± %d MB)"
-
#~ msgid ""
#~ " -P - do not search in provides to find package (default).\n"
#~ msgstr " -P - ä¸æ–¼ provides 中æœå°‹å¥—件 (é è¨­å€¼)。\n"
diff --git a/pod/urpmi.files.5.pod b/pod/urpmi.files.5.pod
index 87b09c3a..623ba8bf 100644
--- a/pod/urpmi.files.5.pod
+++ b/pod/urpmi.files.5.pod
@@ -32,6 +32,11 @@ files that can be used by minimal closure algorithm. If these files are
not present, hdlist files will be used instead to resolve dependencies
(but this is much slower).
+=item I<< /var/lib/urpmi/names.<media_name> >>
+
+Contains the list of package names per media. This is generated by urpmi for external programs
+(namely bash-completion)
+
=item I</etc/urpmi/urpmi.cfg>
Contains media descriptions. See urpmi.cfg(5).
@@ -71,6 +76,12 @@ B<url=http://....> which is the URL of a document that lists the available
mirrors. The default is to use
F<http://www.mandrivalinux.com/mirrorsfull.list>.
+=item I</etc/urpmi/netrc>
+
+This file is handled by urpmi: when adding a media from an URL containing a
+password, urpmi will remove the password from the URL written into urpmi.cfg
+and write it in this file.
+
=back
=head1 SEE ALSO
diff --git a/skip.list b/skip.list
index afd69b38..a5dc1bf7 100644
--- a/skip.list
+++ b/skip.list
@@ -1,3 +1,12 @@
# Here you can specify the packages that won't be upgraded automatically
# for example, to exclude all apache packages :
# /^apache/
+
+kernel-latest
+kernel-doc-latest
+kernel-enterprise-latest
+kernel-legacy-latest
+kernel-source-latest
+kernel-source-stripped-latest
+kernel-xen0-latest
+kernel-xenU-latest
diff --git a/t/01compile.t b/t/01compile.t
index 753c5ff6..0f0d5143 100644
--- a/t/01compile.t
+++ b/t/01compile.t
@@ -2,7 +2,7 @@
use strict;
use warnings;
-use Test::More tests => 10;
+use Test::More tests => 20;
for my $module (glob("urpm/*.pm")) {
$module =~ s,/,::,g;
diff --git a/t/02create_pkgs.t b/t/02create_pkgs.t
index ff4fda0c..caf6aaa5 100644
--- a/t/02create_pkgs.t
+++ b/t/02create_pkgs.t
@@ -5,33 +5,80 @@ use warnings;
use Test::More 'no_plan';
chdir 't' if -d 't';
-system('rm -rf BUILD RPMS media');
-foreach (qw(media BUILD RPMS RPMS/noarch)) {
+system('rm -rf tmp media');
+foreach (qw(media tmp tmp/BUILD tmp/RPMS tmp/RPMS/noarch tmp/SRPMS)) {
mkdir $_;
}
-# locally build a test rpms
-foreach my $spec (glob("SPECS/*.spec")) {
- system_("rpmbuild --quiet --define '_topdir .' -bb --clean $spec");
- my ($name) = $spec =~ m!([^/]*)\.spec$!;
- mkdir "media/$name";
- system_("mv RPMS/*/*.rpm media/$name");
+
+# locally build test rpms
+
+foreach my $dir (grep { -d $_ } glob("data/SPECS/*")) {
+ my ($medium_name) = $dir =~ m!([^/]*)$!;
+ rpmbuild($_, $medium_name) foreach glob("$dir/*.spec");
+ genhdlist_std($medium_name);
+}
+
+foreach my $spec (glob("data/SPECS/*.spec")) {
+ my $name = rpmbuild($spec);
if ($name eq 'various') {
system_("cp -r media/$name media/${name}_nohdlist");
system_("cp -r media/$name media/${name}_no_subdir");
system_("genhdlist --dest media/${name}_no_subdir");
+ symlink "${name}_nohdlist", "media/${name} nohdlist";
+ symlink "${name}", "media/${name}_bis";
}
-
- system_("genhdlist --subdir media/$name/media_info media/$name");
+ genhdlist_std($name);
+}
+foreach my $spec (glob("data/SPECS/srpm*.spec")) {
+ my $name = rpmbuild_srpm($spec);
+ genhdlist_std($name);
}
{
my $name = 'rpm-v3';
- system_("cp -r $name media");
+ system_("cp -r data/$name media");
system_("cp -r media/$name media/${name}_nohdlist");
system_("cp -r media/$name media/${name}_no_subdir");
system_("genhdlist --dest media/${name}_no_subdir");
- system_("genhdlist --subdir media/$name/media_info media/$name");
+ genhdlist_std($name);
+}
+
+mkdir 'media/media_info';
+system_("cp -r data/media.cfg media/media_info");
+system_('gendistrib .');
+
+sub genhdlist_std {
+ my ($medium_name) = @_;
+ system_("genhdlist --subdir media/$medium_name/media_info media/$medium_name");
+}
+
+sub rpmbuild {
+ my ($spec, $o_medium_name) = @_;
+
+ system_("rpmbuild --quiet --define '_topdir tmp' -bb --clean --nodeps $spec");
+
+ my ($name) = $spec =~ m!([^/]*)\.spec$!;
+
+ my $medium_name = $o_medium_name || $name;
+ mkdir "media/$medium_name";
+ system_("mv tmp/RPMS/*/*.rpm media/$medium_name");
+
+ $medium_name;
+}
+
+sub rpmbuild_srpm {
+ my ($spec) = @_;
+
+ system_("rpmbuild --quiet --define '_topdir tmp' -bs --clean --nodeps $spec");
+
+ my ($name) = $spec =~ m!([^/]*)\.spec$!;
+
+ my $medium_name = "SRPMS-$name";
+ mkdir "media/$medium_name";
+ system_("mv tmp/SRPMS/*.rpm media/$medium_name");
+
+ $medium_name;
}
sub system_ {
diff --git a/t/README b/t/README
index 2784568d..ea8fc8f3 100644
--- a/t/README
+++ b/t/README
@@ -1,6 +1,4 @@
you need to be root to run superuser--*.t,
with a normal user those tests are simply skipped.
-so do:
-- make test
-- sudo make test TEST_FILES='t/superuser--*.t'
+use "make testall"
diff --git a/t/cfg.t b/t/cfg.t
index 91da6015..15e2f927 100644
--- a/t/cfg.t
+++ b/t/cfg.t
@@ -10,14 +10,14 @@ BEGIN { use_ok 'urpm::download' }
my $file = 'testurpmi.cfg';
my $proxyfile = $urpm::download::PROXY_CFG = 'testproxy.cfg';
open my $f, '>', $file or die $!;
-print $f (my $cfgtext = <<URPMICFG);
+print $f (my $cfgtext = <<'URPMICFG');
{
downloader: wget
fuzzy: no
verify-rpm: 0
}
-update\\ 1 http://foo/bar/ {
+update\ 1 http://foo/bar/$RELEASE {
compress: 1
fuzzy: 1
keep: yes
@@ -41,7 +41,20 @@ close $f;
my $config = urpm::cfg::load_config($file);
ok( ref $config, 'config loaded' );
-ok( urpm::cfg::dump_config($file.2, $config), 'config written' );
+is($config->{global}{downloader}, 'wget');
+ok(my ($update_2) = grep { $_->{name} eq 'update_2' } @{$config->{media}});
+is($update_2->{url}, 'ftp://foo/bar/');
+ok(my ($update_1) = grep { $_->{name} eq 'update 1' } @{$config->{media}});
+is($update_1->{url}, 'http://foo/bar/' . urpm::cfg::get_release());
+
+my $config_verbatim = urpm::cfg::load_config_raw($file, 1);
+ok( ref $config_verbatim, 'config loaded' );
+
+unlink "$file.verbatim", "$file.bad";
+urpm::util::copy($file, "$file.state"); #- dump_config has a state
+ok( urpm::cfg::dump_config_raw("$file.verbatim", $config_verbatim), 'config written' );
+ok( urpm::cfg::dump_config("$file.bad", $config), 'config written' );
+ok( urpm::cfg::dump_config("$file.state", $config), 'config written' );
# things that have been tidied up by dump_config
$cfgtext =~ s/\byes\b/1/g;
@@ -50,10 +63,26 @@ $cfgtext =~ s/\bkey_ids\b/key-ids/g;
$cfgtext =~ s/"123"/123/g;
$cfgtext =~ s/'kernel'/kernel/g;
-my $cfgtext2 = read_file($file.2);
+{
+my $cfgtext2 = read_file("$file.verbatim");
+$cfgtext2 =~ s/# generated.*\n//;
+is( $cfgtext, $cfgtext2, 'config is the same' )
+ or system qw( diff -u ), $file, "$file.verbatim";
+}
+{
+my $cfgtext2 = read_file("$file.bad");
+$cfgtext2 =~ s/# generated.*\n//;
+isnt( $cfgtext, $cfgtext2, 'config should differ' )
+ or system qw( diff -u ), $file, "$file.bad";
+}
+{
+my $cfgtext2 = read_file("$file.state");
$cfgtext2 =~ s/# generated.*\n//;
is( $cfgtext, $cfgtext2, 'config is the same' )
- or system qw( diff -u ), $file, $file.2;
+ or system qw( diff -u ), $file, "$file.state";
+}
+
+
open $f, '>', $proxyfile or die $!;
print $f ($cfgtext = <<PROXYCFG);
@@ -71,7 +100,7 @@ is( $p->{http_proxy}, 'http://yoyodyne:8080/', 'read media proxy' );
is( $p->{user}, 'rafael', 'proxy user' );
is( $p->{pwd}, 'richard', 'proxy password' );
ok( dump_proxy_config(), 'dump_proxy_config' );
-$cfgtext2 = read_file($proxyfile);
+my $cfgtext2 = read_file($proxyfile);
$cfgtext2 =~ s/# generated.*\n//;
is( $cfgtext, $cfgtext2, 'dumped correctly' );
set_proxy_config(http_proxy => '');
@@ -81,4 +110,4 @@ $cfgtext2 =~ s/# generated.*\n//;
$cfgtext =~ s/^http_proxy.*\n//;
is( $cfgtext, $cfgtext2, 'dumped correctly' );
-END { unlink $file, $file.2, $proxyfile }
+END { unlink $file, glob("$file.*"), $proxyfile }
diff --git a/t/SPECS/arch_to_noarch_1.spec b/t/data/SPECS/arch_to_noarch_1.spec
index 05cff446..05cff446 100644
--- a/t/SPECS/arch_to_noarch_1.spec
+++ b/t/data/SPECS/arch_to_noarch_1.spec
diff --git a/t/SPECS/arch_to_noarch_2.spec b/t/data/SPECS/arch_to_noarch_2.spec
index 7be6925b..7be6925b 100644
--- a/t/SPECS/arch_to_noarch_2.spec
+++ b/t/data/SPECS/arch_to_noarch_2.spec
diff --git a/t/SPECS/arch_to_noarch_3.spec b/t/data/SPECS/arch_to_noarch_3.spec
index be9cdb4d..be9cdb4d 100644
--- a/t/SPECS/arch_to_noarch_3.spec
+++ b/t/data/SPECS/arch_to_noarch_3.spec
diff --git a/t/SPECS/arch_to_noarch_4.spec b/t/data/SPECS/arch_to_noarch_4.spec
index 7eb32705..7eb32705 100644
--- a/t/SPECS/arch_to_noarch_4.spec
+++ b/t/data/SPECS/arch_to_noarch_4.spec
diff --git a/t/data/SPECS/priority-upgrade-1/a-strict_1.spec b/t/data/SPECS/priority-upgrade-1/a-strict_1.spec
new file mode 100644
index 00000000..7c81849d
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-1/a-strict_1.spec
@@ -0,0 +1,14 @@
+Summary: a-strict
+Name: a-strict
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+Requires: b
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-1/a_1.spec b/t/data/SPECS/priority-upgrade-1/a_1.spec
new file mode 100644
index 00000000..8a997f9e
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-1/a_1.spec
@@ -0,0 +1,14 @@
+Summary: a
+Name: a
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+Requires: b
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-1/b_1.spec b/t/data/SPECS/priority-upgrade-1/b_1.spec
new file mode 100644
index 00000000..fa346315
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-1/b_1.spec
@@ -0,0 +1,13 @@
+Summary: b
+Name: b
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-2/a-strict_2.spec b/t/data/SPECS/priority-upgrade-2/a-strict_2.spec
new file mode 100644
index 00000000..0a44113d
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-2/a-strict_2.spec
@@ -0,0 +1,14 @@
+Summary: a-strict
+Name: a-strict
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+Requires: b >= 2
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-2/a_2.spec b/t/data/SPECS/priority-upgrade-2/a_2.spec
new file mode 100644
index 00000000..5048eed1
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-2/a_2.spec
@@ -0,0 +1,14 @@
+Summary: a
+Name: a
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+Requires: b
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-2/b_2.spec b/t/data/SPECS/priority-upgrade-2/b_2.spec
new file mode 100644
index 00000000..929014ad
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-2/b_2.spec
@@ -0,0 +1,14 @@
+Summary: b
+Name: b
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+Requires: bb
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-2/bb1_2.spec b/t/data/SPECS/priority-upgrade-2/bb1_2.spec
new file mode 100644
index 00000000..2b10a21a
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-2/bb1_2.spec
@@ -0,0 +1,14 @@
+Summary: bb1
+Name: bb1
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+Provides: bb
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/priority-upgrade-2/bb2_2.spec b/t/data/SPECS/priority-upgrade-2/bb2_2.spec
new file mode 100644
index 00000000..1732f9cd
--- /dev/null
+++ b/t/data/SPECS/priority-upgrade-2/bb2_2.spec
@@ -0,0 +1,14 @@
+Summary: bb2
+Name: bb2
+Version: 2
+Release: 1
+License: x
+Group: x
+Url: x
+Provides: bb
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/data/SPECS/srpm-bootstrapping.spec b/t/data/SPECS/srpm-bootstrapping.spec
new file mode 100644
index 00000000..771b6226
--- /dev/null
+++ b/t/data/SPECS/srpm-bootstrapping.spec
@@ -0,0 +1,14 @@
+Summary: x
+Name: srpm-bootstrapping
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+BuildRequires: %{name}
+BuildRoot: %{_tmppath}/%{name}
+
+%description
+x
+
+%files
diff --git a/t/SPECS/various.spec b/t/data/SPECS/various.spec
index b7d62e8f..b7d62e8f 100644
--- a/t/SPECS/various.spec
+++ b/t/data/SPECS/various.spec
diff --git a/t/data/SPECS/various2.spec b/t/data/SPECS/various2.spec
new file mode 100644
index 00000000..bcc16c5b
--- /dev/null
+++ b/t/data/SPECS/various2.spec
@@ -0,0 +1,38 @@
+Summary: various2
+Name: various2
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+BuildRoot: %{_tmppath}/%{name}
+
+%prep
+echo foo > foo
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+for i in /etc/test-%{name} \
+ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \
+ /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \
+ /usr/test-%{name}/foo; do
+ install -d `dirname $RPM_BUILD_ROOT$i`
+ echo foo > $RPM_BUILD_ROOT$i
+done
+
+%find_lang test-%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%description
+x
+
+%files -f test-%{name}.lang
+%defattr(-,root,root)
+%doc foo
+%config(noreplace) /etc/*
+/var/lib/*
+/usr/test-%{name}
diff --git a/t/data/SPECS/various3.spec b/t/data/SPECS/various3.spec
new file mode 100644
index 00000000..5d147f75
--- /dev/null
+++ b/t/data/SPECS/various3.spec
@@ -0,0 +1,38 @@
+Summary: various3
+Name: various3
+Version: 1
+Release: 1
+License: x
+Group: x
+Url: x
+BuildRoot: %{_tmppath}/%{name}
+
+%prep
+echo foo > foo
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+for i in /etc/test-%{name} \
+ /var/lib/test-%{name}/foo1 /var/lib/test-%{name}/foo2 /var/lib/test-%{name}/foo3 \
+ /usr/share/locale/fr/LC_MESSAGES/test-%{name}.mo \
+ /usr/test-%{name}/foo; do
+ install -d `dirname $RPM_BUILD_ROOT$i`
+ echo foo > $RPM_BUILD_ROOT$i
+done
+
+%find_lang test-%{name}
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%description
+x
+
+%files -f test-%{name}.lang
+%defattr(-,root,root)
+%doc foo
+%config(noreplace) /etc/*
+/var/lib/*
+/usr/test-%{name}
diff --git a/t/data/media.cfg b/t/data/media.cfg
new file mode 100644
index 00000000..49a0a1d7
--- /dev/null
+++ b/t/data/media.cfg
@@ -0,0 +1,26 @@
+[media_info]
+version=2007.0
+mediacfg_version=2
+
+[various]
+hdlist=hdlist_various.cz
+name=Various
+size=1m
+
+[various2]
+hdlist=hdlist_various2.cz
+name=Various II
+size=1m
+
+[various3]
+hdlist=hdlist_various3.cz
+name=Various III
+size=1m
+noauto=1
+
+[various_bis]
+hdlist=hdlist_bis.cz
+name=Various Bis
+size=1m
+debug_for=various
+noauto=1
diff --git a/t/data/rpm-buggy/invalid-signature.rpm b/t/data/rpm-buggy/invalid-signature.rpm
new file mode 100644
index 00000000..20944405
--- /dev/null
+++ b/t/data/rpm-buggy/invalid-signature.rpm
Binary files differ
diff --git a/t/data/rpm-buggy/not-a-rpm.rpm b/t/data/rpm-buggy/not-a-rpm.rpm
new file mode 100644
index 00000000..d00491fd
--- /dev/null
+++ b/t/data/rpm-buggy/not-a-rpm.rpm
@@ -0,0 +1 @@
+1
diff --git a/t/data/rpm-buggy/weird-header.rpm b/t/data/rpm-buggy/weird-header.rpm
new file mode 100644
index 00000000..51561037
--- /dev/null
+++ b/t/data/rpm-buggy/weird-header.rpm
Binary files differ
diff --git a/t/rpm-v3/libtermcap-2.0.8-2.i386.rpm b/t/data/rpm-v3/libtermcap-2.0.8-2.i386.rpm
index 390524dc..390524dc 100644
--- a/t/rpm-v3/libtermcap-2.0.8-2.i386.rpm
+++ b/t/data/rpm-v3/libtermcap-2.0.8-2.i386.rpm
Binary files differ
diff --git a/t/rpm-v3/nls-1.0-2.i386.rpm b/t/data/rpm-v3/nls-1.0-2.i386.rpm
index c05d7f85..c05d7f85 100644
--- a/t/rpm-v3/nls-1.0-2.i386.rpm
+++ b/t/data/rpm-v3/nls-1.0-2.i386.rpm
Binary files differ
diff --git a/t/rpm-v3/p2c-1.20-7.i386.rpm b/t/data/rpm-v3/p2c-1.20-7.i386.rpm
index a0fd4e41..a0fd4e41 100644
--- a/t/rpm-v3/p2c-1.20-7.i386.rpm
+++ b/t/data/rpm-v3/p2c-1.20-7.i386.rpm
Binary files differ
diff --git a/t/superuser--addmedia.t b/t/superuser--addmedia.t
index 776da2d1..661dce19 100644
--- a/t/superuser--addmedia.t
+++ b/t/superuser--addmedia.t
@@ -10,12 +10,17 @@ need_root_and_prepare();
my $name = 'various';
my $name2 = 'various2';
+my $name3 = 'various3';
-my @fields = qw(hdlist synthesis with_hdlist media_info_dir virtual);
+my @fields = qw(hdlist synthesis with_hdlist media_info_dir list virtual ignore);
try_medium({ media_info_dir => 'media_info' }, '');
+try_medium_({ list => 'list.various' }, { list => 'list.various2' },
+ '--probe-rpms', '--probe-rpms');
+
+
try_medium({ hdlist => 1, media_info_dir => 'media_info' },
'--probe-hdlist');
try_medium({ hdlist => 1, media_info_dir => 'media_info' },
@@ -37,6 +42,23 @@ try_medium({ synthesis => 1,
"with ../media_info/synthesis.hdlist_$name.cz",
"with ../media_info/synthesis.hdlist_$name2.cz");
+try_distrib({ hdlist => 1,
+ with_hdlist => "../..//media/media_info/hdlist_$name.cz",
+ with_hdlist2 => "../..//media/media_info/hdlist_$name2.cz",
+ with_hdlist3 => "../..//media/media_info/hdlist_$name3.cz" },
+ '');
+try_distrib({ hdlist => 1,
+ with_hdlist => "../..//media/media_info/hdlist_$name.cz",
+ with_hdlist2 => "../..//media/media_info/hdlist_$name2.cz",
+ with_hdlist3 => "../..//media/media_info/hdlist_$name3.cz" },
+ '--probe-hdlist');
+try_distrib({ synthesis => 1,
+ with_hdlist => "../..//media/media_info/synthesis.hdlist_$name.cz",
+ with_hdlist2 => "../..//media/media_info/synthesis.hdlist_$name2.cz",
+ with_hdlist3 => "../..//media/media_info/synthesis.hdlist_$name3.cz" },
+ '--probe-synthesis');
+
+
sub try_medium {
my ($want, $options, $o_options2) = @_;
my $want2 = { %$want, with_hdlist => $want->{with_hdlist2} || $want->{with_hdlist} };
@@ -47,6 +69,17 @@ sub try_medium {
try_medium_($want, $want2, '--virtual ' . $options, '--virtual ' . ($o_options2 || $options));
}
+sub try_distrib {
+ my ($want, $options) = @_;
+ my $want2 = { %$want, with_hdlist => $want->{with_hdlist2} || $want->{with_hdlist} };
+ my $want3 = { %$want, with_hdlist => $want->{with_hdlist3} || $want->{with_hdlist}, ignore => 1 };
+
+ try_distrib_($want, $want2, $want3, $options);
+
+ $want3->{virtual} = $want2->{virtual} = $want->{virtual} = 1;
+ try_distrib_($want, $want2, $want3, '--virtual ' . $options);
+}
+
sub try_medium_ {
my ($want, $want2, $options, $options2) = @_;
@@ -62,6 +95,15 @@ sub try_medium_ {
urpmi_removemedia($name);
}
+sub try_distrib_ {
+ my ($want, $want2, $want3, $options) = @_;
+
+ urpmi_addmedia("--distrib $name $::pwd $options");
+ check_conf($want, $want2, $want3);
+ check_urpmi($name, $name2);
+ urpmi_removemedia('-a');
+}
+
sub check_conf {
my (@want) = @_;
my $config = urpm::cfg::load_config("root/etc/urpmi/urpmi.cfg");
diff --git a/t/superuser--buggy-rpms.t b/t/superuser--buggy-rpms.t
new file mode 100644
index 00000000..34bacbdd
--- /dev/null
+++ b/t/superuser--buggy-rpms.t
@@ -0,0 +1,24 @@
+#!/usr/bin/perl
+
+use strict;
+use lib '.', 't';
+use helper;
+use Test::More 'no_plan';
+BEGIN { use_ok "URPM" }
+
+need_root_and_prepare();
+
+#- things are going to be noisy, and that's normal
+open STDERR, '>/dev/null';
+
+my @pkgs = map { "data/rpm-buggy/$_" } 'invalid-signature.rpm', 'not-a-rpm.rpm', 'weird-header.rpm';
+foreach (@pkgs) {
+ system("rpm -K $_");
+ is($?, 1 << 8, "rpm -K $_");
+
+ system(urpmi_cmd() . " $_");
+ is($?, 2 << 8, "urpmi $_");
+
+ my $verif = URPM::verify_signature($_);
+ ok($verif =~ /NOT OK/);
+}
diff --git a/t/superuser--media_info_dir.t b/t/superuser--media_info_dir.t
index 9cb623f0..cd43e9d8 100644
--- a/t/superuser--media_info_dir.t
+++ b/t/superuser--media_info_dir.t
@@ -12,12 +12,12 @@ rpm_v3();
sub various {
my $name = 'various';
- foreach my $medium_name ('various', 'various_nohdlist', 'various_no_subdir') {
- urpmi_addmedia("$medium_name $::pwd/media/$medium_name");
+ foreach my $medium_name ('various', 'various_nohdlist', 'various nohdlist', 'various_no_subdir') {
+ urpmi_addmedia("'$medium_name' '$::pwd/media/$medium_name'");
urpmi($name);
is(`rpm -qa --root $::pwd/root`, "$name-1-1\n");
urpme($name);
- urpmi_removemedia($medium_name);
+ urpmi_removemedia("'$medium_name'");
}
}
diff --git a/t/superuser--priority-upgrade.t b/t/superuser--priority-upgrade.t
new file mode 100644
index 00000000..2486177e
--- /dev/null
+++ b/t/superuser--priority-upgrade.t
@@ -0,0 +1,116 @@
+#!/usr/bin/perl
+
+use strict;
+use lib '.', 't';
+use helper;
+use Expect;
+use urpm::util;
+use Test::More 'no_plan';
+
+need_root_and_prepare();
+
+$ENV{TESTING_priority_upgrade} = 1;
+my $name = 'priority-upgrade';
+
+test('a b', 'a', 'a', 'b');
+
+test('a-strict b', 'a-strict', 'a-strict b bb1', 'b',
+ [ 'What is your choice', "\n" ],
+ [ 'Proceed with the installation of the 2 packages?', "\n" ],
+ [ 'restarting urpmi', '' ],
+ );
+
+test_ab_auto_select('',
+ [ 'What is your choice', "\n" ],
+ [ 'Proceed with the installation of the 3 packages?', "\n" ],
+ );
+test_ab_auto_select('a',
+ [ 'Proceed with the installation of one package?', "\n" ],
+ [ 'restarting urpmi', '' ],
+ [ 'What is your choice', "\n" ],
+ [ 'Proceed with the installation of the 2 packages?', "\n" ],
+ );
+test_ab_auto_select('b',
+ [ 'What is your choice', "\n" ],
+ [ 'Proceed with the installation of the 2 packages?', "\n" ],
+ [ 'restarting urpmi', '' ],
+ [ 'Proceed with the installation of one package?', "\n" ],
+ );
+test_ab_auto_select('a,b',
+ [ 'What is your choice', "\n" ],
+ [ 'Proceed with the installation of the 3 packages?', "\n" ],
+ );
+
+
+sub test_ab_auto_select {
+ my ($priority_upgrade, @expected) = @_;
+ test('a b', undef, 'a b bb1', $priority_upgrade, @expected);
+}
+
+sub test {
+ my ($pkgs_v1, $wanted_v2, $pkgs_v2, $priority_upgrade, @expected) = @_;
+
+ unlink "$::pwd/media/$name";
+ symlink "$name-1", "$::pwd/media/$name";
+
+ urpmi_addmedia("$name $::pwd/media/$name");
+
+ if ($priority_upgrade) {
+ set_urpmi_cfg_global_options({ 'priority-upgrade' => $priority_upgrade });
+ }
+
+ urpmi($pkgs_v1);
+ my @pkgs_v1 = split(' ', $pkgs_v1);
+ is(`rpm -qa --root $::pwd/root | sort`, join('', map { "$_-1-1\n" } @pkgs_v1));
+
+ unlink "$::pwd/media/$name";
+ symlink "$name-2", "$::pwd/media/$name";
+
+ if ($wanted_v2) {
+ urpmi_update('-a');
+ urpmi_expected($wanted_v2, \@expected);
+ } else {
+ urpmi_expected('--auto-update', \@expected);
+ }
+
+
+ my @pkgs_v2 = split(' ', $pkgs_v2);
+ my @l = (
+ (map { "$_-2-1\n" } @pkgs_v2),
+ (map { "$_-1-1\n" } difference2(\@pkgs_v1, \@pkgs_v2)),
+ );
+ is(`rpm -qa --root $::pwd/root | sort`, join('', sort @l));
+
+ system_('rm -rf root');
+}
+
+sub urpmi_expected {
+ my ($options, $expected) = @_;
+
+ if (0) {
+ #- try it interactively for debugging
+ system_(urpm_cmd('urpmi', '-d') . " $options");
+ return;
+ }
+
+ my $cmd = urpmi_cmd() . " $options";
+ print "# $cmd\n";
+ my $expect = Expect->spawn($cmd);
+
+ foreach (@$expected) {
+ my ($msg, $to_send) = @$_;
+
+ my $ok = $expect->expect(2, # timeout in seconds
+ [ $msg => sub { $expect->send($to_send); } ]);
+ print "$to_send";
+ ok($ok, qq(expecting "$msg"));
+ $ok or return;
+ }
+
+ $expect->expect(2,
+ [ qr/restarting urpmi/ => sub { fail('not restarting urpmi') } ],
+ [ 'eof' => sub {} ]);
+
+ $expect->soft_close;
+ is($expect->exitstatus, 0, $cmd);
+}
diff --git a/t/superuser--srpm-bootstrapping.t b/t/superuser--srpm-bootstrapping.t
new file mode 100644
index 00000000..e0182ec0
--- /dev/null
+++ b/t/superuser--srpm-bootstrapping.t
@@ -0,0 +1,14 @@
+#!/usr/bin/perl
+
+use strict;
+use lib '.', 't';
+use helper;
+use Test::More 'no_plan';
+
+need_root_and_prepare();
+
+my $name = 'srpm-bootstrapping';
+
+urpmi_addmedia("$name $::pwd/media/$name");
+urpmi("--auto media/SRPMS-$name/$name-*.src.rpm");
+is(`rpm -qa --root $::pwd/root`, "$name-1-1\n");
diff --git a/urpm.pm b/urpm.pm
index 05b1091f..d7aec37a 100644
--- a/urpm.pm
+++ b/urpm.pm
@@ -10,17 +10,15 @@ use urpm::download;
use urpm::util;
use urpm::sys;
use urpm::cfg;
-use MDV::Distribconf;
+use urpm::md5sum;
-our $VERSION = '4.8.29';
-our @ISA = qw(URPM);
+our $VERSION = '4.9.21';
+our @ISA = qw(URPM Exporter);
+our @EXPORT_OK = 'file_from_local_url';
use URPM;
use URPM::Resolve;
-my $RPMLOCK_FILE;
-my $LOCK_FILE;
-
#- this violently overrides is_arch_compat() to always return true.
sub shunt_ignorearch {
eval q( sub URPM::Package::is_arch_compat { 1 } );
@@ -35,2107 +33,87 @@ sub new {
depslist => [],
provides => {},
- config => "/etc/urpmi/urpmi.cfg",
- skiplist => "/etc/urpmi/skip.list",
- instlist => "/etc/urpmi/inst.list",
- statedir => "/var/lib/urpmi",
- cachedir => "/var/cache/urpmi",
media => undef,
options => {},
fatal => sub { printf STDERR "%s\n", $_[1]; exit($_[0]) },
error => sub { printf STDERR "%s\n", $_[0] },
+ info => sub { printf "%s\n", $_[0] },
log => sub { printf "%s\n", $_[0] },
ui_msg => sub {
$self->{log}($_[0]);
ref $self->{ui} && ref $self->{ui}{msg} and $self->{ui}{msg}->($_[1]);
},
}, $class;
+
+ set_files($self, '');
$self->set_nofatal(1);
$self;
}
-sub requested_ftp_http_downloader {
- my ($urpm, $media_name) = @_;
-
- $urpm->{options}{downloader} || #- cmd-line switch
- $media_name && do {
- #- per-media config
- my $m = name2medium($urpm, $media_name);
- $m && $m->{downloader};
- } || $urpm->{global_config}{downloader};
-}
-
-#- $medium can be undef
-sub sync_webfetch {
- my ($urpm, $medium, $files, $std_options, %more_options) = @_;
-
- my %options = (
- dir => "$urpm->{cachedir}/partial",
- limit_rate => $std_options->{limit_rate},
- compress => $std_options->{compress},
- proxy => get_proxy($medium),
- quiet => $std_options->{quiet}, #- often overridden in the caller, why??
- $medium ? (media => $medium->{name}) : (),
- %more_options,
+sub set_files {
+ my ($urpm, $urpmi_root) = @_;
+ my %h = (
+ config => "$urpmi_root/etc/urpmi/urpmi.cfg",
+ skiplist => "$urpmi_root/etc/urpmi/skip.list",
+ instlist => "$urpmi_root/etc/urpmi/inst.list",
+ private_netrc => "$urpmi_root/etc/urpmi/netrc",
+ statedir => "$urpmi_root/var/lib/urpmi",
+ cachedir => "$urpmi_root/var/cache/urpmi",
+ root => $urpmi_root,
+ $urpmi_root ? (urpmi_root => $urpmi_root) : (),
);
- foreach my $cpt (qw(retry wget-options curl-options rsync-options prozilla-options)) {
- $options{$cpt} = $urpm->{options}{$cpt} if defined $urpm->{options}{$cpt};
- }
-
- _sync_webfetch_raw($urpm, $files, \%options);
-}
-
-#- syncing algorithms.
-sub _sync_webfetch_raw {
- my ($urpm, $files, $options) = @_;
-
- my %files;
- #- currently ftp and http protocols are managed by curl or wget,
- #- ssh and rsync protocols are managed by rsync *AND* ssh.
- foreach (@$files) {
- my $proto = protocol_from_url($_) or die N("unknown protocol defined for %s", $_);
- push @{$files{$proto}}, $_;
- }
- if ($files{removable} || $files{file}) {
- my @l = map { file_from_local_url($_) } @{$files{removable} || []}, @{$files{file} || []};
- eval { sync_file($options, @l) };
- $urpm->{fatal}(10, $@) if $@;
- delete @files{qw(removable file)};
- }
- if ($files{ftp} || $files{http} || $files{https}) {
- my @available = urpm::download::available_ftp_http_downloaders();
-
- #- use user default downloader if provided and available
- my $requested_downloader = requested_ftp_http_downloader($urpm, $options->{media});
- my ($preferred) = grep { $_ eq $requested_downloader } @available;
- if (!$preferred) {
- #- else first downloader of @available is the default one
- $preferred = $available[0];
- if ($requested_downloader && !our $webfetch_not_available) {
- $urpm->{log}(N("%s is not available, falling back on %s", $requested_downloader, $preferred));
- $webfetch_not_available = 1;
- }
- }
- my $sync = $urpm::download::{"sync_$preferred"} or die N("no webfetch found, supported webfetch are: %s\n", join(", ", urpm::download::ftp_http_downloaders()));
- $sync->($options, @{$files{ftp} || []}, @{$files{http} || []}, @{$files{https} || []});
-
- delete @files{qw(ftp http https)};
- }
- if ($files{rsync}) {
- sync_rsync($options, @{$files{rsync}});
- delete $files{rsync};
- }
- if ($files{ssh}) {
- my @ssh_files = map { m!^ssh://([^/]*)(.*)! ? "$1:$2" : () } @{$files{ssh}};
- sync_ssh($options, @ssh_files);
- delete $files{ssh};
- }
- %files and die N("unable to handle protocol: %s", join ', ', keys %files);
-}
-
-our @PER_MEDIA_OPT = qw(
- downloader
- hdlist
- ignore
- key-ids
- list
- md5sum
- noreconfigure
- priority
- priority-upgrade
- removable
- static
- synthesis
- update
- verify-rpm
- virtual
- with_hdlist
-);
-
-#- Loads /etc/urpmi/urpmi.cfg and performs basic checks.
-#- Does not handle old format: <name> <url> [with <path_hdlist>]
-#- options :
-#- - nocheck_access : don't check presence of hdlist and other files
-sub read_config {
- my ($urpm, %options) = @_;
- return if $urpm->{media}; #- media already loaded
- $urpm->{media} = [];
- my $config = urpm::cfg::load_config($urpm->{config})
- or $urpm->{fatal}(6, $urpm::cfg::err);
-
- #- global options
- if ($config->{''}) {
- foreach my $opt (qw(
- allow-force
- allow-nodeps
- auto
- compress
- downloader
- default-media
- excludedocs
- excludepath
- fuzzy
- ignoresize
- keep
- key-ids
- limit-rate
- nopubkey
- norebuild
- post-clean
- pre-clean
- priority-upgrade
- prohibit-remove
- repackage
- resume
- retry
- split-length
- split-level
- strict-arch
- verify-rpm
- curl-options
- rsync-options
- wget-options
- prozilla-options
- )) {
- if (defined $config->{''}{$opt} && !exists $urpm->{options}{$opt}) {
- $urpm->{options}{$opt} = $config->{''}{$opt};
- }
- }
- }
- #- per-media options
- foreach my $m (grep { $_ ne '' } keys %$config) {
- my $medium = { name => $m, clear_url => $config->{$m}{url} };
- foreach my $opt (@PER_MEDIA_OPT) {
- defined $config->{$m}{$opt} and $medium->{$opt} = $config->{$m}{$opt};
- }
- $urpm->probe_medium($medium, %options) and push @{$urpm->{media}}, $medium;
- }
-
- eval { require urpm::ldap; urpm::ldap::load_ldap_media($urpm, %options) };
-
- #- load default values
- foreach (qw(post-clean verify-rpm)) {
- exists $urpm->{options}{$_} or $urpm->{options}{$_} = 1;
- }
-
- $urpm->{media} = [ sort { $a->{priority} <=> $b->{priority} } @{$urpm->{media}} ];
-
- #- remember if an hdlist or list file is already used
- my %filelists;
- foreach my $medium (@{$urpm->{media}}) {
- foreach my $filetype (qw(hdlist list)) {
- $medium->{$filetype} or next;
-
- if ($filelists{$filetype}{$medium->{$filetype}}) {
- $medium->{ignore} = 1;
- $urpm->{error}(
- $filetype eq 'hdlist'
- ? N("medium \"%s\" trying to use an already used hdlist, medium ignored", $medium->{name})
- : N("medium \"%s\" trying to use an already used list, medium ignored", $medium->{name})
- );
- } else {
- $filelists{$filetype}{$medium->{$filetype}} = 1;
- }
- }
- }
-
- #- check the presence of hdlist and list files if necessary.
- if (!$options{nocheck_access}) {
- foreach my $medium (@{$urpm->{media}}) {
- $medium->{ignore} and next;
-
- if (-r statedir_hdlist($urpm, $medium)) {}
- elsif ($medium->{synthesis} && -r statedir_synthesis($urpm, $medium)) {}
- else {
- $medium->{ignore} = 1;
- $urpm->{error}(N("unable to access hdlist file of \"%s\", medium ignored", $medium->{name}));
- }
- if ($medium->{list} && -r statedir_list($urpm, $medium)) {}
- elsif ($medium->{url}) {}
- else {
- $medium->{ignore} = 1;
- $urpm->{error}(N("unable to access list file of \"%s\", medium ignored", $medium->{name}));
- }
- }
- }
-
- #- read MD5 sums (usually not in urpmi.cfg but in a separate file)
- foreach (@{$urpm->{media}}) {
- if (my $md5sum = get_md5sum("$urpm->{statedir}/MD5SUM", statedir_hdlist_or_synthesis($urpm, $_))) {
- $_->{md5sum} = $md5sum;
- }
- }
-
- #- remember global options for write_config
- $urpm->{global_config} = $config->{''};
-}
-
-#- probe medium to be used, take old medium into account too.
-sub probe_medium {
- my ($urpm, $medium, %options) = @_;
- local $_;
-
- if (name2medium($urpm, $medium->{name})) {
- $urpm->{error}(N("trying to override existing medium \"%s\", skipping", $medium->{name}));
- return;
- }
+ $urpm->{$_} = $h{$_} foreach keys %h;
- $medium->{url} ||= $medium->{clear_url};
-
- if ($medium->{virtual}) {
- #- a virtual medium needs to have an url available without using a list file.
- if ($medium->{hdlist} || $medium->{list}) {
- $medium->{ignore} = 1;
- $urpm->{error}(N("virtual medium \"%s\" should not have defined hdlist or list file, medium ignored",
- $medium->{name}));
- }
- unless ($medium->{url}) {
- $medium->{ignore} = 1;
- $urpm->{error}(N("virtual medium \"%s\" should have a clear url, medium ignored",
- $medium->{name}));
- }
- } else {
- unless ($medium->{ignore} || $medium->{hdlist}) {
- $medium->{hdlist} = "hdlist.$medium->{name}.cz";
- -e statedir_hdlist($urpm, $medium) or
- $medium->{ignore} = 1,
- $urpm->{error}(N("unable to find hdlist file for \"%s\", medium ignored", $medium->{name}));
- }
- unless ($medium->{ignore} || $medium->{list}) {
- unless (defined $medium->{url}) {
- $medium->{list} = "list.$medium->{name}";
- unless (-e statedir_list($urpm, $medium)) {
- $medium->{ignore} = 1,
- $urpm->{error}(N("unable to find list file for \"%s\", medium ignored", $medium->{name}));
- }
- }
- }
-
- #- there is a little more to do at this point as url is not known, inspect directly list file for it.
- unless ($medium->{url}) {
- my %probe;
- if (-r statedir_list($urpm, $medium)) {
- my $listfile = $urpm->open_safe("<", statedir_list($urpm, $medium));
- if ($listfile) {
- while (<$listfile>) {
- #- /./ is end of url marker in list file (typically generated by a
- #- find . -name "*.rpm" > list
- #- for exportable list file.
- m|^(.*)/\./| and $probe{$1} = undef;
- m|^(.*)/[^/]*$| and $probe{$1} = undef;
- }
- close $listfile;
- }
- }
- foreach (sort { length($a) <=> length($b) } keys %probe) {
- if ($medium->{url}) {
- if ($medium->{url} ne substr($_, 0, length($medium->{url}))) {
- $medium->{ignore} or $urpm->{error}(N("inconsistent list file for \"%s\", medium ignored", $medium->{name}));
- $medium->{ignore} = 1;
- last;
- }
- } else {
- $medium->{url} = $_;
- }
- }
- unless ($options{nocheck_access}) {
- unless ($medium->{url}) {
- $medium->{ignore} or $urpm->{error}(N("unable to inspect list file for \"%s\", medium ignored", $medium->{name}));
- $medium->{ignore} = 1;
- }
- }
- }
- }
-
- #- probe removable device.
- $urpm->probe_removable_device($medium);
-
- #- clear URLs for trailing /es.
- $medium->{url} and $medium->{url} =~ s|(.*?)/*$|$1|;
- $medium->{clear_url} and $medium->{clear_url} =~ s|(.*?)/*$|$1|;
-
- $medium;
-}
-
-#- returns the removable device name if it corresponds to an iso image, '' otherwise
-sub is_iso {
- my ($removable_dev) = @_;
- $removable_dev && $removable_dev =~ /\.iso$/i;
+ require File::Path;
+ File::Path::mkpath([ $h{statedir},
+ (map { "$h{cachedir}/$_" } qw(headers partial rpms)),
+ dirname($h{config}),
+ "$urpmi_root/var/lib/rpm",
+ ]);
}
sub protocol_from_url {
my ($url) = @_;
- $url =~ m!^([^:_]*)[^:]*:! && $1;
+ $url =~ m!^(\w+)(_[^:]*)?:! && $1;
}
sub file_from_local_url {
my ($url) = @_;
$url =~ m!^(?:removable[^:]*:/|file:/)?(/.*)! && $1;
}
-sub file_from_file_url {
- my ($url) = @_;
- $url =~ m!^(?:file:/)?(/.*)! && $1;
-}
-
-sub hdlist_or_synthesis_for_virtual_medium {
- my ($medium) = @_;
-
- my $path = file_from_file_url($medium->{url}) or return;
- "$path/$medium->{with_hdlist}";
-}
-
-sub statedir_hdlist_or_synthesis {
- my ($urpm, $medium) = @_;
- $medium->{hdlist} && "$urpm->{statedir}/" . ($medium->{synthesis} ? 'synthesis.' : '') . $medium->{hdlist};
-}
-sub statedir_hdlist {
- my ($urpm, $medium) = @_;
- $medium->{hdlist} && "$urpm->{statedir}/$medium->{hdlist}";
-}
-sub statedir_synthesis {
- my ($urpm, $medium) = @_;
- $medium->{hdlist} && "$urpm->{statedir}/synthesis.$medium->{hdlist}";
-}
-sub statedir_list {
- my ($urpm, $medium) = @_;
- $medium->{list} && "$urpm->{statedir}/$medium->{list}";
-}
-sub statedir_descriptions {
- my ($urpm, $medium) = @_;
- $medium->{name} && "$urpm->{statedir}/descriptions.$medium->{name}";
-}
-sub statedir_names {
- my ($urpm, $medium) = @_;
- $medium->{name} && "$urpm->{statedir}/names.$medium->{name}";
-}
-sub cachedir_hdlist {
- my ($urpm, $medium) = @_;
- $medium->{hdlist} && "$urpm->{cachedir}/partial/$medium->{hdlist}";
-}
-sub cachedir_list {
- my ($urpm, $medium) = @_;
- $medium->{list} && "$urpm->{cachedir}/partial/$medium->{list}";
-}
-
-sub name2medium {
- my ($urpm, $name) = @_;
- my ($medium) = grep { $_->{name} eq $name } @{$urpm->{media}};
- $medium;
-}
-
-#- probe device associated with a removable device.
-sub probe_removable_device {
- my ($urpm, $medium) = @_;
-
- if ($medium->{url} && $medium->{url} =~ /^removable/) {
- #- try to find device name in url scheme, this is deprecated, use medium option "removable" instead
- if ($medium->{url} =~ /^removable_?([^_:]*)/) {
- $medium->{removable} ||= $1 && "/dev/$1";
- }
- } else {
- delete $medium->{removable};
- return;
- }
-
- #- try to find device to open/close for removable medium.
- if (my $dir = file_from_local_url($medium->{url})) {
- my %infos;
- my @mntpoints = urpm::sys::find_mntpoints($dir, \%infos);
- if (@mntpoints > 1) { #- return value is suitable for an hash.
- $urpm->{log}(N("too many mount points for removable medium \"%s\"", $medium->{name}));
- $urpm->{log}(N("taking removable device as \"%s\"", join ',', map { $infos{$_}{device} } @mntpoints));
- }
- if (is_iso($medium->{removable})) {
- $urpm->{log}(N("Medium \"%s\" is an ISO image, will be mounted on-the-fly", $medium->{name}));
- } elsif (@mntpoints) {
- if ($medium->{removable} && $medium->{removable} ne $infos{$mntpoints[-1]}{device}) {
- $urpm->{log}(N("using different removable device [%s] for \"%s\"",
- $infos{$mntpoints[-1]}{device}, $medium->{name}));
- }
- $medium->{removable} = $infos{$mntpoints[-1]}{device};
- } else {
- $urpm->{error}(N("unable to retrieve pathname for removable medium \"%s\"", $medium->{name}));
- }
- } else {
- $urpm->{error}(N("unable to retrieve pathname for removable medium \"%s\"", $medium->{name}));
- }
-}
-
-
-sub write_MD5SUM {
- my ($urpm) = @_;
-
- #- write MD5SUM file
- my $fh = $urpm->open_safe('>', "$urpm->{statedir}/MD5SUM") or return 0;
- foreach my $medium (grep { $_->{md5sum} } @{$urpm->{media}}) {
- my $s = basename(statedir_hdlist_or_synthesis($urpm, $medium));
- print $fh "$medium->{md5sum} $s\n";
- }
-
- $urpm->{log}(N("wrote %s", "$urpm->{statedir}/MD5SUM"));
-
- delete $urpm->{md5sum_modified};
-}
-
-#- Writes the urpmi.cfg file.
-sub write_urpmi_cfg {
- my ($urpm) = @_;
-
- #- avoid trashing exiting configuration if it wasn't loaded
- $urpm->{media} or return;
-
- my $config = {
- #- global config options found in the config file, without the ones
- #- set from the command-line
- '' => $urpm->{global_config},
- };
- foreach my $medium (@{$urpm->{media}}) {
- next if $medium->{external};
- my $medium_name = $medium->{name};
- $config->{$medium_name}{url} = $medium->{clear_url};
- foreach (@PER_MEDIA_OPT) {
- defined $medium->{$_} and $config->{$medium_name}{$_} = $medium->{$_};
- }
- }
- urpm::cfg::dump_config($urpm->{config}, $config)
- or $urpm->{fatal}(6, N("unable to write config file [%s]", $urpm->{config}));
-
- $urpm->{log}(N("wrote config file [%s]", $urpm->{config}));
-
- #- everything should be synced now.
- delete $urpm->{modified};
-}
-
-sub write_config {
- my ($urpm) = @_;
-
- write_urpmi_cfg($urpm);
- write_MD5SUM($urpm);
-}
-
-sub _configure_parallel {
- my ($urpm, $alias) = @_;
- my @parallel_options;
- #- read parallel configuration
- foreach (cat_("/etc/urpmi/parallel.cfg")) {
- chomp; s/#.*$//; s/^\s*//; s/\s*$//;
- /\s*([^:]*):(.*)/ or $urpm->{error}(N("unable to parse \"%s\" in file [%s]", $_, "/etc/urpmi/parallel.cfg")), next;
- $1 eq $alias and push @parallel_options, $2;
- }
- #- if a configuration option has been found, use it; else fatal error.
- my $parallel_handler;
- if (@parallel_options) {
- foreach my $dir (grep { -d $_ } map { "$_/urpm" } @INC) {
- foreach my $pm (grep { -f $_ } glob("$dir/parallel*.pm")) {
- #- load parallel modules
- $urpm->{log}->(N("examining parallel handler in file [%s]", $pm));
- # perl_checker: require urpm::parallel_ka_run
- # perl_checker: require urpm::parallel_ssh
- eval { require $pm; $parallel_handler = $urpm->handle_parallel_options(join("\n", @parallel_options)) };
- $parallel_handler and last;
- }
- $parallel_handler and last;
- }
- }
- if ($parallel_handler) {
- if ($parallel_handler->{nodes}) {
- $urpm->{log}->(N("found parallel handler for nodes: %s", join(', ', keys %{$parallel_handler->{nodes}})));
- }
- $urpm->{parallel_handler} = $parallel_handler;
- } else {
- $urpm->{fatal}(1, N("unable to use parallel option \"%s\"", $alias));
- }
-}
-
-#- read urpmi.cfg file as well as necessary synthesis files
-#- options :
-#- callback
-#- call_back_only_once
-#- excludemedia
-#- hdlist
-#- media
-#- nodepslist
-#- noinstalling
-#- noskipping
-#- parallel
-#- root
-#- searchmedia
-#- skip
-#- sortmedia
-#- update
-#- usedistrib
-sub configure {
- my ($urpm, %options) = @_;
-
- $urpm->clean;
-
- $options{parallel} && $options{usedistrib} and $urpm->{fatal}(1, N("Can't use parallel mode with use-distrib mode"));
-
- if ($options{parallel}) {
- _configure_parallel($urpm, $options{parallel});
-
- if (!$options{media} && $urpm->{parallel_handler}{media}) {
- $options{media} = $urpm->{parallel_handler}{media};
- $urpm->{log}->(N("using associated media for parallel mode: %s", $options{media}));
- }
- } else {
- #- parallel is exclusive against root options.
- $urpm->{root} = $options{root};
- }
-
- $urpm->{root} && ! -c "$urpm->{root}/dev/null"
- and $urpm->{error}(N("there doesn't seem to be devices in the chroot in \"%s\"", $urpm->{root}));
-
- if ($options{synthesis}) {
- if ($options{synthesis} ne 'none') {
- #- synthesis take precedence over media, update options.
- $options{media} || $options{excludemedia} || $options{sortmedia} || $options{update} || $options{parallel} and
- $urpm->{fatal}(1, N("--synthesis cannot be used with --media, --excludemedia, --sortmedia, --update or --parallel"));
- $urpm->parse_synthesis($options{synthesis});
- #- synthesis disables the split of transaction (too risky and not useful).
- $urpm->{options}{'split-length'} = 0;
- }
- } else {
- if ($options{usedistrib}) {
- $urpm->{media} = [];
- $urpm->add_distrib_media("Virtual", $options{usedistrib}, %options, 'virtual' => 1);
- } else {
- $urpm->read_config(%options);
- if (!$options{media} && $urpm->{options}{'default-media'}) {
- $options{media} = $urpm->{options}{'default-media'};
- }
- }
- if ($options{media}) {
- delete $_->{modified} foreach @{$urpm->{media} || []};
- $urpm->select_media(split /,/, $options{media});
- foreach (grep { !$_->{modified} } @{$urpm->{media} || []}) {
- #- this is only a local ignore that will not be saved.
- $_->{tempignore} = $_->{ignore} = 1;
- }
- }
- if ($options{searchmedia}) {
- $urpm->select_media($options{searchmedia}); #- Ensure this media has been selected
- foreach (grep { !$_->{ignore} } @{$urpm->{media} || []}) {
- $_->{name} eq $options{searchmedia} and do {
- $_->{searchmedia} = 1;
- last;
- };
- }
- }
- if ($options{excludemedia}) {
- delete $_->{modified} foreach @{$urpm->{media} || []};
- foreach (select_media_by_name($urpm, [ split /,/, $options{excludemedia} ], {})) {
- $_->{modified} = 1;
- #- this is only a local ignore that will not be saved.
- $_->{tempignore} = $_->{ignore} = 1;
- }
- }
- if ($options{sortmedia}) {
- my @sorted_media = map { select_media_by_name($urpm, [$_], {}) } split(/,/, $options{sortmedia});
- my @remaining = difference2($urpm->{media}, \@sorted_media);
- $urpm->{media} = [ @sorted_media, @remaining ];
- }
- unless ($options{nodepslist}) {
- my $second_pass;
- do {
- foreach (grep { !$_->{ignore} && (!$options{update} || $_->{update}) } @{$urpm->{media} || []}) {
- our $currentmedia = $_; #- hack for urpmf
- delete @$_{qw(start end)};
- if ($_->{virtual}) {
- if (file_from_file_url($_->{url})) {
- if ($_->{synthesis}) {
- _parse_synthesis($urpm, $_,
- hdlist_or_synthesis_for_virtual_medium($_), callback => $options{callback});
- } else {
- #- we'll need a second pass
- defined $second_pass or $second_pass = 1;
- _parse_hdlist($urpm, $_,
- hdlist_or_synthesis_for_virtual_medium($_),
- callback => $options{call_back_only_once} && $second_pass ? undef : $options{callback},
- );
- }
- } else {
- $urpm->{error}(N("virtual medium \"%s\" is not local, medium ignored", $_->{name}));
- $_->{ignore} = 1;
- }
- } else {
- if ($options{hdlist} && file_size(statedir_hdlist($urpm, $_)) > 32) {
- _parse_hdlist($urpm, $_, statedir_hdlist($urpm, $_),
- callback => $options{callback},
- );
- } else {
- _parse_synthesis($urpm, $_,
- statedir_synthesis($urpm, $_),
- callback => $options{callback},
- );
- if (!is_valid_medium($_)) {
- _parse_hdlist($urpm, $_, statedir_hdlist($urpm, $_),
- callback => $options{callback},
- );
- }
- }
- }
- unless ($_->{ignore}) {
- _check_after_reading_hdlist_or_synthesis($urpm, $_);
- }
- unless ($_->{ignore}) {
- if ($_->{searchmedia}) {
- ($urpm->{searchmedia}{start}, $urpm->{searchmedia}{end}) = ($_->{start}, $_->{end});
- $urpm->{log}(N("Search start: %s end: %s",
- $urpm->{searchmedia}{start}, $urpm->{searchmedia}{end}));
- delete $_->{searchmedia};
- }
- }
- }
- } while $second_pass && do {
- require URPM::Build;
- $urpm->{log}(N("performing second pass to compute dependencies\n"));
- $urpm->unresolved_provides_clean;
- $second_pass--;
- };
- }
- }
- #- determine package to withdraw (from skip.list file) only if something should be withdrawn.
- unless ($options{noskipping}) {
- my %uniq;
- $urpm->compute_flags(
- get_packages_list($urpm->{skiplist}, $options{skip}),
- skip => 1,
- callback => sub {
- my ($urpm, $pkg) = @_;
- $pkg->is_arch_compat && ! exists $uniq{$pkg->fullname} or return;
- $uniq{$pkg->fullname} = undef;
- $urpm->{log}(N("skipping package %s", scalar($pkg->fullname)));
- },
- );
- }
- unless ($options{noinstalling}) {
- my %uniq;
- $urpm->compute_flags(
- get_packages_list($urpm->{instlist}),
- disable_obsolete => 1,
- callback => sub {
- my ($urpm, $pkg) = @_;
- $pkg->is_arch_compat && ! exists $uniq{$pkg->fullname} or return;
- $uniq{$pkg->fullname} = undef;
- $urpm->{log}(N("would install instead of upgrade package %s", scalar($pkg->fullname)));
- },
- );
- }
- if ($options{bug}) {
- #- and a dump of rpmdb itself as synthesis file.
- my $db = db_open_or_die($urpm, $options{root});
- my $sig_handler = sub { undef $db; exit 3 };
- local $SIG{INT} = $sig_handler;
- local $SIG{QUIT} = $sig_handler;
-
- open my $rpmdb, "| " . ($ENV{LD_LOADER} || '') . " gzip -9 >'$options{bug}/rpmdb.cz'"
- or $urpm->syserror("Can't fork", "gzip");
- $db->traverse(sub {
- my ($p) = @_;
- #- this is not right but may be enough.
- my $files = join '@', grep { exists($urpm->{provides}{$_}) } $p->files;
- $p->pack_header;
- $p->build_info(fileno $rpmdb, $files);
- });
- close $rpmdb;
- }
-}
-
-#- add a new medium, sync the config file accordingly.
-#- returns the new medium's name. (might be different from the requested
-#- name if index_name was specified)
-sub add_medium {
- my ($urpm, $name, $url, $with_hdlist, %options) = @_;
-
- #- make sure configuration has been read.
- $urpm->{media} or die "caller should have used ->read_config or ->configure first";
- $urpm->lock_urpmi_db('exclusive') if !$options{nolock};
-
- #- if a medium with that name has already been found, we have to exit now
- my $medium;
- if (defined $options{index_name}) {
- my $i = $options{index_name};
- do {
- ++$i;
- $medium = name2medium($urpm, $name . $i);
- } while $medium;
- $name .= $i;
- } else {
- $medium = name2medium($urpm, $name);
- }
- $medium and $urpm->{fatal}(5, N("medium \"%s\" already exists", $medium->{name}));
-
- $url =~ s,/*$,,; #- clear URLs for trailing /es.
-
- #- creating the medium info.
- $medium = { name => $name, url => $url, update => $options{update}, modified => 1, ignore => $options{ignore} };
- if ($options{virtual}) {
- file_from_file_url($url) or $urpm->{fatal}(1, N("virtual medium needs to be local"));
- $medium->{virtual} = 1;
- } else {
- $medium->{hdlist} = "hdlist.$name.cz";
- $medium->{list} = "list.$name";
- $urpm->probe_removable_device($medium);
- }
-
- #- local media have priority, other are added at the end.
- if (file_from_file_url($url)) {
- $medium->{priority} = 0.5;
- } else {
- $medium->{priority} = 1 + @{$urpm->{media}};
- }
-
- #- check whether a password is visible, if not, set clear_url.
- my $has_password = $url =~ m|([^:]*://[^/:\@]*:)[^/:\@]*(\@.*)|;
- $medium->{clear_url} = $url unless $has_password;
-
- $with_hdlist and $medium->{with_hdlist} = $with_hdlist;
-
- #- create an entry in media list.
- push @{$urpm->{media}}, $medium;
-
- $urpm->{log}(N("added medium %s", $name));
-
- #- we need to reload the config, since some string substitutions may have occured
- unless ($options{no_reload_config}) {
- $urpm->write_config;
- delete $urpm->{media};
- $urpm->read_config(nocheck_access => 1);
-
- #- need getting the fresh datastructure after read_config
- $medium = name2medium($urpm, $name); #- need getting the fresh datastructure after read_config
-
- #- Remember that the database has been modified and base files need to be updated.
- $medium->{modified} = 1;
- $urpm->{md5sum_modified} = 1;
- }
- if ($has_password) {
- $medium->{url} = $url;
- }
-
- $options{nolock} or $urpm->unlock_urpmi_db;
- $name;
-}
-
-#- add distribution media, according to url given.
-#- returns the list of names of added media.
-#- options :
-#- - limit_rate, compress : for downloading files
-#- - initial_number : when adding several numbered media, start with this number
-#- - probe_with : if eq 'synthesis', use synthesis instead of hdlists
-#- - ask_media : callback to know whether each media should be added
-#- other options are passed to add_medium()
-sub add_distrib_media {
- my ($urpm, $name, $url, %options) = @_;
-
- #- make sure configuration has been read.
- $urpm->{media} or die "caller should have used ->read_config or ->configure first";
-
- my $distribconf;
-
- if (my $dir = file_from_local_url($url)) {
- $urpm->try_mounting($dir)
- or $urpm->{error}(N("unable to mount the distribution medium")), return ();
- $distribconf = MDV::Distribconf->new($dir, undef);
- $distribconf->load
- or $urpm->{error}(N("this location doesn't seem to contain any distribution")), return ();
- } else {
- unlink "$urpm->{cachedir}/partial/media.cfg";
-
- $distribconf = MDV::Distribconf->new($url, undef);
- $distribconf->settree('mandriva');
-
- eval {
- $urpm->{log}(N("retrieving media.cfg file..."));
- sync_webfetch($urpm, undef,
- [ reduce_pathname($distribconf->getfullpath(undef, 'infodir') . '/media.cfg') ],
- \%options, quiet => 1);
- $urpm->{log}(N("...retrieving done"));
- };
- $@ and $urpm->{error}(N("...retrieving failed: %s", $@));
- if (-e "$urpm->{cachedir}/partial/media.cfg") {
- $distribconf->parse_mediacfg("$urpm->{cachedir}/partial/media.cfg")
- or $urpm->{error}(N("unable to parse media.cfg")), return();
- } else {
- $urpm->{error}(N("unable to access the distribution medium (no media.cfg file found)"));
- return ();
- }
- }
-
- #- cosmetic update of name if it contains spaces.
- $name =~ /\s/ and $name .= ' ';
-
- my @newnames;
- #- at this point, we have found a media.cfg file, so parse it
- #- and create all necessary media according to it.
- my $medium = $options{initial_number} || 1;
-
- foreach my $media ($distribconf->listmedia) {
- my $skip = 0;
- # if one of those values is set, by default, we skip adding the media
- foreach (qw(noauto)) {
- $distribconf->getvalue($media, $_) and do {
- $skip = 1;
- last;
- };
- }
- if ($options{ask_media}) {
- if ($options{ask_media}->(
- $distribconf->getvalue($media, 'name'),
- !$skip,
- )) {
- $skip = 0;
- } else {
- $skip = 1;
- }
- }
- $skip and next;
-
- my $media_name = $distribconf->getvalue($media, 'name') || '';
- my $is_update_media = $distribconf->getvalue($media, 'updates_for');
-
- push @newnames, $urpm->add_medium(
- $name ? "$media_name ($name$medium)" : $media_name,
- reduce_pathname($distribconf->getfullpath($media, 'path')),
- offset_pathname(
- $url,
- $distribconf->getpath($media, 'path'),
- ) . '/' . $distribconf->getpath($media, $options{probe_with} eq 'synthesis' ? 'synthesis' : 'hdlist'),
- index_name => $name ? undef : 0,
- no_reload_config => 1, #- no need to reload config each time, since we don't update the media
- %options,
- # the following override %options
- update => $is_update_media ? 1 : undef,
- );
- ++$medium;
- }
- return @newnames;
-}
-
-#- deprecated, use select_media_by_name instead
-sub select_media {
- my $urpm = shift;
- my $options = {};
- if (ref $_[0]) { $options = shift }
- foreach (select_media_by_name($urpm, [ @_ ], $options)) {
- #- select medium by setting the modified flag, do not check ignore.
- $_->{modified} = 1;
- }
-}
-
-sub select_media_by_name {
- my ($urpm, $names, $options) = @_;
-
- my %wanted = map { $_ => 1 } @$names;
-
- #- first the exact matches
- my @l = grep { delete $wanted{$_->{name}} } @{$urpm->{media}};
-
- #- check if some arguments don't correspond to the medium name.
- #- in such case, try to find the unique medium (or list candidate
- #- media found).
- foreach (keys %wanted) {
- my $q = quotemeta;
- my (@found, @foundi);
- my $regex = $options->{strict_match} ? qr/^$q$/ : qr/$q/;
- my $regexi = $options->{strict_match} ? qr/^$q$/i : qr/$q/i;
- foreach my $medium (@{$urpm->{media}}) {
- $medium->{name} =~ $regex and push @found, $medium;
- $medium->{name} =~ $regexi and push @foundi, $medium;
- }
- @found = @foundi if !@found;
-
- if (@found == 0) {
- $urpm->{error}(N("trying to select nonexistent medium \"%s\"", $_));
- } else {
- if (@found > 1) {
- $urpm->{log}(N("selecting multiple media: %s", join(", ", map { qq("$_->{name}") } @found)));
- }
- #- changed behaviour to select all occurences by default.
- push @l, @found;
- }
- }
- @l;
-}
-
-#- deprecated, use remove_media instead
-sub remove_selected_media {
- my ($urpm) = @_;
-
- remove_media($urpm, [ grep { $_->{modified} } @{$urpm->{media}} ]);
-}
-
-sub remove_media {
- my ($urpm, $to_remove) = @_;
-
- foreach my $medium (@$to_remove) {
- $urpm->{log}(N("removing medium \"%s\"", $medium->{name}));
-
- #- mark to re-write configuration.
- $urpm->{modified} = 1;
-
- #- remove files associated with this medium.
- unlink grep { $_ } map { $_->($urpm, $medium) } \&statedir_hdlist, \&statedir_list, \&statedir_synthesis, \&statedir_descriptions, \&statedir_names;
-
- #- remove proxy settings for this media
- urpm::download::remove_proxy_media($medium->{name});
- }
-
- $urpm->{media} = [ difference2($urpm->{media}, $to_remove) ];
-}
-
-#- return list of synthesis or hdlist reference to probe.
-sub _probe_with_try_list {
- my ($suffix, $probe_with) = @_;
- my @probe = (
- "media_info/synthesis.hdlist.cz",
- "../media_info/synthesis.hdlist_$suffix.cz",
- "synthesis.hdlist.cz",
- );
- my @probe_hdlist = (
- "media_info/hdlist.cz",
- "../media_info/hdlist_$suffix.cz",
- "hdlist.cz",
- );
- if ($probe_with =~ /synthesis/) {
- push @probe, @probe_hdlist;
- } else {
- unshift @probe, @probe_hdlist;
- }
- @probe;
-}
-
-sub may_reconfig_urpmi {
- my ($urpm, $medium, $options) = @_;
-
- my $f;
- if (my $dir = file_from_file_url($medium->{url})) {
- $f = reduce_pathname("$dir/reconfig.urpmi");
- } else {
- unlink($f = "$urpm->{cachedir}/partial/reconfig.urpmi");
- eval {
- sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/reconfig.urpmi") ],
- $options, quiet => 1);
- };
- }
- if (-s $f) {
- reconfig_urpmi($urpm, $f, $medium->{name});
- }
- unlink $f if !file_from_file_url($medium->{url});
-}
-
-#- read a reconfiguration file for urpmi, and reconfigure media accordingly
-#- $rfile is the reconfiguration file (local), $name is the media name
-#-
-#- the format is similar to the RewriteRule of mod_rewrite, so:
-#- PATTERN REPLACEMENT [FLAG]
-#- where FLAG can be L or N
-#-
-#- example of reconfig.urpmi:
-#- # this is an urpmi reconfiguration file
-#- /cooker /cooker/$ARCH
-sub reconfig_urpmi {
- my ($urpm, $rfile, $name) = @_;
- -r $rfile or return;
-
- $urpm->{log}(N("reconfiguring urpmi for media \"%s\"", $name));
-
- my ($magic, @lines) = cat_($rfile);
- #- the first line of reconfig.urpmi must be magic, to be sure it's not an error file
- $magic =~ /^# this is an urpmi reconfiguration file/ or return undef;
-
- my @replacements;
- foreach (@lines) {
- chomp;
- s/^\s*//; s/#.*$//; s/\s*$//;
- $_ or next;
- my ($p, $r, $f) = split /\s+/, $_, 3;
- push @replacements, [ quotemeta $p, $r, $f || 1 ];
- }
-
- my $reconfigured = 0;
- my @reconfigurable = qw(url with_hdlist clear_url);
-
- my $medium = name2medium($urpm, $name) or return;
- my %orig = %$medium;
-
- URLS:
- foreach my $k (@reconfigurable) {
- foreach my $r (@replacements) {
- if ($medium->{$k} =~ s/$r->[0]/$r->[1]/) {
- $reconfigured = 1;
- #- Flags stolen from mod_rewrite: L(ast), N(ext)
- if ($r->[2] =~ /L/) {
- last;
- } elsif ($r->[2] =~ /N/) { #- dangerous option
- redo URLS;
- }
- }
- }
- #- check that the new url exists before committing changes (local mirrors)
- my $file = file_from_local_url($medium->{$k});
- if ($file && !-e $file) {
- %$medium = %orig;
- $reconfigured = 0;
- $urpm->{log}(N("...reconfiguration failed"));
- return;
- }
- }
-
- if ($reconfigured) {
- $urpm->{log}(N("reconfiguration done"));
- $urpm->write_config;
- }
- $reconfigured;
-}
-
-sub _guess_hdlist_suffix {
- my ($dir) = @_;
- my ($suffix) = $dir =~ m!\bmedia/(\w+)/*\Z!;
- $suffix;
-}
-
-sub _hdlist_suffix {
- my ($medium) = @_;
- $medium->{with_hdlist} =~ /hdlist(.*?)(?:\.src)?\.cz$/ ? $1 : '';
-}
-
-sub _update_media__when_not_modified {
- my ($urpm, $medium) = @_;
-
- delete @$medium{qw(start end)};
- if ($medium->{virtual}) {
- if (file_from_file_url($medium->{url})) {
- if ($medium->{synthesis}) {
- _parse_synthesis($urpm, $medium, hdlist_or_synthesis_for_virtual_medium($medium));
- } else {
- _parse_hdlist($urpm, $medium, hdlist_or_synthesis_for_virtual_medium($medium));
- }
- } else {
- $urpm->{error}(N("virtual medium \"%s\" is not local, medium ignored", $medium->{name}));
- $medium->{ignore} = 1;
- }
- } else {
- _parse_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium));
- if (!is_valid_medium($medium)) {
- _parse_hdlist($urpm, $medium, statedir_hdlist($urpm, $medium));
- }
- }
- unless ($medium->{ignore}) {
- _check_after_reading_hdlist_or_synthesis($urpm, $medium);
- }
-}
-
-sub _update_media__virtual {
- my ($urpm, $medium, $with_hdlist_dir) = @_;
-
- if ($medium->{with_hdlist} && -e $with_hdlist_dir) {
- delete @$medium{qw(start end)};
- if ($medium->{synthesis}) {
- _parse_synthesis($urpm, $medium, $with_hdlist_dir);
- delete $medium->{modified};
- $medium->{synthesis} = 1;
- $urpm->{md5sum_modified} = 1;
- if (!is_valid_medium($medium)) {
- _parse_hdlist($urpm, $medium, $with_hdlist_dir);
- delete @$medium{qw(modified synthesis)};
- }
- } else {
- _parse_hdlist($urpm, $medium, $with_hdlist_dir);
- delete @$medium{qw(modified synthesis)};
- $urpm->{md5sum_modified} = 1;
- if (!is_valid_medium($medium)) {
- _parse_synthesis($urpm, $medium, $with_hdlist_dir);
- delete $medium->{modified};
- $medium->{synthesis} = 1;
- }
- }
- _check_after_reading_hdlist_or_synthesis($urpm, $medium);
- } else {
- $urpm->{error}(N("virtual medium \"%s\" should have valid source hdlist or synthesis, medium ignored",
- $medium->{name}));
- $medium->{ignore} = 1;
- }
-}
-
-sub generate_media_names {
- my ($urpm) = @_;
-
- #- make sure names files are regenerated.
- foreach (@{$urpm->{media}}) {
- unlink statedir_names($urpm, $_);
- if (is_valid_medium($_)) {
- my $fh = $urpm->open_safe(">", statedir_names($urpm, $_));
- if ($fh) {
- foreach ($_->{start} .. $_->{end}) {
- if (defined $urpm->{depslist}[$_]) {
- print $fh $urpm->{depslist}[$_]->name . "\n";
- } else {
- $urpm->{error}(N("Error generating names file: dependency %d not found", $_));
- }
- }
- close $fh;
- } else {
- $urpm->{error}(N("Error generating names file: Can't write to file (%s)", $!));
- }
- }
- }
-}
-
-
-sub _read_existing_synthesis_and_hdlist_if_same_time_and_msize {
- my ($urpm, $medium, $basename) = @_;
-
- same_size_and_mtime("$urpm->{cachedir}/partial/$basename",
- statedir_hdlist($urpm, $medium)) or return;
-
- unlink "$urpm->{cachedir}/partial/$basename";
-
- _read_existing_synthesis_and_hdlist($urpm, $medium);
-
- 1;
-}
-
-sub _read_existing_synthesis_and_hdlist_if_same_md5sum {
- my ($urpm, $medium, $retrieved_md5sum) = @_;
-
- #- if an existing hdlist or synthesis file has the same md5sum, we assume the
- #- files are the same.
- #- if local md5sum is the same as distant md5sum, this means there is no need to
- #- download hdlist or synthesis file again.
- $retrieved_md5sum && $medium->{md5sum} eq $retrieved_md5sum or return;
-
- unlink "$urpm->{cachedir}/partial/" . basename($medium->{with_hdlist});
-
- _read_existing_synthesis_and_hdlist($urpm, $medium);
-
- 1;
-}
-
-sub _read_existing_synthesis_and_hdlist {
- my ($urpm, $medium) = @_;
-
- $urpm->{log}(N("medium \"%s\" is up-to-date", $medium->{name}));
-
- #- the medium is now considered not modified.
- $medium->{modified} = 0;
- #- XXX we could link the new hdlist to the old one.
- #- (However links need to be managed. see bug #12391.)
- #- as previously done, just read synthesis file here, this is enough.
- _parse_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium));
- if (!is_valid_medium($medium)) {
- _parse_hdlist($urpm, $medium, statedir_hdlist($urpm, $medium));
- _check_after_reading_hdlist_or_synthesis($urpm, $medium);
- }
-
- 1;
-}
-
-sub _parse_hdlist {
- my ($urpm, $medium, $hdlist_file, %args) = @_;
-
- $urpm->{log}(N("examining hdlist file [%s]", $hdlist_file));
- ($medium->{start}, $medium->{end}) = $urpm->parse_hdlist($hdlist_file, packing => 1, %args);
-}
-
-sub _parse_synthesis {
- my ($urpm, $medium, $synthesis_file, %args) = @_;
-
- $urpm->{log}(N("examining synthesis file [%s]", $synthesis_file));
- ($medium->{start}, $medium->{end}) = $urpm->parse_synthesis($synthesis_file, %args);
-}
-
-sub is_valid_medium {
- my ($medium) = @_;
- defined $medium->{start} && defined $medium->{end};
-}
-
-sub _check_after_reading_hdlist_or_synthesis {
- my ($urpm, $medium) = @_;
-
- if (!is_valid_medium($medium)) {
- $urpm->{error}(N("problem reading hdlist or synthesis file of medium \"%s\"", $medium->{name}));
- $medium->{ignore} = 1;
- }
-}
sub db_open_or_die {
- my ($urpm, $root, $b_force) = @_;
+ my ($urpm, $root, $b_write_perm) = @_;
+
+ $urpm->{debug} and $urpm->{debug}("opening rpmdb (root=$root, write=$b_write_perm)");
- my $db = URPM::DB::open($root, $b_force)
+ my $db = URPM::DB::open($root, $b_write_perm || 0)
or $urpm->{fatal}(9, N("unable to open rpmdb"));
$db;
}
-sub _update_media__sync_file {
- my ($urpm, $medium, $name, $options) = @_;
-
- my $local_name = $name . _hdlist_suffix($medium);
-
- foreach (reduce_pathname("$medium->{url}/$medium->{with_hdlist}/../$local_name"),
- reduce_pathname("$medium->{url}/$name")) {
- eval {
- sync_webfetch($urpm, $medium, [$_], $options, quiet => 1);
-
- if ($local_name ne $name && -s "$urpm->{cachedir}/partial/$local_name") {
- rename("$urpm->{cachedir}/partial/$local_name",
- "$urpm->{cachedir}/partial/$name");
- }
- };
- $@ and unlink "$urpm->{cachedir}/partial/$name";
- -s "$urpm->{cachedir}/partial/$name" and last;
- }
-}
-
-sub recursive_find_rpm_files {
- my ($dir) = @_;
-
- my %f;
- local $_; #- help perl_checker not warning "undeclared $_" in wanted callback below
- File::Find::find(
- {
- wanted => sub { -f $_ && /\.rpm$/ and $f{"$File::Find::dir/$_"} = 1 },
- follow_skip => 2,
- follow_fast => 1,
- },
- $dir,
- );
- keys %f;
-}
-
-sub clean_dir {
- my ($dir) = @_;
-
- require File::Path;
- File::Path::rmtree([$dir]);
- mkdir $dir, 0755;
-}
-
-sub _update_medium__get_descriptions_local {
- my ($urpm, $medium) = @_;
-
- unlink statedir_descriptions($urpm, $medium);
-
- my $dir = file_from_local_url($medium->{url});
- my $description_file = "$dir/media_info/descriptions"; #- new default location
- -e $description_file or $description_file = "$dir/../descriptions";
- -e $description_file or return;
-
- $urpm->{log}(N("copying description file of \"%s\"...", $medium->{name}));
- if (copy_and_own($description_file, statedir_descriptions($urpm, $medium))) {
- $urpm->{log}(N("...copying done"));
- } else {
- $urpm->{error}(N("...copying failed"));
- $medium->{ignore} = 1;
- }
-}
-sub _update_medium__get_descriptions_remote {
- my ($urpm, $medium, $options) = @_;
-
- unlink "$urpm->{cachedir}/partial/descriptions";
-
- if (-e statedir_descriptions($urpm, $medium)) {
- urpm::util::move(statedir_descriptions($urpm, $medium), "$urpm->{cachedir}/partial/descriptions");
- }
- eval {
- sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/media_info/descriptions") ],
- $options, quiet => 1);
- };
- #- It is possible that the original fetch of the descriptions
- #- failed, but the file still remains in partial/ because it was
- #- moved from $urpm->{statedir} earlier. So we need to check if
- #- the previous download failed.
- if ($@ || ! -e "$urpm->{cachedir}/partial/descriptions") {
- eval {
- #- try older location
- sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/../descriptions") ],
- $options, quiet => 1);
- };
- }
- if (-e "$urpm->{cachedir}/partial/descriptions") {
- urpm::util::move("$urpm->{cachedir}/partial/descriptions", statedir_descriptions($urpm, $medium));
- }
-}
-
-sub _update_medium_first_pass__local {
- my ($urpm, $medium, $second_pass, $clean_cache, $retrieved_md5sum, $rpm_files, $options) = @_;
-
- my $dir = file_from_local_url($medium->{url});
-
- #- try to figure a possible hdlist_path (or parent directory of searched directory).
- #- this is used to probe for a possible hdlist file.
- my $with_hdlist_dir = reduce_pathname($dir . ($medium->{with_hdlist} ? "/$medium->{with_hdlist}" : "/.."));
-
- #- the directory given does not exist and may be accessible
- #- by mounting some other directory. Try to figure it out and mount
- #- everything that might be necessary.
- -d $dir or $urpm->try_mounting(
- $options->{force} < 2 && ($options->{probe_with} || $medium->{with_hdlist})
- ? $with_hdlist_dir : $dir,
- #- in case of an iso image, pass its name
- is_iso($medium->{removable}) && $medium->{removable},
- ) or $urpm->{error}(N("unable to access medium \"%s\",
-this could happen if you mounted manually the directory when creating the medium.", $medium->{name})), return 'unmodified';
-
- #- try to probe for possible with_hdlist parameter, unless
- #- it is already defined (and valid).
- if ($options->{probe_with} && (!$medium->{with_hdlist} || ! -e "$dir/$medium->{with_hdlist}")) {
- foreach (_probe_with_try_list(_guess_hdlist_suffix($dir), $options->{probe_with})) {
- if (file_size("$dir/$_") > 32) {
- $medium->{with_hdlist} = $_;
- last;
- }
- }
- #- redo...
- $with_hdlist_dir = reduce_pathname($dir . ($medium->{with_hdlist} ? "/$medium->{with_hdlist}" : "/.."));
- }
-
- if ($medium->{virtual}) {
- #- syncing a virtual medium is very simple, just try to read the file in order to
- #- determine its type, once a with_hdlist has been found (but is mandatory).
- _update_media__virtual($urpm, $medium, $with_hdlist_dir);
- }
-
- _update_medium__get_descriptions_local($urpm, $medium);
-
- #- examine if a distant MD5SUM file is available.
- #- this will only be done if $with_hdlist is not empty in order to use
- #- an existing hdlist or synthesis file, and to check if download was good.
- #- if no MD5SUM is available, do it as before...
- #- we can assume at this point a basename is existing, but it needs
- #- to be checked for being valid, nothing can be deduced if no MD5SUM
- #- file is present.
-
- my $error;
-
- unless ($medium->{virtual}) {
- if ($medium->{with_hdlist}) {
- if (!$options->{nomd5sum} && file_size(reduce_pathname("$with_hdlist_dir/../MD5SUM")) > 32) {
- recompute_local_md5sum($urpm, $medium, $options->{force});
- if ($medium->{md5sum}) {
- $$retrieved_md5sum = parse_md5sum($urpm, reduce_pathname("$with_hdlist_dir/../MD5SUM"), basename($with_hdlist_dir));
- _read_existing_synthesis_and_hdlist_if_same_md5sum($urpm, $medium, $$retrieved_md5sum)
- and return 'unmodified';
- }
- }
-
- #- if the source hdlist is present and we are not forcing using rpm files
- if ($options->{force} < 2 && -e $with_hdlist_dir) {
- unlink cachedir_hdlist($urpm, $medium);
- $urpm->{log}(N("copying source hdlist (or synthesis) of \"%s\"...", $medium->{name}));
- $options->{callback} and $options->{callback}('copy', $medium->{name});
- if (copy_and_own($with_hdlist_dir, cachedir_hdlist($urpm, $medium))) {
- $options->{callback} and $options->{callback}('done', $medium->{name});
- $urpm->{log}(N("...copying done"));
- } else {
- $options->{callback} and $options->{callback}('failed', $medium->{name});
- #- force error, reported afterwards
- unlink cachedir_hdlist($urpm, $medium);
- }
- }
-
- file_size(cachedir_hdlist($urpm, $medium)) > 32 or
- $error = 1, $urpm->{error}(N("copy of [%s] failed (file is suspiciously small)",
- cachedir_hdlist($urpm, $medium)));
-
- #- keep checking md5sum of file just copied ! (especially on nfs or removable device).
- if (!$error && $$retrieved_md5sum) {
- $urpm->{log}(N("computing md5sum of copied source hdlist (or synthesis)"));
- md5sum(cachedir_hdlist($urpm, $medium)) eq $$retrieved_md5sum or
- $error = 1, $urpm->{error}(N("copy of [%s] failed (md5sum mismatch)", $with_hdlist_dir));
- }
-
- #- check if the files are equal... and no force copy...
- if (!$error && !$options->{force} && -e statedir_synthesis($urpm, $medium)) {
- _read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium, $medium->{hdlist})
- and return 'unmodified';
- }
- } else {
- $error = 1;
- }
-
- #- if copying hdlist has failed, try to build it directly.
- if ($error) {
- if ($urpm->{options}{norebuild}) {
- $urpm->{error}(N("unable to access hdlist file of \"%s\", medium ignored", $medium->{name}));
- $medium->{ignore} = 1;
- } else {
- $options->{force} < 2 and $options->{force} = 2;
- #- clear error state now.
- $error = undef;
- }
- }
-
- if ($options->{force} < 2) {
- #- examine if a local list file is available (always probed according to with_hdlist)
- #- and check hdlist wasn't named very strangely...
- if ($medium->{hdlist} ne 'list') {
- my $local_list = 'list' . _hdlist_suffix($medium);
- my $path_list = reduce_pathname("$with_hdlist_dir/../$local_list");
- -e $path_list or $path_list = "$dir/list";
- if (-e $path_list) {
- copy_and_own($path_list, "$urpm->{cachedir}/partial/list")
- or do { $urpm->{error}(N("...copying failed")); $error = 1 };
- }
- }
- } else {
- push @$rpm_files, recursive_find_rpm_files($dir);
-
- #- check files contains something good!
- if (@$rpm_files > 0) {
- #- we need to rebuild from rpm files the hdlist.
- eval {
- $urpm->{log}(N("reading rpm files from [%s]", $dir));
- my @unresolved_before = grep {
- ! defined $urpm->{provides}{$_};
- } keys %{$urpm->{provides} || {}};
- $medium->{start} = @{$urpm->{depslist}};
- $medium->{headers} = [ $urpm->parse_rpms_build_headers(
- dir => "$urpm->{cachedir}/headers",
- rpms => $rpm_files,
- clean => $$clean_cache,
- ) ];
- $medium->{end} = $#{$urpm->{depslist}};
- if ($medium->{start} > $medium->{end}) {
- #- an error occured (provided there are files in input.)
- delete $medium->{start};
- delete $medium->{end};
- $urpm->{fatal}(9, N("no rpms read"));
- } else {
- #- make sure the headers will not be removed for another media.
- $$clean_cache = 0;
- my @unresolved = grep {
- ! defined $urpm->{provides}{$_};
- } keys %{$urpm->{provides} || {}};
- @unresolved_before == @unresolved or $$second_pass = 1;
- }
- };
- $@ and $error = 1, $urpm->{error}(N("unable to read rpm files from [%s]: %s", $dir, $@));
- $error and delete $medium->{headers}; #- do not propagate these.
- $error or delete $medium->{synthesis}; #- when building hdlist by ourself, drop synthesis property.
- } else {
- $error = 1;
- $urpm->{error}(N("no rpm files found from [%s]", $dir));
- $medium->{ignore} = 1;
- }
- }
- }
-
- #- examine if a local pubkey file is available.
- if (!$options->{nopubkey} && $medium->{hdlist} ne 'pubkey' && !$medium->{'key-ids'}) {
- my $path_pubkey = reduce_pathname("$with_hdlist_dir/../pubkey" . _hdlist_suffix($medium));
- -e $path_pubkey or $path_pubkey = "$dir/pubkey";
- if ($path_pubkey) {
- copy_and_own($path_pubkey, "$urpm->{cachedir}/partial/pubkey")
- or do { $urpm->{error}(N("...copying failed")) };
- }
- }
-
- $error;
-}
-
-sub _update_medium_first_pass__remote {
- my ($urpm, $medium, $retrieved_md5sum, $options) = @_;
- my ($error, $basename);
-
- _update_medium__get_descriptions_remote($urpm, $medium, $options);
-
- #- examine if a distant MD5SUM file is available.
- #- this will only be done if $with_hdlist is not empty in order to use
- #- an existing hdlist or synthesis file, and to check if download was good.
- #- if no MD5SUM is available, do it as before...
- if ($medium->{with_hdlist}) {
- #- we can assume at this point a basename is existing, but it needs
- #- to be checked for being valid, nothing can be deduced if no MD5SUM
- #- file is present.
- $basename = basename($medium->{with_hdlist});
-
- unlink "$urpm->{cachedir}/partial/MD5SUM";
- eval {
- if (!$options->{nomd5sum}) {
- sync_webfetch($urpm, $medium,
- [ reduce_pathname("$medium->{url}/$medium->{with_hdlist}/../MD5SUM") ],
- $options, quiet => 1);
- }
- };
- if (!$@ && file_size("$urpm->{cachedir}/partial/MD5SUM") > 32) {
- recompute_local_md5sum($urpm, $medium, $options->{force} >= 2);
- if ($medium->{md5sum}) {
- $$retrieved_md5sum = parse_md5sum($urpm, "$urpm->{cachedir}/partial/MD5SUM", $basename);
- _read_existing_synthesis_and_hdlist_if_same_md5sum($urpm, $medium, $$retrieved_md5sum)
- and return 'unmodified';
- }
- } else {
- #- at this point, we don't if a basename exists and is valid, let probe it later.
- $basename = undef;
- }
- }
-
- #- try to probe for possible with_hdlist parameter, unless
- #- it is already defined (and valid).
- $urpm->{log}(N("retrieving source hdlist (or synthesis) of \"%s\"...", $medium->{name}));
- $options->{callback} and $options->{callback}('retrieve', $medium->{name});
- if ($options->{probe_with}) {
- my @probe_list = (
- $medium->{with_hdlist}
- ? $medium->{with_hdlist}
- : _probe_with_try_list(_guess_hdlist_suffix($medium->{url}), $options->{probe_with})
- );
- foreach my $with_hdlist (@probe_list) {
- $basename = basename($with_hdlist) or next;
- $options->{force} and unlink "$urpm->{cachedir}/partial/$basename";
- eval {
- sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/$with_hdlist") ],
- $options, callback => $options->{callback});
- };
- if (!$@ && file_size("$urpm->{cachedir}/partial/$basename") > 32) {
- $medium->{with_hdlist} = $with_hdlist;
- $urpm->{log}(N("found probed hdlist (or synthesis) as %s", $medium->{with_hdlist}));
- last; #- found a suitable with_hdlist in the list above.
- }
- }
- } else {
- $basename = basename($medium->{with_hdlist});
-
- if ($options->{force}) {
- unlink "$urpm->{cachedir}/partial/$basename";
- } else {
- #- try to sync (copy if needed) local copy after restored the previous one.
- #- this is useful for rsync (?)
- if (-e statedir_hdlist_or_synthesis($urpm, $medium)) {
- copy_and_own(
- statedir_hdlist_or_synthesis($urpm, $medium),
- "$urpm->{cachedir}/partial/$basename",
- ) or $urpm->{error}(N("...copying failed")), $error = 1;
- }
- }
- eval {
- sync_webfetch($urpm, $medium, [ reduce_pathname("$medium->{url}/$medium->{with_hdlist}") ],
- $options, callback => $options->{callback});
- };
- if ($@) {
- $urpm->{error}(N("...retrieving failed: %s", $@));
- unlink "$urpm->{cachedir}/partial/$basename";
- }
- }
-
- #- check downloaded file has right signature.
- if (file_size("$urpm->{cachedir}/partial/$basename") > 32 && $$retrieved_md5sum) {
- $urpm->{log}(N("computing md5sum of retrieved source hdlist (or synthesis)"));
- unless (md5sum("$urpm->{cachedir}/partial/$basename") eq $$retrieved_md5sum) {
- $urpm->{error}(N("...retrieving failed: md5sum mismatch"));
- unlink "$urpm->{cachedir}/partial/$basename";
- }
- }
-
- if (file_size("$urpm->{cachedir}/partial/$basename") > 32) {
- $options->{callback} and $options->{callback}('done', $medium->{name});
- $urpm->{log}(N("...retrieving done"));
-
- unless ($options->{force}) {
- _read_existing_synthesis_and_hdlist_if_same_time_and_msize($urpm, $medium, $basename)
- and return 'unmodified';
- }
-
- #- the files are different, update local copy.
- rename("$urpm->{cachedir}/partial/$basename", cachedir_hdlist($urpm, $medium));
-
- #- retrieval of hdlist or synthesis has been successful,
- #- check whether a list file is available.
- #- and check hdlist wasn't named very strangely...
- if ($medium->{hdlist} ne 'list') {
- _update_media__sync_file($urpm, $medium, 'list', $options);
- }
-
- #- retrieve pubkey file.
- if (!$options->{nopubkey} && $medium->{hdlist} ne 'pubkey' && !$medium->{'key-ids'}) {
- _update_media__sync_file($urpm, $medium, 'pubkey', $options);
- }
- } else {
- $error = 1;
- $options->{callback} and $options->{callback}('failed', $medium->{name});
- $urpm->{error}(N("retrieval of source hdlist (or synthesis) failed"));
- }
- $error;
-}
-
-sub _read_cachedir_pubkey {
- my ($urpm, $medium) = @_;
- -s "$urpm->{cachedir}/partial/pubkey" or return;
-
- $urpm->{log}(N("examining pubkey file of \"%s\"...", $medium->{name}));
-
- my %key_ids;
- $urpm->import_needed_pubkeys(
- [ $urpm->parse_armored_file("$urpm->{cachedir}/partial/pubkey") ],
- root => $urpm->{root},
- callback => sub {
- my (undef, undef, $_k, $id, $imported) = @_;
- if ($id) {
- $key_ids{$id} = undef;
- $imported and $urpm->{log}(N("...imported key %s from pubkey file of \"%s\"",
- $id, $medium->{name}));
- } else {
- $urpm->{error}(N("unable to import pubkey file of \"%s\"", $medium->{name}));
- }
- });
- if (keys(%key_ids)) {
- $medium->{'key-ids'} = join(',', keys %key_ids);
- }
-}
-
-sub _update_medium_first_pass {
- my ($urpm, $medium, $second_pass, $clean_cache, %options) = @_;
-
- $medium->{ignore} and return;
-
- $options{forcekey} and delete $medium->{'key-ids'};
-
- #- we should create the associated synthesis file if it does not already exist...
- file_size(statedir_synthesis($urpm, $medium)) > 32
- or $medium->{modified_synthesis} = 1;
-
- if ($medium->{static}) {
- #- don't ever update static media
- $medium->{modified} = 0;
- } elsif ($options{all}) {
- #- if we're rebuilding all media, mark them as modified (except removable ones)
- $medium->{modified} ||= $medium->{url} !~ m!^removable!;
- }
-
- unless ($medium->{modified}) {
- #- the medium is not modified, but to compute dependencies,
- #- we still need to read it and all synthesis will be written if
- #- an unresolved provides is found.
- #- to speed up the process, we only read the synthesis at the beginning.
- _update_media__when_not_modified($urpm, $medium);
- return;
- }
-
- #- always delete a remaining list file or pubkey file in cache.
- foreach (qw(list pubkey)) {
- unlink "$urpm->{cachedir}/partial/$_";
- }
-
- #- check for a reconfig.urpmi file (if not already reconfigured)
- if (!$medium->{noreconfigure}) {
- may_reconfig_urpmi($urpm, $medium, \%options);
- }
-
- #- list of rpm files for this medium, only available for local medium where
- #- the source hdlist is not used (use force).
- my ($error, $retrieved_md5sum, @files);
-
- #- check if the medium is using a local or a removable medium.
- if (file_from_local_url($medium->{url})) {
- my $rc = _update_medium_first_pass__local($urpm, $medium, $second_pass, $clean_cache, \$retrieved_md5sum, \@files, \%options);
- if ($rc eq 'unmodified') {
- return;
- } else {
- $error = $rc;
- }
- } else {
- my $rc = _update_medium_first_pass__remote($urpm, $medium, \$retrieved_md5sum, \%options);
- if ($rc eq 'unmodified') {
- return;
- } else {
- $error = $rc;
- }
- }
-
- #- build list file according to hdlist.
- unless ($medium->{headers} || file_size(cachedir_hdlist($urpm, $medium)) > 32) {
- $error = 1;
- $urpm->{error}(N("no hdlist file found for medium \"%s\"", $medium->{name}));
- }
-
- unless ($error || $medium->{virtual}) {
- #- sort list file contents according to id.
- my %list;
- if ($medium->{headers}) {
- my $protocol = protocol_from_url($medium->{url});
-
- #- rpm files have already been read (first pass), there is just a need to
- #- build list hash.
- foreach (@files) {
- m|/([^/]*\.rpm)$| or next;
- $list{$1} and $urpm->{error}(N("file [%s] already used in the same medium \"%s\"", $1, $medium->{name})), next;
- $list{$1} = "$protocol:/$_\n";
- }
- } else {
- #- read first pass hdlist or synthesis, try to open as synthesis, if file
- #- is larger than 1MB, this is probably an hdlist else a synthesis.
- #- anyway, if one tries fails, try another mode.
- $options{callback} and $options{callback}('parse', $medium->{name});
- my @unresolved_before = grep { ! defined $urpm->{provides}{$_} } keys %{$urpm->{provides} || {}};
- if (!$medium->{synthesis}
- || file_size(cachedir_hdlist($urpm, $medium)) > 262144) {
- _parse_hdlist($urpm, $medium, cachedir_hdlist($urpm, $medium));
- if (is_valid_medium($medium)) {
- delete $medium->{synthesis};
- } else {
- _parse_synthesis($urpm, $medium, cachedir_hdlist($urpm, $medium));
- is_valid_medium($medium) and $medium->{synthesis} = 1;
- }
- } else {
- _parse_synthesis($urpm, $medium, cachedir_hdlist($urpm, $medium));
- if (is_valid_medium($medium)) {
- $medium->{synthesis} = 1;
- } else {
- _parse_hdlist($urpm, $medium, cachedir_hdlist($urpm, $medium));
- is_valid_medium($medium) and delete $medium->{synthesis};
- }
- }
- if (is_valid_medium($medium)) {
- $options{callback} && $options{callback}('done', $medium->{name});
- } else {
- $error = 1;
- $urpm->{error}(N("unable to parse hdlist file of \"%s\"", $medium->{name}));
- $options{callback} && $options{callback}('failed', $medium->{name});
- #- we will have to read back the current synthesis file unmodified.
- }
-
- unless ($error) {
- my @unresolved_after = grep { ! defined $urpm->{provides}{$_} } keys %{$urpm->{provides} || {}};
- @unresolved_before == @unresolved_after or $$second_pass = 1;
-
- if ($medium->{hdlist} ne 'list' && -s "$urpm->{cachedir}/partial/list") {
- if (open my $fh, "$urpm->{cachedir}/partial/list") {
- local $_;
- while (<$fh>) {
- m|/([^/]*\.rpm)$| or next;
- $list{$1} and $urpm->{error}(N("file [%s] already used in the same medium \"%s\"", $1, $medium->{name})), next;
- $list{$1} = "$medium->{url}/$_";
- }
- close $fh;
- }
- } else {
- #- if url is clear and no relative list file has been downloaded,
- #- there is no need for a list file.
- if ($medium->{url} ne $medium->{clear_url}) {
- foreach ($medium->{start} .. $medium->{end}) {
- my $filename = $urpm->{depslist}[$_]->filename;
- $list{$filename} = "$medium->{url}/$filename\n";
- }
- }
- }
- }
- }
-
- unless ($error) {
- if (keys %list) {
- #- write list file.
- #- make sure group and other do not have any access to this file, used to hide passwords.
- if ($medium->{list}) {
- my $mask = umask 077;
- open my $listfh, ">", cachedir_list($urpm, $medium)
- or $error = 1, $urpm->{error}(N("unable to write list file of \"%s\"", $medium->{name}));
- umask $mask;
- print $listfh values %list;
- close $listfh;
- }
-
- #- check if at least something has been written into list file.
- if ($medium->{list} && -s cachedir_list($urpm, $medium)) {
- $urpm->{log}(N("writing list file for medium \"%s\"", $medium->{name}));
- } else {
- $error = 1, $urpm->{error}(N("nothing written in list file for \"%s\"", $medium->{name}));
- }
- } else {
- #- the flag is no longer necessary.
- if ($medium->{list}) {
- unlink statedir_list($urpm, $medium);
- delete $medium->{list};
- }
- }
- }
- }
-
- unless ($error) {
- #- now... on pubkey
- _read_cachedir_pubkey($urpm, $medium);
- }
-
- unless ($medium->{virtual}) {
- if ($error) {
- #- an error has occured for updating the medium, we have to remove temporary files.
- unlink cachedir_hdlist($urpm, $medium);
- $medium->{list} and unlink cachedir_list($urpm, $medium);
- #- read default synthesis (we have to make sure nothing get out of depslist).
- _parse_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium));
- if (!is_valid_medium($medium)) {
- $urpm->{error}(N("problem reading synthesis file of medium \"%s\"", $medium->{name}));
- $medium->{ignore} = 1;
- }
- } else {
- #- make sure to rebuild base files and clear medium modified state.
- $medium->{modified} = 0;
- $urpm->{md5sum_modified} = 1;
-
- #- but use newly created file.
- unlink statedir_hdlist($urpm, $medium);
- $medium->{synthesis} and unlink statedir_synthesis($urpm, $medium);
- $medium->{list} and unlink statedir_list($urpm, $medium);
- unless ($medium->{headers}) {
- unlink statedir_synthesis($urpm, $medium);
- unlink statedir_hdlist($urpm, $medium);
- urpm::util::move(cachedir_hdlist($urpm, $medium),
- statedir_hdlist_or_synthesis($urpm, $medium));
- }
- if ($medium->{list}) {
- urpm::util::move(cachedir_list($urpm, $medium), statedir_list($urpm, $medium));
- }
- $medium->{md5sum} = $retrieved_md5sum; #- anyway, keep it, the previous one is no longer useful.
-
- #- and create synthesis file associated.
- $medium->{modified_synthesis} = !$medium->{synthesis};
- }
- }
-}
-
-#- take care of modified medium only, or all if all have to be recomputed.
-sub _update_medium_second_pass {
- my ($urpm, $medium, $second_pass, $callback) = @_;
-
- $medium->{ignore} and return;
-
- $callback and $callback->('parse', $medium->{name});
- #- a modified medium is an invalid medium, we have to read back the previous hdlist
- #- or synthesis which has not been modified by first pass above.
- if ($medium->{headers} && !$medium->{modified}) {
- if ($second_pass) {
- $urpm->{log}(N("reading headers from medium \"%s\"", $medium->{name}));
- ($medium->{start}, $medium->{end}) = $urpm->parse_headers(dir => "$urpm->{cachedir}/headers",
- headers => $medium->{headers},
- );
- }
- $urpm->{log}(N("building hdlist [%s]", statedir_hdlist($urpm, $medium)));
- #- finish building operation of hdlist.
- $urpm->build_hdlist(start => $medium->{start},
- end => $medium->{end},
- dir => "$urpm->{cachedir}/headers",
- hdlist => statedir_hdlist($urpm, $medium),
- );
- #- synthesis needs to be created, since the medium has been built from rpm files.
- eval { $urpm->build_synthesis(
- start => $medium->{start},
- end => $medium->{end},
- synthesis => statedir_synthesis($urpm, $medium),
- ) };
- if ($@) {
- #- XXX this happens when building a synthesis for a local media from RPMs... why ?
- $urpm->{error}(N("Unable to build synthesis file for medium \"%s\". Your hdlist file may be corrupted.", $medium->{name}));
- $urpm->{error}($@);
- unlink statedir_synthesis($urpm, $medium);
- } else {
- $urpm->{log}(N("built hdlist synthesis file for medium \"%s\"", $medium->{name}));
- }
- #- keep in mind we have a modified database, sure at this point.
- $urpm->{md5sum_modified} = 1;
- } elsif ($medium->{synthesis}) {
- if ($second_pass) {
- if ($medium->{virtual}) {
- if (file_from_file_url($medium->{url})) {
- _parse_synthesis($urpm, $medium, hdlist_or_synthesis_for_virtual_medium($medium));
- }
- } else {
- _parse_synthesis($urpm, $medium, statedir_synthesis($urpm, $medium));
- }
- }
- } else {
- if ($second_pass) {
- _parse_hdlist($urpm, $medium, statedir_hdlist($urpm, $medium));
- }
- #- check if the synthesis file can be built.
- if (($second_pass || $medium->{modified_synthesis}) && !$medium->{modified}) {
- unless ($medium->{virtual}) {
- eval { $urpm->build_synthesis(
- start => $medium->{start},
- end => $medium->{end},
- synthesis => statedir_synthesis($urpm, $medium),
- ) };
- if ($@) {
- $urpm->{error}(N("Unable to build synthesis file for medium \"%s\". Your hdlist file may be corrupted.", $medium->{name}));
- $urpm->{error}($@);
- unlink statedir_synthesis($urpm, $medium);
- } else {
- $urpm->{log}(N("built hdlist synthesis file for medium \"%s\"", $medium->{name}));
- }
- }
- #- keep in mind we have modified database, sure at this point.
- $urpm->{md5sum_modified} = 1;
- }
- }
- $callback && $callback->('done', $medium->{name});
-}
-
sub remove_obsolete_headers_in_cache {
my ($urpm) = @_;
my %headers;
- my $dh = $urpm->opendir_safe("$urpm->{cachedir}/headers");
- if ($dh) {
+ if (my $dh = urpm::sys::opendir_safe($urpm, "$urpm->{cachedir}/headers")) {
local $_;
while (defined($_ = readdir $dh)) {
m|^([^/]*-[^-]*-[^-]*\.[^\.]*)(?::\S*)?$| and $headers{$1} = $_;
}
- closedir $dh;
}
if (%headers) {
- $urpm->{log}(N("found %d headers in cache", scalar(keys %headers)));
+ my $previous_total = scalar(keys %headers);
foreach (@{$urpm->{depslist}}) {
delete $headers{$_->fullname};
}
- $urpm->{log}(N("removing %d obsolete headers in cache", scalar(keys %headers)));
+ $urpm->{log}(N("found %d rpm headers in cache, removing %d obsolete headers", $previous_total, scalar(keys %headers)));
foreach (values %headers) {
unlink "$urpm->{cachedir}/headers/$_";
}
}
}
-#- Update the urpmi database w.r.t. the current configuration.
-#- Takes care of modifications, and tries some tricks to bypass
-#- the recomputation of base files.
-#- Recognized options :
-#- all : all medias are being rebuilt
-#- callback : UI callback
-#- compress : use compressed download (for rsync)
-#- forcekey : force retrieval of pubkey
-#- force : try to force rebuilding base files (1) or hdlist from rpm files (2)
-#- limit_rate : download limit rate
-#- noclean : keep old files in the header cache directory
-#- nolock : don't lock the urpmi database
-#- nomd5sum : don't verify MD5SUM of retrieved files
-#- nopubkey : don't use rpm pubkeys
-#- norebuild : don't try to rebuild hdlists from rpm headers
-#- probe_with : probe synthesis or hdlist (or none)
-#- quiet : download hdlists quietly
-#- ratio : use this compression ratio (with gzip, default is 4)
-sub update_media {
- my ($urpm, %options) = @_;
-
- $urpm->{media} or return; # verify that configuration has been read
-
- $options{nopubkey} ||= $urpm->{options}{nopubkey};
- #- get gpg-pubkey signature.
- if (!$options{nopubkey}) {
- $urpm->lock_rpm_db('exclusive');
- $urpm->{keys} or $urpm->parse_pubkeys(root => $urpm->{root});
- }
- #- lock database if allowed.
- $urpm->lock_urpmi_db('exclusive') if !$options{nolock};
-
- #- examine each medium to see if one of them needs to be updated.
- #- if this is the case and if not forced, try to use a pre-calculated
- #- hdlist file, else build it from rpm files.
- $urpm->clean;
-
- my $clean_cache = !$options{noclean};
- my $second_pass;
- foreach my $medium (@{$urpm->{media}}) {
- _update_medium_first_pass($urpm, $medium, \$second_pass, \$clean_cache, %options);
- }
-
- #- some unresolved provides may force to rebuild all synthesis,
- #- a second pass will be necessary.
- if ($second_pass) {
- $urpm->{log}(N("performing second pass to compute dependencies\n"));
- $urpm->unresolved_provides_clean;
- }
-
- #- second pass consists in reading again synthesis or hdlists.
- foreach my $medium (@{$urpm->{media}}) {
- _update_medium_second_pass($urpm, $medium, $second_pass, $options{callback});
- }
-
- if ($urpm->{modified}) {
- if ($options{noclean}) {
- #- clean headers cache directory to remove everything that is no longer
- #- useful according to the depslist.
- remove_obsolete_headers_in_cache($urpm);
- }
- #- write config files in any case
- $urpm->write_config;
- dump_proxy_config();
- } elsif ($urpm->{md5sum_modified}) {
- #- NB: in case of $urpm->{modified}, write_MD5SUM is called in write_config above
- write_MD5SUM($urpm);
- }
-
- generate_media_names($urpm);
-
- $options{nolock} or $urpm->unlock_urpmi_db;
- $options{nopubkey} or $urpm->unlock_rpm_db;
-}
-
-#- clean params and depslist computation zone.
-sub clean {
- my ($urpm) = @_;
-
- $urpm->{depslist} = [];
- $urpm->{provides} = {};
-
- foreach (@{$urpm->{media} || []}) {
- delete $_->{start};
- delete $_->{end};
- }
-}
-
-sub try_mounting {
- my ($urpm, $dir, $o_removable) = @_;
- my %infos;
-
- my $is_iso = is_iso($o_removable);
- my @mntpoints = $is_iso
- #- note: for isos, we don't parse the fstab because it might not be declared in it.
- #- so we try to remove suffixes from the dir name until the dir exists
- ? ($dir = urpm::sys::trim_until_d($dir))
- : urpm::sys::find_mntpoints($dir = reduce_pathname($dir), \%infos);
- foreach (grep {
- ! $infos{$_}{mounted} && $infos{$_}{fs} ne 'supermount';
- } @mntpoints)
- {
- $urpm->{log}(N("mounting %s", $_));
- if ($is_iso) {
- #- to mount an iso image, grab the first loop device
- my $loopdev = urpm::sys::first_free_loopdev();
- sys_log("mount iso $_ on $o_removable");
- $loopdev and system('mount', $o_removable, $_, '-t', 'iso9660', '-o', "loop=$loopdev");
- } else {
- sys_log("mount $_");
- system("mount '$_' 2>/dev/null");
- }
- $o_removable && $infos{$_}{fs} ne 'supermount' and $urpm->{removable_mounted}{$_} = undef;
- }
- -e $dir;
-}
-
-sub try_umounting {
- my ($urpm, $dir) = @_;
- my %infos;
-
- $dir = reduce_pathname($dir);
- foreach (reverse grep {
- $infos{$_}{mounted} && $infos{$_}{fs} ne 'supermount';
- } urpm::sys::find_mntpoints($dir, \%infos))
- {
- $urpm->{log}(N("unmounting %s", $_));
- sys_log("umount $_");
- system("umount '$_' 2>/dev/null");
- delete $urpm->{removable_mounted}{$_};
- }
- ! -e $dir;
-}
-
-sub try_umounting_removables {
- my ($urpm) = @_;
- foreach (keys %{$urpm->{removable_mounted}}) {
- $urpm->try_umounting($_);
- }
- delete $urpm->{removable_mounted};
-}
-
#- register local packages for being installed, keep track of source.
sub register_rpms {
my ($urpm, @files) = @_;
@@ -2151,13 +129,11 @@ sub register_rpms {
if (protocol_from_url($_)) {
my $basename = basename($_);
unlink "$urpm->{cachedir}/partial/$basename";
- eval {
- $urpm->{log}(N("retrieving rpm file [%s] ...", $_));
- sync_webfetch($urpm, undef, [$_], { quiet => 1 });
+ $urpm->{log}(N("retrieving rpm file [%s] ...", $_));
+ if (urpm::download::sync($urpm, undef, [$_], quiet => 1)) {
$urpm->{log}(N("...retrieving done"));
$_ = "$urpm->{cachedir}/partial/$basename";
- };
- if ($@) {
+ } else {
$urpm->{error}(N("...retrieving failed: %s", $@));
unlink "$urpm->{cachedir}/partial/$basename";
next;
@@ -2193,420 +169,6 @@ sub register_rpms {
%requested;
}
-sub _findindeps {
- my ($urpm, $found, $qv, $v, %options) = @_;
-
- foreach (keys %{$urpm->{provides}}) {
- #- search through provides to find if a provide matches this one;
- #- but manage choices correctly (as a provides may be virtual or
- #- defined several times).
- /$qv/ || !$options{caseinsensitive} && /$qv/i or next;
-
- my @list = grep { defined $_ } map {
- my $pkg = $urpm->{depslist}[$_];
- $pkg && ($options{src} ? $pkg->arch eq 'src' : $pkg->arch ne 'src')
- ? $pkg->id : undef;
- } keys %{$urpm->{provides}{$_} || {}};
- @list > 0 and push @{$found->{$v}}, join '|', @list;
- }
-}
-
-#- search packages registered by their names by storing their ids into the $packages hash.
-sub search_packages {
- my ($urpm, $packages, $names, %options) = @_;
- my (%exact, %exact_a, %exact_ra, %found, %foundi);
- foreach my $v (@$names) {
- my $qv = quotemeta $v;
- $qv = '(?i)' . $qv if $options{caseinsensitive};
-
- unless ($options{fuzzy}) {
- #- try to search through provides.
- if (my @l = map {
- $_
- && ($options{src} ? $_->arch eq 'src' : $_->is_arch_compat)
- && ($options{use_provides} || $_->name eq $v)
- && defined($_->id)
- && (!defined $urpm->{searchmedia} ||
- $urpm->{searchmedia}{start} <= $_->id
- && $urpm->{searchmedia}{end} >= $_->id)
- ? $_ : @{[]};
- } map {
- $urpm->{depslist}[$_];
- } keys %{$urpm->{provides}{$v} || {}})
- {
- #- we assume that if there is at least one package providing
- #- the resource exactly, this should be the best one; but we
- #- first check if one of the packages has the same name as searched.
- if (my @l2 = grep { $_->name eq $v } @l) {
- @l = @l2;
- }
- $exact{$v} = join('|', map { $_->id } @l);
- next;
- }
- }
-
- if ($options{use_provides} && $options{fuzzy}) {
- _findindeps($urpm, \%found, $qv, $v, %options);
- }
-
- foreach my $id (defined $urpm->{searchmedia} ?
- ($urpm->{searchmedia}{start} .. $urpm->{searchmedia}{end}) :
- (0 .. $#{$urpm->{depslist}})
- ) {
- my $pkg = $urpm->{depslist}[$id];
- ($options{src} ? $pkg->arch eq 'src' : $pkg->is_arch_compat) or next;
- my $pack_name = $pkg->name;
- my $pack_ra = $pack_name . '-' . $pkg->version;
- my $pack_a = "$pack_ra-" . $pkg->release;
- my $pack = "$pack_a." . $pkg->arch;
- unless ($options{fuzzy}) {
- if ($pack eq $v) {
- $exact{$v} = $id;
- next;
- } elsif ($pack_a eq $v) {
- push @{$exact_a{$v}}, $id;
- next;
- } elsif ($pack_ra eq $v || $options{src} && $pack_name eq $v) {
- push @{$exact_ra{$v}}, $id;
- next;
- }
- }
- $pack =~ /$qv/ and push @{$found{$v}}, $id;
- $pack =~ /$qv/i and push @{$foundi{$v}}, $id unless $options{caseinsensitive};
- }
- }
-
- my $result = 1;
- foreach (@$names) {
- if (defined $exact{$_}) {
- $packages->{$exact{$_}} = 1;
- foreach (split /\|/, $exact{$_}) {
- my $pkg = $urpm->{depslist}[$_] or next;
- $pkg->set_flag_skip(0); #- reset skip flag as manually selected.
- }
- } else {
- #- at this level, we need to search the best package given for a given name,
- #- always prefer already found package.
- my %l;
- foreach (@{$exact_a{$_} || $exact_ra{$_} || $found{$_} || $foundi{$_} || []}) {
- my $pkg = $urpm->{depslist}[$_];
- push @{$l{$pkg->name}}, $pkg;
- }
- if (values(%l) == 0 || values(%l) > 1 && !$options{all}) {
- $urpm->{error}(N("no package named %s", $_));
- values(%l) != 0 and $urpm->{error}(
- N("The following packages contain %s: %s",
- $_, "\n" . join("\n", sort { $a cmp $b } keys %l))
- );
- $result = 0;
- } else {
- if (!@{$exact_a{$_} || $exact_ra{$_} || []}) {
- #- we found a non-exact match
- $result = 'substring';
- }
- foreach (values %l) {
- my $best;
- foreach (@$_) {
- if ($best && $best != $_) {
- $_->compare_pkg($best) > 0 and $best = $_;
- } else {
- $best = $_;
- }
- }
- $packages->{$best->id} = 1;
- $best->set_flag_skip(0); #- reset skip flag as manually selected.
- }
- }
- }
- }
-
- #- return true if no error has been encountered, else false.
- $result;
-}
-
-#- Resolves dependencies between requested packages (and auto selection if any).
-#- handles parallel option if any.
-#- The return value is true if program should be restarted (in order to take
-#- care of important packages being upgraded (priority upgrades)
-#- %options :
-#- rpmdb
-#- auto_select
-#- callback_choices
-#- install_src
-#- keep
-#- nodeps
-#- priority_upgrade
-sub resolve_dependencies {
- #- $state->{selected} will contain the selection of packages to be
- #- installed or upgraded
- my ($urpm, $state, $requested, %options) = @_;
- my $need_restart;
-
- if ($options{install_src}) {
- #- only src will be installed, so only update $state->{selected} according
- #- to src status of files.
- foreach (keys %$requested) {
- my $pkg = $urpm->{depslist}[$_] or next;
- $pkg->arch eq 'src' or next;
- $state->{selected}{$_} = undef;
- }
- }
- if ($urpm->{parallel_handler}) {
- #- build the global synthesis file first.
- my $file = "$urpm->{cachedir}/partial/parallel.cz";
- unlink $file;
- foreach (@{$urpm->{media}}) {
- is_valid_medium($_) or next;
- my $f = statedir_synthesis($urpm, $_);
- system "cat '$f' >> '$file'";
- }
- #- let each node determine what is requested, according to handler given.
- $urpm->{parallel_handler}->parallel_resolve_dependencies($file, $urpm, $state, $requested, %options);
- } else {
- my $db;
-
- if ($options{rpmdb}) {
- $db = new URPM;
- $db->parse_synthesis($options{rpmdb});
- } else {
- $db = db_open_or_die($urpm, $urpm->{root});
- }
-
- my $sig_handler = sub { undef $db; exit 3 };
- local $SIG{INT} = $sig_handler;
- local $SIG{QUIT} = $sig_handler;
-
- #- auto select package for upgrading the distribution.
- if ($options{auto_select}) {
- $urpm->request_packages_to_upgrade($db, $state, $requested, requested => undef,
- start => $urpm->{searchmedia}{start}, end => $urpm->{searchmedia}{end});
- }
-
- #- resolve dependencies which will be examined for packages that need to
- #- have urpmi restarted when they're updated.
- $urpm->resolve_requested($db, $state, $requested, %options);
-
- if ($options{priority_upgrade} && !$options{rpmdb}) {
- my (%priority_upgrade, %priority_requested);
- @priority_upgrade{split /,/, $options{priority_upgrade}} = ();
-
- #- check if a priority upgrade should be tried
- foreach (keys %{$state->{selected}}) {
- my $pkg = $urpm->{depslist}[$_] or next;
- exists $priority_upgrade{$pkg->name} or next;
- $priority_requested{$pkg->id} = undef;
- }
-
- if (%priority_requested) {
- my %priority_state;
-
- $urpm->resolve_requested($db, \%priority_state, \%priority_requested, %options);
- if (grep { ! exists $priority_state{selected}{$_} } keys %priority_requested) {
- #- some packages which were selected previously have not been selected, strange!
- $need_restart = 0;
- } elsif (grep { ! exists $priority_state{selected}{$_} } keys %{$state->{selected}}) {
- #- there are other packages to install after this priority transaction.
- %$state = %priority_state;
- $need_restart = 1;
- }
- }
- }
- }
- $need_restart;
-}
-
-sub create_transaction {
- my ($urpm, $state, %options) = @_;
-
- if ($urpm->{parallel_handler} || !$options{split_length} ||
- keys %{$state->{selected}} < $options{split_level}) {
- #- build simplest transaction (no split).
- $urpm->build_transaction_set(undef, $state, split_length => 0);
- } else {
- my $db;
-
- if ($options{rpmdb}) {
- $db = new URPM;
- $db->parse_synthesis($options{rpmdb});
- } else {
- $db = db_open_or_die($urpm, $urpm->{root});
- }
-
- my $sig_handler = sub { undef $db; exit 3 };
- local $SIG{INT} = $sig_handler;
- local $SIG{QUIT} = $sig_handler;
-
- #- build transaction set...
- $urpm->build_transaction_set($db, $state, split_length => $options{split_length});
- }
-}
-
-#- get the list of packages that should not be upgraded or installed,
-#- typically from the inst.list or skip.list files.
-sub get_packages_list {
- my ($file, $o_extra) = @_;
- my $val = [];
- open my $f, $file or return [];
- foreach (<$f>, split /,/, $o_extra || '') {
- chomp; s/#.*$//; s/^\s*//; s/\s*$//;
- next if $_ eq '';
- push @$val, $_;
- }
- close $f;
- $val;
-}
-
-#- select sources for selected packages,
-#- according to keys of the packages hash.
-#- returns a list of lists containing the source description for each rpm,
-#- matching the exact number of registered media; ignored media being
-#- associated to a null list.
-sub get_source_packages {
- my ($urpm, $packages, %options) = @_;
- my (%protected_files, %local_sources, %fullname2id);
-
- #- build association hash to retrieve id and examine all list files.
- foreach (keys %$packages) {
- foreach (split /\|/, $_) {
- if ($urpm->{source}{$_}) {
- $protected_files{$local_sources{$_} = $urpm->{source}{$_}} = undef;
- } else {
- $fullname2id{$urpm->{depslist}[$_]->fullname} = $_ . '';
- }
- }
- }
-
- #- examine each medium to search for packages.
- #- now get rpm file name in hdlist to match list file.
- my %file2fullnames;
- foreach my $pkg (@{$urpm->{depslist} || []}) {
- $file2fullnames{$pkg->filename}{$pkg->fullname} = undef;
- }
-
- #- examine the local repository, which is trusted (no gpg or pgp signature check but md5 is now done).
- my $dh = $urpm->opendir_safe("$urpm->{cachedir}/rpms");
- if ($dh) {
- while (defined(my $filename = readdir $dh)) {
- my $filepath = "$urpm->{cachedir}/rpms/$filename";
- if (-d $filepath) {
- } elsif ($options{clean_all} || ! -s _) {
- unlink $filepath; #- this file should be removed or is already empty.
- } else {
- if (keys(%{$file2fullnames{$filename} || {}}) > 1) {
- $urpm->{error}(N("there are multiple packages with the same rpm filename \"%s\"", $filename));
- } elsif (keys(%{$file2fullnames{$filename} || {}}) == 1) {
- my ($fullname) = keys(%{$file2fullnames{$filename} || {}});
- if (defined(my $id = delete $fullname2id{$fullname})) {
- $local_sources{$id} = $filepath;
- } else {
- $options{clean_other} && ! exists $protected_files{$filepath} and unlink $filepath;
- }
- } else {
- $options{clean_other} && ! exists $protected_files{$filepath} and unlink $filepath;
- }
- }
- }
- closedir $dh;
- }
-
- if ($options{clean_all}) {
- #- clean download directory, do it here even if this is not the best moment.
- clean_dir("$urpm->{cachedir}/partial");
- }
-
- my ($error, @list_error, @list, %examined);
-
- foreach my $medium (@{$urpm->{media} || []}) {
- my (%sources, %list_examined, $list_warning);
-
- if (is_valid_medium($medium) && !$medium->{ignore}) {
- #- always prefer a list file if available.
- my $listfile = $medium->{list} ? statedir_list($urpm, $medium) : '';
- if (!$listfile && $medium->{virtual}) {
- my $dir = file_from_local_url($medium->{url});
- my $with_hdlist_dir = reduce_pathname($dir . ($medium->{with_hdlist} ? "/$medium->{with_hdlist}" : "/.."));
- my $local_list = 'list' . _hdlist_suffix($medium);
- $listfile = reduce_pathname("$with_hdlist_dir/../$local_list");
- -s $listfile or $listfile = "$dir/list";
- }
- if ($listfile && -r $listfile) {
- my $fh = $urpm->open_safe('<', $listfile);
- if ($fh) {
- local $_;
- while (<$fh>) {
- chomp;
- if (my ($filename) = m|/([^/]*\.rpm)$|) {
- if (keys(%{$file2fullnames{$filename} || {}}) > 1) {
- $urpm->{error}(N("there are multiple packages with the same rpm filename \"%s\"", $filename));
- next;
- } elsif (keys(%{$file2fullnames{$filename} || {}}) == 1) {
- my ($fullname) = keys(%{$file2fullnames{$filename} || {}});
- if (defined(my $id = $fullname2id{$fullname})) {
- if (!/\.delta\.rpm$/ || $urpm->is_delta_installable($urpm->{depslist}[$id], $options{root})) {
- $sources{$id} = $medium->{virtual} ? "$medium->{url}/$_" : $_;
- }
- }
- $list_examined{$fullname} = $examined{$fullname} = undef;
- }
- } else {
- chomp;
- $error = 1;
- $urpm->{error}(N("unable to correctly parse [%s] on value \"%s\"", $listfile, $_));
- last;
- }
- }
- close $fh;
- }
- } elsif ($listfile && -e $listfile) {
- # list file exists but isn't readable
- # report error only if no result found, list files are only readable by root
- push @list_error, N("unable to access list file of \"%s\", medium ignored", $medium->{name});
- $< and push @list_error, " " . N("(retry as root?)");
- next;
- }
- if (defined $medium->{url}) {
- foreach ($medium->{start} .. $medium->{end}) {
- my $pkg = $urpm->{depslist}[$_];
- my $fi = $pkg->filename;
- if (keys(%{$file2fullnames{$fi} || {}}) > 1) {
- $urpm->{error}(N("there are multiple packages with the same rpm filename \"%s\"", $fi));
- next;
- } elsif (keys(%{$file2fullnames{$fi} || {}}) == 1) {
- my ($fullname) = keys(%{$file2fullnames{$fi} || {}});
- unless (exists($list_examined{$fullname})) {
- ++$list_warning;
- if (defined(my $id = $fullname2id{$fullname})) {
- if ($fi !~ /\.delta\.rpm$/ || $urpm->is_delta_installable($urpm->{depslist}[$id], $options{root})) {
- $sources{$id} = "$medium->{url}/" . $fi;
- }
- }
- $examined{$fullname} = undef;
- }
- }
- }
- $list_warning && $medium->{list} && -r statedir_list($urpm, $medium) && -f _
- and $urpm->{error}(N("medium \"%s\" uses an invalid list file:
- mirror is probably not up-to-date, trying to use alternate method", $medium->{name}));
- } elsif (!%list_examined) {
- $error = 1;
- $urpm->{error}(N("medium \"%s\" does not define any location for rpm files", $medium->{name}));
- }
- }
- push @list, \%sources;
- }
-
- #- examine package list to see if a package has not been found.
- foreach (grep { ! exists($examined{$_}) } keys %fullname2id) {
- # print list errors only once if any
- $urpm->{error}($_) foreach @list_error;
- @list_error = ();
- $error = 1;
- $urpm->{error}(N("package %s is not found.", $_));
- }
-
- $error ? @{[]} : (\%local_sources, \@list);
-}
-
#- checks whether the delta RPM represented by $pkg is installable wrt the
#- RPM DB on $root. For this, it extracts the rpm version to which the
#- delta applies from the delta rpm filename itself. So naming conventions
@@ -2632,266 +194,13 @@ sub download_source_packages {
my %sources = %$local_sources;
my %error_sources;
- $urpm->lock_urpmi_db('exclusive') if !$options{nolock};
- $urpm->copy_packages_of_removable_media($list, \%sources, %options) or return;
- $urpm->download_packages_of_distant_media($list, \%sources, \%error_sources, %options);
- $urpm->unlock_urpmi_db unless $options{nolock};
+ require urpm::get_pkgs;
+ urpm::removable::copy_packages_of_removable_media($urpm, $list, \%sources, $options{ask_for_medium}) or return;
+ urpm::get_pkgs::download_packages_of_distant_media($urpm, $list, \%sources, \%error_sources, %options);
%sources, %error_sources;
}
-#- lock policy concerning chroot :
-# - lock rpm db in chroot
-# - lock urpmi db in /
-sub _lock {
- my ($urpm, $fh_ref, $file, $b_exclusive) = @_;
- #- avoid putting a require on Fcntl ':flock' (which is perl and not perl-base).
- my ($LOCK_SH, $LOCK_EX, $LOCK_NB) = (1, 2, 4);
- if ($b_exclusive) {
- #- lock urpmi database, but keep lock to wait for an urpmi.update to finish.
- } else {
- #- create the .LOCK file if needed (and if possible)
- unless (-e $file) {
- open(my $f, ">", $file);
- close $f;
- }
- #- lock urpmi database, if the LOCK file doesn't exists no share lock.
- }
- my ($sense, $mode) = $b_exclusive ? ('>', $LOCK_EX) : ('<', $LOCK_SH);
- open $$fh_ref, $sense, $file or return;
- flock $$fh_ref, $mode|$LOCK_NB or $urpm->{fatal}(7, N("urpmi database locked"));
-}
-
-sub lock_rpm_db {
- my ($urpm, $b_exclusive) = @_;
- _lock($urpm, \$RPMLOCK_FILE, "$urpm->{root}/$urpm->{statedir}/.RPMLOCK", $b_exclusive);
-}
-sub lock_urpmi_db {
- my ($urpm, $b_exclusive) = @_;
- _lock($urpm, \$LOCK_FILE, "$urpm->{statedir}/.LOCK", $b_exclusive);
-}
-#- deprecated
-sub exlock_urpmi_db {
- my ($urpm) = @_;
- lock_urpmi_db($urpm, 'exclusive');
-}
-
-sub _unlock {
- my ($fh_ref) = @_;
- #- avoid putting a require on Fcntl ':flock' (which is perl and not perl-base).
- my $LOCK_UN = 8;
- #- now everything is finished.
- #- release lock on database.
- flock $$fh_ref, $LOCK_UN;
- close $$fh_ref;
-}
-sub unlock_rpm_db {
- my ($_urpm) = @_;
- _unlock(\$RPMLOCK_FILE);
-}
-sub unlock_urpmi_db {
- my ($_urpm) = @_;
- _unlock(\$LOCK_FILE);
-}
-
-sub copy_packages_of_removable_media {
- my ($urpm, $list, $sources, %options) = @_;
- my %removables;
-
- #- make sure everything is correct on input...
- $urpm->{media} or return;
- @{$urpm->{media}} == @$list or return;
-
- #- examine if given medium is already inside a removable device.
- my $check_notfound = sub {
- my ($id, $dir, $removable) = @_;
- if ($dir) {
- $urpm->try_mounting($dir, $removable);
- -e $dir or return 2;
- }
- foreach (values %{$list->[$id]}) {
- chomp;
- my $dir_ = file_from_local_url($_) or next;
- $dir_ =~ m!/.*/! or next; #- is this really needed??
- unless ($dir) {
- $dir = $dir_;
- $urpm->try_mounting($dir, $removable);
- }
- -r $dir_ or return 1;
- }
- 0;
- };
- #- removable media have to be examined to keep mounted the one that has
- #- more packages than others.
- my $examine_removable_medium = sub {
- my ($id, $device) = @_;
- my $medium = $urpm->{media}[$id];
- if (my $dir = file_from_local_url($medium->{url})) {
- #- the directory given does not exist and may be accessible
- #- by mounting some other directory. Try to figure it out and mount
- #- everything that might be necessary.
- while ($check_notfound->($id, $dir, is_iso($medium->{removable}) ? $medium->{removable} : 'removable')) {
- is_iso($medium->{removable}) || $options{ask_for_medium}
- or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name}));
- $urpm->try_umounting($dir);
- system("/usr/bin/eject '$device' 2>/dev/null");
- is_iso($medium->{removable})
- || $options{ask_for_medium}(remove_internal_name($medium->{name}), $medium->{removable})
- or $urpm->{fatal}(4, N("medium \"%s\" is not selected", $medium->{name}));
- }
- if (-e $dir) {
- while (my ($i, $url) = each %{$list->[$id]}) {
- chomp $url;
- my ($filepath, $filename) = do {
- my $f = file_from_local_url($url) or next;
- $f =~ m!/.*/! or next; #- is this really needed??
- dirname($f), basename($f);
- };
- if (-r $filepath) {
- #- we should assume a possibly buggy removable device...
- #- First, copy in partial cache, and if the package is still good,
- #- transfer it to the rpms cache.
- unlink "$urpm->{cachedir}/partial/$filename";
- if (urpm::util::copy($filepath, "$urpm->{cachedir}/partial") &&
- URPM::verify_rpm("$urpm->{cachedir}/partial/$filename", nosignatures => 1))
- {
- #- now we can consider the file to be fine.
- unlink "$urpm->{cachedir}/rpms/$filename";
- urpm::util::move("$urpm->{cachedir}/partial/$filename", "$urpm->{cachedir}/rpms/$filename");
- -r "$urpm->{cachedir}/rpms/$filename" and $sources->{$i} = "$urpm->{cachedir}/rpms/$filename";
- }
- }
- unless ($sources->{$i}) {
- #- fallback to use other method for retrieving the file later.
- $urpm->{error}(N("unable to read rpm file [%s] from medium \"%s\"", $filepath, $medium->{name}));
- }
- }
- } else {
- $urpm->{error}(N("medium \"%s\" is not selected", $medium->{name}));
- }
- } else {
- #- we have a removable device that is not removable, well...
- $urpm->{error}(N("inconsistent medium \"%s\" marked removable but not really", $medium->{name}));
- }
- };
-
- foreach (0..$#$list) {
- values %{$list->[$_]} or next;
- my $medium = $urpm->{media}[$_];
- #- examine non removable device but that may be mounted.
- if ($medium->{removable}) {
- push @{$removables{$medium->{removable}} ||= []}, $_;
- } elsif (my $dir = file_from_local_url($medium->{url})) {
- -e $dir || $urpm->try_mounting($dir) or
- $urpm->{error}(N("unable to access medium \"%s\"", $medium->{name})), next;
- }
- }
- foreach my $device (keys %removables) {
- next if $device =~ m![^a-zA-Z0-9_./-]!; #- bad path
- #- Here we have only removable devices.
- #- If more than one media uses this device, we have to sort
- #- needed packages to copy the needed rpm files.
- if (@{$removables{$device}} > 1) {
- my @sorted_media = sort { values(%{$list->[$a]}) <=> values(%{$list->[$b]}) } @{$removables{$device}};
-
- #- check if a removable device is already mounted (and files present).
- if (my ($already_mounted_medium) = grep { !$check_notfound->($_) } @sorted_media) {
- @sorted_media = grep { $_ ne $already_mounted_medium } @sorted_media;
- unshift @sorted_media, $already_mounted_medium;
- }
-
- #- mount all except the biggest one.
- my $biggest = pop @sorted_media;
- foreach (@sorted_media) {
- $examine_removable_medium->($_, $device);
- }
- #- now mount the last one...
- $removables{$device} = [ $biggest ];
- }
-
- $examine_removable_medium->($removables{$device}[0], $device);
- }
-
- 1;
-}
-
-# TODO verify that files are downloaded from the right corresponding media
-sub download_packages_of_distant_media {
- my ($urpm, $list, $sources, $error_sources, %options) = @_;
-
- #- get back all ftp and http accessible rpm files into the local cache
- foreach my $n (0..$#$list) {
- my %distant_sources;
-
- #- ignore media that contain nothing for the current set of files
- values %{$list->[$n]} or next;
-
- #- examine all files to know what can be indexed on multiple media.
- while (my ($i, $url) = each %{$list->[$n]}) {
- #- the given URL is trusted, so the file can safely be ignored.
- defined $sources->{$i} and next;
- my $local_file = file_from_local_url($url);
- if ($local_file && $local_file =~ /\.rpm$/) {
- if (-r $local_file) {
- $sources->{$i} = $local_file;
- } else {
- $error_sources->{$i} = $local_file;
- }
- } elsif ($url =~ m!^([^:]*):/(.*/([^/]*\.rpm))\Z!) {
- $distant_sources{$i} = "$1:/$2"; #- will download now
- } else {
- $urpm->{error}(N("malformed URL: [%s]", $url));
- }
- }
-
- #- download files from the current medium.
- if (%distant_sources) {
- eval {
- $urpm->{log}(N("retrieving rpm files from medium \"%s\"...", $urpm->{media}[$n]{name}));
- sync_webfetch($urpm, $urpm->{media}[$n], [ values %distant_sources ],
- \%options, resume => $options{resume}, callback => $options{callback});
- $urpm->{log}(N("...retrieving done"));
- };
- $@ and $urpm->{error}(N("...retrieving failed: %s", $@));
- #- clean files that have not been downloaded, but keep in mind
- #- there have been problems downloading them at least once, this
- #- is necessary to keep track of failing downloads in order to
- #- present the error to the user.
- foreach my $i (keys %distant_sources) {
- my ($filename) = $distant_sources{$i} =~ m|/([^/]*\.rpm)$|;
- if ($filename && -s "$urpm->{cachedir}/partial/$filename" &&
- URPM::verify_rpm("$urpm->{cachedir}/partial/$filename", nosignatures => 1))
- {
- #- it seems the the file has been downloaded correctly and has been checked to be valid.
- unlink "$urpm->{cachedir}/rpms/$filename";
- urpm::util::move("$urpm->{cachedir}/partial/$filename", "$urpm->{cachedir}/rpms/$filename");
- -r "$urpm->{cachedir}/rpms/$filename" and $sources->{$i} = "$urpm->{cachedir}/rpms/$filename";
- }
- unless ($sources->{$i}) {
- $error_sources->{$i} = $distant_sources{$i};
- }
- }
- }
- }
-
- #- clean failed download which have succeeded.
- delete @$error_sources{keys %$sources};
-
- 1;
-}
-
-#- prepare transaction.
-sub prepare_transaction {
- my ($_urpm, $set, $list, $sources, $transaction_list, $transaction_sources) = @_;
-
- foreach my $id (@{$set->{upgrade}}) {
- foreach (0..$#$list) {
- exists $list->[$_]{$id} and $transaction_list->[$_]{$id} = $list->[$_]{$id};
- }
- exists $sources->{$id} and $transaction_sources->{$id} = $sources->{$id};
- }
-}
-
#- extract package that should be installed instead of upgraded,
#- sources is a hash of id -> source rpm filename.
sub extract_packages_to_install {
@@ -2909,489 +218,11 @@ sub extract_packages_to_install {
\%inst;
}
-# size of the installation progress bar
-my $progress_size = 45;
-eval {
- require Term::ReadKey;
- ($progress_size) = Term::ReadKey::GetTerminalSize();
- $progress_size -= 35;
- $progress_size < 5 and $progress_size = 5;
-};
-
-# install logger callback
-sub install_logger {
- my ($urpm, $type, $id, $subtype, $amount, $total) = @_;
- my $pkg = defined $id && $urpm->{depslist}[$id];
- my $total_pkg = $urpm->{nb_install};
- local $| = 1;
-
- if ($subtype eq 'start') {
- $urpm->{logger_progress} = 0;
- if ($type eq 'trans') {
- $urpm->{logger_id} ||= 0;
- $urpm->{logger_count} ||= 0;
- my $p = N("Preparing...");
- print $p, " " x (33 - length $p);
- } else {
- ++$urpm->{logger_id};
- my $pname = $pkg ? $pkg->name : '';
- ++$urpm->{logger_count} if $pname;
- my $cnt = $pname ? $urpm->{logger_count} : '-';
- $pname ||= N("[repackaging]");
- printf "%9s: %-22s", $cnt . "/" . $total_pkg, $pname;
- }
- } elsif ($subtype eq 'stop') {
- if ($urpm->{logger_progress} < $progress_size) {
- print '#' x ($progress_size - $urpm->{logger_progress}), "\n";
- $urpm->{logger_progress} = 0;
- }
- } elsif ($subtype eq 'progress') {
- my $new_progress = $total > 0 ? int($progress_size * $amount / $total) : $progress_size;
- if ($new_progress > $urpm->{logger_progress}) {
- print '#' x ($new_progress - $urpm->{logger_progress});
- $urpm->{logger_progress} = $new_progress;
- $urpm->{logger_progress} == $progress_size and print "\n";
- }
- }
-}
-
-#- install packages according to each hash (remove, install or upgrade).
-sub install {
- my ($urpm, $remove, $install, $upgrade, %options) = @_;
- my %readmes;
-
- #- allow process to be forked now.
- my $pid;
- my ($CHILD_RETURNS, $ERROR_OUTPUT);
- if ($options{fork}) {
- pipe($CHILD_RETURNS, $ERROR_OUTPUT);
- defined($pid = fork()) or die "Can't fork: $!\n";
- if ($pid) {
- # parent process
- close $ERROR_OUTPUT;
-
- $urpm->{log}(N("using process %d for executing transaction", $pid));
- #- now get all errors from the child and return them directly.
- my @l;
- local $_;
- while (<$CHILD_RETURNS>) {
- chomp;
- if (/^::logger_id:(\d*):(\d*)/) {
- $urpm->{logger_id} = $1;
- $urpm->{logger_count} = $2 if $2;
- } else {
- push @l, $_;
- }
- }
-
- close $CHILD_RETURNS;
- waitpid($pid, 0);
- #- take care of return code from transaction, an error should be returned directly.
- $? >> 8 and exit $? >> 8;
-
- return @l;
- } else {
- # child process
- close $CHILD_RETURNS;
- }
- }
- #- beware this can be a child process or the main process now...
-
- my $db = db_open_or_die($urpm, $urpm->{root}, !$options{test}); #- open in read/write mode unless testing installation.
-
- my $trans = $db->create_transaction($urpm->{root});
- if ($trans) {
- sys_log("transaction on %s (remove=%d, install=%d, upgrade=%d)", $urpm->{root} || '/', scalar(@{$remove || []}), scalar(values %$install), scalar(values %$upgrade));
- $urpm->{log}(N("created transaction for installing on %s (remove=%d, install=%d, upgrade=%d)", $urpm->{root} || '/',
- scalar(@{$remove || []}), scalar(values %$install), scalar(values %$upgrade)));
- } else {
- return N("unable to create transaction");
- }
-
- my ($update, @l) = 0;
- my @produced_deltas;
-
- foreach (@$remove) {
- if ($trans->remove($_)) {
- $urpm->{log}(N("removing package %s", $_));
- } else {
- $urpm->{error}(N("unable to remove package %s", $_));
- }
- }
- foreach my $mode ($install, $upgrade) {
- foreach (keys %$mode) {
- my $pkg = $urpm->{depslist}[$_];
- $pkg->update_header($mode->{$_});
- if ($pkg->payload_format eq 'drpm') { #- handle deltarpms
- my $true_rpm = urpm::sys::apply_delta_rpm($mode->{$_}, "$urpm->{cachedir}/rpms", $pkg);
- if ($true_rpm) {
- push @produced_deltas, ($mode->{$_} = $true_rpm); #- fix path
- } else {
- $urpm->{error}(N("unable to extract rpm from delta-rpm package %s", $mode->{$_}));
- }
- }
- if ($trans->add($pkg, update => $update,
- $options{excludepath} ? (excludepath => [ split /,/, $options{excludepath} ]) : ()
- )) {
- $urpm->{log}(N("adding package %s (id=%d, eid=%d, update=%d, file=%s)", scalar($pkg->fullname),
- $_, $pkg->id, $update, $mode->{$_}));
- } else {
- $urpm->{error}(N("unable to install package %s", $mode->{$_}));
- }
- }
- ++$update;
- }
- if (($options{nodeps} || !(@l = $trans->check(%options))) && ($options{noorder} || !(@l = $trans->order))) {
- my $fh;
- #- assume default value for some parameter.
- $options{delta} ||= 1000;
- $options{callback_open} ||= sub {
- my ($_data, $_type, $id) = @_;
- $fh = $urpm->open_safe('<', $install->{$id} || $upgrade->{$id});
- $fh ? fileno $fh : undef;
- };
- $options{callback_close} ||= sub {
- my ($urpm, undef, $pkgid) = @_;
- return unless defined $pkgid;
- my $pkg = $urpm->{depslist}[$pkgid];
- my $fullname = $pkg->fullname;
- my $trtype = (grep { /\Q$fullname\E/ } values %$install) ? 'install' : '(upgrade|update)';
- foreach ($pkg->files) { /\bREADME(\.$trtype)?\.urpmi$/ and $readmes{$_} = $fullname }
- close $fh if defined $fh;
- };
- if ($::verbose >= 0 && (scalar keys %$install || scalar keys %$upgrade)) {
- $options{callback_inst} ||= \&install_logger;
- $options{callback_trans} ||= \&install_logger;
- }
- @l = $trans->run($urpm, %options);
-
- #- don't clear cache if transaction failed. We might want to retry.
- if (@l == 0 && !$options{test} && $options{post_clean_cache}) {
- #- examine the local cache to delete packages which were part of this transaction
- foreach (keys %$install, keys %$upgrade) {
- my $pkg = $urpm->{depslist}[$_];
- unlink "$urpm->{cachedir}/rpms/" . $pkg->filename;
- }
- }
- }
- unlink @produced_deltas;
-
- #- now exit or return according to current status.
- if (defined $pid && !$pid) { #- child process
- print $ERROR_OUTPUT "::logger_id:$urpm->{logger_id}:$urpm->{logger_count}\n"; #- allow main urpmi to know transaction numbering...
- print $ERROR_OUTPUT "$_\n" foreach @l;
- close $ERROR_OUTPUT;
- #- keep safe exit now (with destructor call).
- exit 0;
- } else {
- #- when non-forking
- # !!! BUG: this part of the code is not called when forking !!!
- # !!! BUG: when forking %readmes is empty, since the child is not passing this information to its parent !!!
- if ($::verbose >= 0 && keys %readmes) {
- foreach (keys %readmes) {
- print "-" x 70, "\n", N("More information on package %s", $readmes{$_}), "\n";
- my $fh; open $fh, '<', $_ and do {
- print while <$fh>;
- close $fh;
- };
- print "-" x 70, "\n";
- }
- }
- return @l;
- }
-}
-
-#- install all files to node as remembered according to resolving done.
-sub parallel_install {
- my @para = @_;
- my ($urpm, $_remove, $_install, $_upgrade, %_options) = @para;
- $urpm->{parallel_handler}->parallel_install(@para);
-}
-
-#- find packages to remove.
-#- options:
-#- bundle
-#- callback_base
-#- callback_fuzzy
-#- callback_notfound
-#- force
-#- matches
-#- root
-#- test
-sub find_packages_to_remove {
- my ($urpm, $state, $l, %options) = @_;
-
- if ($urpm->{parallel_handler}) {
- #- invoke parallel finder.
- $urpm->{parallel_handler}->parallel_find_remove($urpm, $state, $l, %options, find_packages_to_remove => 1);
- } else {
- my $db = db_open_or_die($urpm, $options{root});
- my (@m, @notfound);
-
- if (!$options{matches}) {
- foreach (@$l) {
- my ($n, $found);
-
- #- check if name-version-release-architecture was given.
- if (($n) = /^(.*)-[^\-]*-[^\-]*\.[^\.\-]*$/) {
- $db->traverse_tag('name', [ $n ], sub {
- my ($p) = @_;
- $p->fullname eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
- push @m, scalar $p->fullname;
- $found = 1;
- });
- $found and next;
- }
-
- #- check if name-version-release was given.
- if (($n) = /^(.*)-[^\-]*-[^\-]*$/) {
- $db->traverse_tag('name', [ $n ], sub {
- my ($p) = @_;
- my ($name, $version, $release) = $p->fullname;
- "$name-$version-$release" eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
- push @m, scalar $p->fullname;
- $found = 1;
- });
- $found and next;
- }
-
- #- check if name-version was given.
- if (($n) = /^(.*)-[^\-]*$/) {
- $db->traverse_tag('name', [ $n ], sub {
- my ($p) = @_;
- my ($name, $version) = $p->fullname;
- "$name-$version" eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
- push @m, scalar $p->fullname;
- $found = 1;
- });
- $found and next;
- }
-
- #- check if only name was given.
- $db->traverse_tag('name', [ $_ ], sub {
- my ($p) = @_;
- $p->name eq $_ or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
- push @m, scalar $p->fullname;
- $found = 1;
- });
- $found and next;
-
- push @notfound, $_;
- }
- if (!$options{force} && @notfound && @$l > 1) {
- $options{callback_notfound} && $options{callback_notfound}->($urpm, @notfound)
- or return ();
- }
- }
- if ($options{matches} || @notfound) {
- my $match = join "|", map { quotemeta } @$l;
- my $qmatch = qr/$match/;
-
- #- reset what has been already found.
- %$state = ();
- @m = ();
-
- #- search for packages that match, and perform closure again.
- $db->traverse(sub {
- my ($p) = @_;
- my $f = scalar $p->fullname;
- $f =~ $qmatch or return;
- $urpm->resolve_rejected($db, $state, $p, removed => 1, bundle => $options{bundle});
- push @m, $f;
- });
-
- if (!$options{force} && @notfound) {
- if (@m) {
- $options{callback_fuzzy} && $options{callback_fuzzy}->($urpm, @$l > 1 ? $match : $l->[0], @m)
- or return ();
- } else {
- $options{callback_notfound} && $options{callback_notfound}->($urpm, @notfound)
- or return ();
- }
- }
- }
-
- #- check if something needs to be removed.
- find_removed_from_basesystem($urpm, $db, $state, $options{callback_base})
- or return ();
- }
- grep { $state->{rejected}{$_}{removed} && !$state->{rejected}{$_}{obsoleted} } keys %{$state->{rejected}};
-}
-
-sub find_removed_from_basesystem {
- my ($urpm, $db, $state, $callback_base) = @_;
- if ($callback_base && %{$state->{rejected} || {}}) {
- my %basepackages;
- my @dont_remove = ('basesystem', split /,\s*/, $urpm->{global_config}{'prohibit-remove'});
- #- check if a package to be removed is a part of basesystem requires.
- $db->traverse_tag('whatprovides', \@dont_remove, sub {
- my ($p) = @_;
- $basepackages{$p->fullname} = 0;
- });
- foreach (grep { $state->{rejected}{$_}{removed} && !$state->{rejected}{$_}{obsoleted} } keys %{$state->{rejected}}) {
- exists $basepackages{$_} or next;
- ++$basepackages{$_};
- }
- if (grep { $_ } values %basepackages) {
- return $callback_base->($urpm, grep { $basepackages{$_} } keys %basepackages);
- }
- }
- return 1;
-}
-
-#- remove packages from node as remembered according to resolving done.
-sub parallel_remove {
- my ($urpm, $remove, %options) = @_;
- my $state = {};
- my $callback = sub { $urpm->{fatal}(1, "internal distributed remove fatal error") };
- $urpm->{parallel_handler}->parallel_find_remove($urpm, $state, $remove, %options,
- callback_notfound => undef,
- callback_fuzzy => $callback,
- callback_base => $callback,
- );
-}
-
-#- misc functions to help finding ask_unselect and ask_remove elements with their reasons translated.
-sub unselected_packages {
- my (undef, $state) = @_;
- grep { $state->{rejected}{$_}{backtrack} } keys %{$state->{rejected} || {}};
-}
-
-sub uniq { my %l; $l{$_} = 1 foreach @_; grep { delete $l{$_} } @_ }
-
-sub translate_why_unselected {
- my ($urpm, $state, @fullnames) = @_;
-
- join("\n", map { translate_why_unselected_one($urpm, $state, $_) } sort @fullnames);
-}
-
-sub translate_why_unselected_one {
- my ($urpm, $state, $fullname) = @_;
-
- my $rb = $state->{rejected}{$fullname}{backtrack};
- my @froms = keys %{$rb->{closure} || {}};
- my @unsatisfied = @{$rb->{unsatisfied} || []};
- my $s = join ", ", (
- (map { N("due to missing %s", $_) } @froms),
- (map { N("due to unsatisfied %s", $_) } uniq(map {
- #- XXX in theory we shouldn't need this, dependencies (and not ids) should
- #- already be present in @unsatisfied. But with biarch packages this is
- #- not always the case.
- /\D/ ? $_ : scalar($urpm->{depslist}[$_]->fullname);
- } @unsatisfied)),
- $rb->{promote} && !$rb->{keep} ? N("trying to promote %s", join(", ", @{$rb->{promote}})) : (),
- $rb->{keep} ? N("in order to keep %s", join(", ", @{$rb->{keep}})) : (),
- );
- $fullname . ($s ? " ($s)" : '');
-}
-
-sub removed_packages {
- my (undef, $state) = @_;
- grep {
- $state->{rejected}{$_}{removed} && !$state->{rejected}{$_}{obsoleted};
- } keys %{$state->{rejected} || {}};
-}
-
-sub translate_why_removed {
- my ($urpm, $state, @fullnames) = @_;
- join("\n", map { translate_why_removed_one($urpm, $state, $_) } sort @fullnames);
-}
-sub translate_why_removed_one {
- my ($urpm, $state, $fullname) = @_;
-
- my $closure = $state->{rejected}{$fullname}{closure};
- my ($from) = keys %$closure;
- my ($whyk) = keys %{$closure->{$from}};
- my $whyv = $closure->{$from}{$whyk};
- my $frompkg = $urpm->search($from, strict_fullname => 1);
- my $s = do {
- if ($whyk =~ /old_requested/) {
- N("in order to install %s", $frompkg ? scalar $frompkg->fullname : $from);
- } elsif ($whyk =~ /unsatisfied/) {
- join(",\n ", map {
- if (/([^\[\s]*)(?:\[\*\])?(?:\[|\s+)([^\]]*)\]?$/ && $2 ne '*') {
- N("due to unsatisfied %s", "$1 $2");
- } else {
- N("due to missing %s", $_);
- }
- } @$whyv);
- } elsif ($whyk =~ /conflicts/) {
- N("due to conflicts with %s", $whyv);
- } elsif ($whyk =~ /unrequested/) {
- N("unrequested");
- } else {
- undef;
- }
- };
- #- now insert the reason if available.
- $fullname . ($s ? "\n ($s)" : '');
-}
-
-sub check_sources_signatures {
- my ($urpm, $sources_install, $sources, %options) = @_;
- my ($medium, %invalid_sources);
- my $s = $sources_install;
-
- foreach my $id (keys %$sources_install, -1, keys %$sources) {
- if ($id == -1) { $s = $sources; next }
- my $filepath = $s->{$id};
- my $verif = URPM::verify_signature($filepath);
-
- if ($verif =~ /NOT OK/) {
- $verif =~ s/\n//g;
- $invalid_sources{$filepath} = N("Invalid signature (%s)", $verif);
- } else {
- unless ($medium && is_valid_medium($medium) &&
- $medium->{start} <= $id && $id <= $medium->{end})
- {
- $medium = undef;
- foreach (@{$urpm->{media}}) {
- is_valid_medium($_) && $_->{start} <= $id && $id <= $_->{end}
- and $medium = $_, last;
- }
- }
- #- no medium found for this rpm ?
- next if !$medium;
- #- check whether verify-rpm is specifically disabled for this medium
- next if defined $medium->{'verify-rpm'} && !$medium->{'verify-rpm'};
-
- my $key_ids = $medium->{'key-ids'} || $urpm->{options}{'key-ids'};
- #- check that the key ids of the medium match the key ids of the package.
- if ($key_ids) {
- my $valid_ids = 0;
- my $invalid_ids = 0;
-
- foreach my $key_id ($verif =~ /(?:key id \w{8}|#)(\w+)/gi) {
- if (grep { hex($_) == hex($key_id) } split /[,\s]+/, $key_ids) {
- ++$valid_ids;
- } else {
- ++$invalid_ids;
- }
- }
-
- if ($invalid_ids) {
- $invalid_sources{$filepath} = N("Invalid Key ID (%s)", $verif);
- } elsif (!$valid_ids) {
- $invalid_sources{$filepath} = N("Missing signature (%s)", $verif);
- }
- }
- #- invoke check signature callback.
- $options{callback} and $options{callback}->(
- $urpm, $filepath, %options,
- id => $id,
- verif => $verif,
- why => $invalid_sources{$filepath},
- );
- }
- }
+#- deprecated
+sub install { require urpm::install; &urpm::install::install }
- map { ($options{basename} ? basename($_) : $_) . ($options{translate} ? ": $invalid_sources{$_}" : "") }
- sort keys %invalid_sources;
-}
+#- deprecated
+sub parallel_remove { &urpm::parallel::remove }
#- get reason of update for packages to be updated
#- use all update medias if none given
@@ -3402,7 +233,7 @@ sub get_updates_description {
@update_medias or @update_medias = grep { !$_->{ignore} && $_->{update} } @{$urpm->{media}};
- foreach (map { cat_(statedir_descriptions($urpm, $_)), '%package dummy' } @update_medias) {
+ foreach (map { cat_utf8(urpm::media::statedir_descriptions($urpm, $_)), '%package dummy' } @update_medias) {
/^%package (.+)/ and do {
if (exists $cur->{importance} && $cur->{importance} ne "security" && $cur->{importance} ne "bugfix") {
$cur->{importance} = 'normal';
@@ -3423,63 +254,6 @@ sub get_updates_description {
\%update_descr;
}
-#- parse an MD5SUM file from a mirror
-sub get_md5sum {
- my ($md5sum_file, $f) = @_;
- my $basename = basename($f);
-
- my ($retrieved_md5sum) = map {
- my ($md5sum, $file) = m|(\S+)\s+(?:\./)?(\S+)|;
- $file && $file eq $basename ? $md5sum : @{[]};
- } cat_($md5sum_file);
-
- $retrieved_md5sum;
-}
-
-sub parse_md5sum {
- my ($urpm, $md5sum_file, $basename) = @_;
- $urpm->{log}(N("examining MD5SUM file"));
- my $retrieved_md5sum = get_md5sum($md5sum_file, $basename)
- or $urpm->{log}(N("warning: md5sum for %s unavailable in MD5SUM file", $basename));
- return $retrieved_md5sum;
-}
-
-sub recompute_local_md5sum {
- my ($urpm, $medium, $force) = @_;
- if ($force) {
- #- force downloading the file again, else why a force option has been defined ?
- delete $medium->{md5sum};
- } else {
- compute_local_md5sum($urpm, $medium) if !$medium->{md5sum};
- }
-}
-
-sub compute_local_md5sum {
- my ($urpm, $medium) = @_;
-
- $urpm->{log}(N("computing md5sum of existing source hdlist (or synthesis)"));
- my $f = statedir_hdlist_or_synthesis($urpm, $medium);
- if (-e $f) {
- $medium->{md5sum} = md5sum($f);
- }
-}
-
-sub syserror { my ($urpm, $msg, $info) = @_; $urpm->{error}("$msg [$info] [$!]") }
-
-sub open_safe {
- my ($urpm, $sense, $filename) = @_;
- open my $f, $sense, $filename
- or $urpm->syserror($sense eq '>' ? "Can't write file" : "Can't open file", $filename), return undef;
- return $f;
-}
-
-sub opendir_safe {
- my ($urpm, $dirname) = @_;
- opendir my $d, $dirname
- or $urpm->syserror("Can't open directory", $dirname), return undef;
- return $d;
-}
-
sub error_restricted ($) {
my ($urpm) = @_;
$urpm->{fatal}(2, N("This operation is forbidden while running in restricted mode"));
diff --git a/urpm/args.pm b/urpm/args.pm
index 6f11dd7c..3ce53e60 100644
--- a/urpm/args.pm
+++ b/urpm/args.pm
@@ -252,9 +252,11 @@ my %options_spec = (
'm|M' => sub { $options{deps} = $options{upgrade} = 1 },
c => \$options{complete},
g => \$options{group},
- p => \$options{use_provides},
+ 'whatprovides|p' => \$options{use_provides},
P => sub { $options{use_provides} = 0 },
- R => sub { ++$options{what_requires} },
+ 'whatrequires|R' => sub { $options{what_requires} and $options{what_requires_recursive} = 1;
+ $options{what_requires} = 1 },
+ 'whatrequires-recursive' => sub { $options{what_requires_recursive} = $options{what_requires} = 1 },
y => sub { $urpm->{options}{fuzzy} = 1; $options{all} = 1 },
Y => sub { $urpm->{options}{fuzzy} = 1; $options{all} = $options{caseinsensitive} = 1 },
'verbose|v' => \$options{verbose},
@@ -297,6 +299,7 @@ my %options_spec = (
'q|quiet' => sub { --$options{verbose} },
'v|verbose' => sub { ++$options{verbose} },
'norebuild!' => sub { $urpm->{options}{'build-hdlist-on-error'} = !$_[1]; $options{force} = 0 },
+ 'probe-rpms' => sub { $options{probe_with} = 'rpms' },
'<>' => sub {
my ($p) = @_;
if ($p =~ /^--?(.+)/) { # unrecognized option
@@ -311,7 +314,6 @@ my %options_spec = (
distrib => sub { $options{distrib} = 1 },
interactive => sub { $options{interactive} = 1 },
'all-media' => sub { $options{allmedia} = 1 },
- 'probe-rpms' => sub { $options{probe_with} = 'rpms' },
'from=s' => \$options{mirrors_url},
virtual => \$options{virtual},
nopubkey => \$options{nopubkey},
@@ -386,7 +388,7 @@ foreach my $k ("help|h", "version", "wget", "curl", "prozilla", "proxy=s", "prox
}
foreach my $k ("help|h", "wget", "curl", "prozilla", "proxy=s", "proxy-user=s", "c", "f", "z",
- "limit-rate=s", "no-md5sum", "update", "norebuild!",
+ "limit-rate=s", "no-md5sum", "update", "norebuild!", "probe-rpms",
"wget-options=s", "curl-options=s", "rsync-options=s", "prozilla-options=s", '<>')
{
$options_spec{'urpmi.addmedia'}{$k} = $options_spec{'urpmi.update'}{$k};
@@ -419,7 +421,8 @@ sub parse_cmdline {
}
my $ret = GetOptions(%{$options_spec{$tool}}, %options_spec_all);
- if ($tool ne 'urpmi.addmedia' && $options{probe_with} && !$options{usedistrib}) {
+ if ($tool ne 'urpmi.addmedia' && $tool ne 'urpmi.update' &&
+ $options{probe_with} && !$options{usedistrib}) {
die N("Can't use %s without %s", "--probe-$options{probe_with}", "--use-distrib");
}
if ($options{probe_with} && $options{probe_with} eq 'rpms' && $options{virtual}) {
diff --git a/urpm/bug_report.pm b/urpm/bug_report.pm
index eb1258a4..f4265870 100644
--- a/urpm/bug_report.pm
+++ b/urpm/bug_report.pm
@@ -30,10 +30,9 @@ sub write_urpmdb {
require URPM::Build;
foreach (@{$urpm->{media}}) {
#- take care of virtual medium this way.
- $_->{hdlist} ||= "hdlist.$_->{name}.cz";
#- now build directly synthesis file, this is by far the simplest method.
if (urpm::media::is_valid_medium($_)) {
- $urpm->build_synthesis(start => $_->{start}, end => $_->{end}, synthesis => "$bug_report_dir/synthesis.$_->{hdlist}");
+ $urpm->build_synthesis(start => $_->{start}, end => $_->{end}, synthesis => "$bug_report_dir/synthesis." . urpm::media::_hdlist($_));
$urpm->{log}(N("built hdlist synthesis file for medium \"%s\"", $_->{name}));
}
}
diff --git a/urpm/cfg.pm b/urpm/cfg.pm
index 06f3c7ef..47761fec 100644
--- a/urpm/cfg.pm
+++ b/urpm/cfg.pm
@@ -24,12 +24,14 @@ urpm::cfg - routines to handle the urpmi configuration files
Reads an urpmi configuration file and returns its contents in a hash ref :
{
- 'medium name 1' => {
+ media => [
+ 'medium name 1' => {
url => 'http://...',
option => 'value',
...
- }
- '' => {
+ },
+ ],
+ global => {
# global options go here
},
}
@@ -51,9 +53,7 @@ Returns 1 on success, 0 on failure.
my ($arch, $release);
sub _init_arch_release () {
if (!$arch && !$release) {
- open my $f, '/etc/release' or return undef;
- my $l = <$f>;
- close $f;
+ my $l = cat_('/etc/release') or return undef;
($release, $arch) = $l =~ /release (\d+\.\d+).*for (\w+)/;
$release = 'cooker' if $l =~ /cooker/i;
}
@@ -103,49 +103,46 @@ sub expand_line {
return $line;
}
-sub load_config ($;$) {
+sub load_config_raw {
my ($file, $b_norewrite) = @_;
- my %config;
- my $priority = 1;
- my $medium;
+ my @blocks;
+ my $block;
$err = '';
- my @conf_lines = cat_($file) or do { $err = N("unable to read config file [%s]", $file); return };
- foreach (@conf_lines) {
+ -r $file or do {
+ $err = N("unable to read config file [%s]", $file);
+ return;
+ };
+ foreach (cat_($file)) {
chomp;
next if /^\s*#/; #- comments
s/^\s+//; s/\s+$//;
$_ = expand_line($_) unless $b_norewrite;
if ($_ eq '}') { #-{
- if (!defined $medium) {
+ if (!defined $block) {
_syntax_error();
return;
}
- $config{$medium}{priority} = $priority++ if $medium ne ''; #- to preserve order
- undef $medium;
- next;
- }
- if (defined $medium && /{$/) { #-}
+ push @blocks, $block;
+ undef $block;
+ } elsif (defined $block && /{$/) { #-}
_syntax_error();
return;
- }
- if ($_ eq '{') { #-} Entering a global block
- $medium = '';
- next;
- }
- if (/^(.*?[^\\])\s+(?:(.*?[^\\])\s+)?{$/) { #- medium definition
- $medium = unquotespace $1;
- if ($config{$medium}) {
+ } elsif ($_ eq '{') {
+ #-} Entering a global block
+ $block = { name => '' };
+ } elsif (/^(.*?[^\\])\s+(?:(.*?[^\\])\s+)?{$/) {
+ #- medium definition
+ my ($name, $url) = (unquotespace($1), unquotespace($2));
+ if (grep { $_->{name} eq $name } @blocks) {
#- hmm, somebody fudged urpmi.cfg by hand.
- $err = N("medium `%s' is defined twice, aborting", $medium);
+ $err = N("medium `%s' is defined twice, aborting", $name);
return;
}
- $config{$medium}{url} = unquotespace $2;
- next;
- }
- #- config values
- /^(hdlist
+ $block = { name => $name, url => $url };
+ } elsif (/^(hdlist
|list
|with_hdlist
+ |media_info_dir
|removable
|md5sum
|limit-rate
@@ -157,16 +154,16 @@ sub load_config ($;$) {
|retry
|default-media
|(?:curl|rsync|wget|prozilla)-options
- )\s*:\s*['"]?(.*?)['"]?$/x
- and $config{$medium}{$1} = $2, next;
- /^key[-_]ids\s*:\s*['"]?(.*?)['"]?$/
- and $config{$medium}{'key-ids'} = $1, next;
- #- positive flags
- /^(update|ignore|synthesis|noreconfigure|static|virtual)$/
- and $config{$medium}{$1} = 1, next;
- my ($no, $k, $v);
- #- boolean options
- if (($no, $k, $v) = /^(no-)?(
+ )\s*:\s*['"]?(.*?)['"]?$/x) {
+ #- config values
+ $block->{$1} = $2;
+ } elsif (/^key[-_]ids\s*:\s*['"]?(.*?)['"]?$/) {
+ $block->{'key-ids'} = $1;
+ } elsif (/^(update|ignore|hdlist|synthesis|noreconfigure|static|virtual)$/) {
+ #- positive flags
+ $block->{$1} = 1;
+ } elsif (my ($no, $k, $v) =
+ /^(no-)?(
verify-rpm
|norebuild
|fuzzy
@@ -182,49 +179,71 @@ sub load_config ($;$) {
|nopubkey
|resume)(?:\s*:\s*(.*))?$/x
) {
+ #- boolean options
my $yes = $no ? 0 : 1;
$no = $yes ? 0 : 1;
$v = '' unless defined $v;
- $config{$medium}{$k} = $v =~ /^(yes|on|1|)$/i ? $yes : $no;
- next;
+ $block->{$k} = $v =~ /^(yes|on|1|)$/i ? $yes : $no;
+ } elsif ($_ eq 'modified') {
+ #- obsolete
+ } else {
+ warn "unknown line '$_'\n" if $_;
}
- #- obsolete
- $_ eq 'modified' and next;
}
- return \%config;
+ \@blocks;
+}
+
+sub load_config {
+ my ($file) = @_;
+
+ my $blocks = load_config_raw($file);
+ my ($media, $global) = partition { $_->{name} } @$blocks;
+ ($global) = @$global;
+ delete $global->{name};
+
+ { global => $global || {}, media => $media };
}
-sub dump_config ($$) {
+sub dump_config {
my ($file, $config) = @_;
- my $config_old = load_config($file, 1);
- my @media = sort {
- return 0 if $a eq $b;
- return -1 if $a eq ''; #- global options come first
- return 1 if $b eq '';
- return $config->{$a}{priority} <=> $config->{$b}{priority} || $a cmp $b;
- } keys %$config;
+
+ my %global = (name => '', %{$config->{global}});
+
+ dump_config_raw($file, [ %global ? \%global : (), @{$config->{media}} ]);
+}
+
+sub dump_config_raw {
+ my ($file, $blocks) = @_;
+
+ my $old_blocks = load_config_raw($file, 1);
+ my $substitute_back = sub {
+ my ($m, $field) = @_;
+ my ($prev_block) = grep { $_->{name} eq $m->{name} } @$old_blocks;
+ substitute_back($m->{$field}, $prev_block && $prev_block->{$field});
+ };
+
open my $f, '>', $file or do {
$err = N("unable to write config file [%s]", $file);
return 0;
};
- foreach my $m (@media) {
- if ($m) {
- print $f quotespace($m), ' ', quotespace(substitute_back($config->{$m}{url}, $config_old->{$m}{url})), " {\n";
- } else {
- next if !keys %{$config->{''}};
- print $f "{\n";
- }
- foreach (sort grep { $_ && $_ ne 'url' } keys %{$config->{$m}}) {
+
+ foreach my $m (@$blocks) {
+ my @l = map {
if (/^(update|ignore|synthesis|noreconfigure|static|virtual)$/) {
- print $f " $_\n";
+ $_;
+ } elsif ($_ eq 'hdlist' && $m->{$_} eq '1') {
+ $_;
} elsif ($_ ne 'priority') {
- print $f " $_: " . substitute_back($config->{$m}{$_}, $config_old->{$m}{$_}) . "\n";
+ "$_: " . $substitute_back->($m, $_);
}
- }
- print $f "}\n\n";
+ } sort grep { $_ && $_ ne 'url' && $_ ne 'name' } keys %$m;
+
+ my $name_url = $m->{name} ?
+ join(' ', map { quotespace($_) } $m->{name}, $substitute_back->($m, 'url')) . ' ' : '';
+
+ print $f $name_url . "{\n", (map { " $_\n" } @l), "}\n\n";
}
- close $f;
- return 1;
+ 1;
}
#- routines to handle mirror list location
diff --git a/urpm/download.pm b/urpm/download.pm
index ceb6ffff..e4fed74c 100644
--- a/urpm/download.pm
+++ b/urpm/download.pm
@@ -617,6 +617,21 @@ sub requested_ftp_http_downloader {
} || $urpm->{global_config}{downloader};
}
+sub parse_url_with_login {
+ my ($url) = @_;
+ $url =~ m!([^:]*)://([^/:\@]*)(:([^/:\@]*))?\@([^/]*)(.*)! &&
+ { proto => $1, login => $2, password => $4, machine => $5, dir => $6 };
+}
+sub url_obscuring_password {
+ my ($url) = @_;
+ my $u = parse_url_with_login($url);
+ if ($u && $u->{password}) {
+ sprintf('%s://xxx:xxx@%s%s', $u->{proto}, $u->{machine}, $u->{dir});
+ } else {
+ $url;
+ }
+}
+
#- $medium can be undef
#- known options: quiet, resume, callback
sub sync {
@@ -632,11 +647,12 @@ sub sync {
$all_options{$cpt} = $urpm->{options}{$cpt} if defined $urpm->{options}{$cpt};
}
- $urpm->{debug}(N("retrieving %s", join(' ', @$files)));
+ my $files_text = join(' ', map { url_obscuring_password($_) } @$files);
+ $urpm->{debug} and $urpm->{debug}(N("retrieving %s", $files_text));
eval {
_sync_webfetch_raw($urpm, $files, \%all_options);
- $urpm->{log}(N("retrieved %s", join(' ', @$files)));
+ $urpm->{log}(N("retrieved %s", $files_text));
1;
};
}
diff --git a/urpm/install.pm b/urpm/install.pm
index e78f80a9..334555ce 100644
--- a/urpm/install.pm
+++ b/urpm/install.pm
@@ -176,10 +176,9 @@ sub install {
#- don't clear cache if transaction failed. We might want to retry.
if (@l == 0 && !$options{test} && $options{post_clean_cache}) {
#- examine the local cache to delete packages which were part of this transaction
- foreach (keys %$install, keys %$upgrade) {
- my $pkg = $urpm->{depslist}[$_];
- unlink "$urpm->{cachedir}/rpms/" . $pkg->filename;
- }
+ my @pkgs = map { $urpm->{depslist}[$_]->filename } keys %$install, keys %$upgrade;
+ $urpm->{log}(N("removing installed rpms (%s) from %s", join(' ', @pkgs), "$urpm->{cachedir}/rpms"));
+ unlink "$urpm->{cachedir}/rpms/$_" foreach @pkgs;
}
if ($::verbose >= 0) {
diff --git a/urpm/lock.pm b/urpm/lock.pm
index 6c1560ca..0b9cf7f7 100644
--- a/urpm/lock.pm
+++ b/urpm/lock.pm
@@ -17,7 +17,8 @@ my ($LOCK_SH, $LOCK_EX, $LOCK_NB, $LOCK_UN) = (1, 2, 4, 8);
# - lock urpmi db in /
sub rpm_db {
my ($urpm, $b_exclusive) = @_;
- urpm::lock->new($urpm, "$urpm->{root}/$urpm->{statedir}/.RPMLOCK", 'rpm', $b_exclusive);
+ my $f = ($urpm->{root} && !$urpm->{urpmi_root} ? "$urpm->{root}/" : '') . "$urpm->{statedir}/.RPMLOCK";
+ urpm::lock->new($urpm, $f, 'rpm', $b_exclusive);
}
sub urpmi_db {
my ($urpm, $b_exclusive, $b_nofatal) = @_;
diff --git a/urpm/md5sum.pm b/urpm/md5sum.pm
index f5295190..71ccc5b5 100644
--- a/urpm/md5sum.pm
+++ b/urpm/md5sum.pm
@@ -41,7 +41,7 @@ sub compute_on_local_medium {
my ($urpm, $medium) = @_;
require urpm::media; #- help perl_checker
- my $f = urpm::media::statedir_hdlist_or_synthesis($urpm, $medium);
+ my $f = urpm::media::statedir_hdlist_or_synthesis($urpm, $medium, 's');
$urpm->{log}(N("computing md5sum of existing source hdlist (or synthesis) [%s]", $f));
-e $f && compute($f);
}
diff --git a/urpm/media.pm b/urpm/media.pm
index 4beb4268..2c27aa32 100644
--- a/urpm/media.pm
+++ b/urpm/media.pm
@@ -7,6 +7,7 @@ use urpm::msg;
use urpm::util;
use urpm::removable;
use urpm::lock;
+use MDV::Distribconf;
our @PER_MEDIA_OPT = qw(
@@ -56,18 +57,12 @@ sub read_private_netrc {
@l;
}
-sub parse_url_with_login {
- my ($url) = @_;
- $url =~ m!([^:]*)://([^/:\@]*)(:([^/:\@]*))?\@([^/]*)(.*)! &&
- { proto => $1, login => $2, password => $4, machine => $5, dir => $6 };
-}
-
sub read_config_add_passwords {
my ($urpm, $config) = @_;
my @netrc = read_private_netrc($urpm) or return;
foreach (@{$config->{media}}) {
- my $u = parse_url_with_login($_->{url}) or next;
+ my $u = urpm::download::parse_url_with_login($_->{url}) or next;
if (my ($e) = grep { ($_->{default} || $_->{machine} eq $u->{machine}) && $_->{login} eq $u->{login} } @netrc) {
$_->{url} = sprintf('%s://%s:%s@%s%s', $u->{proto}, $u->{login}, $e->{password}, $u->{machine}, $u->{dir});
} else {
@@ -81,7 +76,7 @@ sub remove_passwords_and_write_private_netrc {
my @l;
foreach (@{$config->{media}}) {
- my $u = parse_url_with_login($_->{url}) or next;
+ my $u = urpm::download::parse_url_with_login($_->{url}) or next;
#- check whether a password is visible
$u->{password} or next;
@@ -541,14 +536,14 @@ sub configure {
if ($options{media}) {
delete $_->{modified} foreach @{$urpm->{media} || []};
select_media($urpm, split /,/, $options{media});
- foreach (grep { !$_->{modified} } @{$urpm->{media} || []}) {
- _tempignore($_, 1);
+ foreach (@{$urpm->{media} || []}) {
+ _tempignore($_, !$_->{modified});
}
}
if ($options{searchmedia}) {
select_media($urpm, $options{searchmedia}); #- Ensure this media has been selected
if (my $medium = name2medium($urpm, $options{searchmedia})) {
- $medium->{ignore} and $urpm->{fatal}("searchmedia is ignored");
+ _tempignore($medium, 0);
$medium->{searchmedia} = 1;
}
}
@@ -589,7 +584,7 @@ sub _parse_media {
$need_second_pass = 1 if !$is_second_pass && !$options->{no_second_pass};
} else {
$options->{need_hdlist}
- and $urpm->{error}(N("Note: no hdlist for medium \"%s\", urpmf is unable to return any result for it", $_->{name}));
+ and $urpm->{error}(N("Note: no hdlist for medium \"%s\", unable to return any result for it", $_->{name}));
_parse_synthesis($urpm, $_, any_synthesis($urpm, $_), $options->{callback});
}
@@ -877,7 +872,7 @@ sub _probe_with_try_list {
my $url = reduce_pathname("$base/$media_info_dir") . '/' . ($synthesis ? 'synthesis.hdlist.cz' : 'hdlist.cz');
$f->($url) or return;
- $urpm->{debug}("found hdlist/synthesis: $url");
+ $urpm->{debug} and $urpm->{debug}("found hdlist/synthesis: $url");
$medium->{media_info_dir} = $media_info_dir;
if ($probe_with) {
@@ -1684,7 +1679,7 @@ sub _update_medium_first_pass {
my @unresolved_after = grep { ! defined $urpm->{provides}{$_} } keys %{$urpm->{provides} || {}};
if (@unresolved_before != @unresolved_after) {
$medium->{need_second_pass} = 1;
- $urpm->{debug}(sprintf qq(medium "%s" has unresolved dependencies: %s),
+ $urpm->{debug} and $urpm->{debug}(sprintf qq(medium "%s" has unresolved dependencies: %s),
$medium->{name},
join(' ', difference2(\@unresolved_after, \@unresolved_before)));
}
diff --git a/urpm/msg.pm b/urpm/msg.pm
index 2944f85c..e8a1a503 100644
--- a/urpm/msg.pm
+++ b/urpm/msg.pm
@@ -5,44 +5,58 @@ package urpm::msg;
use strict;
no warnings;
use Exporter;
+use URPM;
+
+BEGIN {
+ eval { require encoding };
+ eval "use open ':locale'" if eval { encoding::_get_locale_encoding() ne 'ANSI_X3.4-1968' };
+}
(our $VERSION) = q($Revision$) =~ /(\d+)/;
our @ISA = 'Exporter';
-our @EXPORT = qw(N bug_log to_utf8 message_input toMb from_utf8 sys_log);
+our @EXPORT = qw(N P translate bug_log message_input toMb sys_log);
#- I18N.
use Locale::gettext;
-use POSIX qw(LC_ALL);
-POSIX::setlocale(LC_ALL, "");
-Locale::gettext::textdomain("urpmi");
-
-my $codeset; #- encoding of the current locale
-eval {
- require I18N::Langinfo;
- I18N::Langinfo->import(qw(langinfo CODESET));
- $codeset = langinfo(CODESET()); # note the ()
-};
-defined $codeset or eval {
- (undef, $codeset) = `/usr/bin/locale -c charmap`;
- chomp $codeset;
-};
-
-sub from_utf8_full { Locale::gettext::iconv($_[0], "UTF-8", $codeset) }
-sub from_utf8_dummy { $_[0] }
-
-our $use_utf8_full = defined $codeset && $codeset eq 'UTF-8';
+use POSIX();
+POSIX::setlocale(POSIX::LC_ALL(), "");
+my @textdomains = qw(urpmi rpm-summary-main rpm-summary-contrib rpm-summary-devel);
+foreach my $domain (@textdomains) {
+ Locale::gettext::bind_textdomain_codeset($domain, 'UTF-8');
+}
+URPM::bind_rpm_textdomain_codeset();
+
+our $no_translation;
+
+sub translate {
+ my ($s, $o_plural, $o_nb) = @_;
+ my $res;
+ if ($no_translation) {
+ $s;
+ } elsif ($o_nb) {
+ foreach my $domain (@textdomains) {
+ eval { $res = Locale::gettext::dngettext($domain, $s || '', $o_plural, $o_nb) || $s };
+ return $res if $s ne $res;
+ }
+ return $s;
+ } else {
+ foreach my $domain (@textdomains) {
+ eval { $res = Locale::gettext::dgettext($domain, $s || '') || $s };
+ return $res if $s ne $res;
+ }
+ return $s;
+ }
+}
-sub from_utf8 { $use_utf8_full ? &from_utf8_full : &from_utf8_dummy }
+sub P {
+ my ($s_singular, $s_plural, $nb, @para) = @_;
+ sprintf(translate($s_singular, $s_plural, $nb), @para);
+}
sub N {
my ($format, @params) = @_;
- my $s = sprintf(
- eval { Locale::gettext::gettext($format || '') } || $format,
- @params,
- );
- utf8::decode($s) unless $use_utf8_full;
- $s;
+ sprintf(translate($format), @params);
}
my $noexpr = N("Nn");
@@ -50,13 +64,19 @@ my $yesexpr = N("Yy");
eval {
require Sys::Syslog;
- Sys::Syslog->import();
+ Sys::Syslog->import;
(my $tool = $0) =~ s!.*/!!;
+
+ #- what we really want is "unix" (?)
+ #- we really don't want "console" which forks/exit and thus
+ # run callbacks registered through atexit() : x11, gtk+, rpm, ...
+ Sys::Syslog::setlogsock([ 'tcp', 'unix', 'stream' ]);
+
openlog($tool, '', 'user');
END { defined &closelog and closelog() }
};
-sub sys_log { defined &syslog and syslog("info", @_) }
+sub sys_log { defined &syslog and eval { syslog("info", @_) } }
#- writes only to logfile, not to screen
sub bug_log {
@@ -68,8 +88,6 @@ sub bug_log {
}
}
-sub to_utf8 { Locale::gettext::iconv($_[0], undef, "UTF-8") }
-
sub message_input {
my ($msg, $o_default_input, %o_opts) = @_;
my $input;
diff --git a/urpm/select.pm b/urpm/select.pm
index aa8a9726..6252dea6 100644
--- a/urpm/select.pm
+++ b/urpm/select.pm
@@ -16,10 +16,10 @@ sub _findindeps {
/$qv/ || !$caseinsensitive && /$qv/i or next;
my @list = grep { defined $_ } map {
- my $pkg = $urpm->{depslist}[$_];
+ my $pkg = $_;
$pkg && ($src ? $pkg->arch eq 'src' : $pkg->arch ne 'src')
? $pkg->id : undef;
- } keys %{$urpm->{provides}{$_} || {}};
+ } $urpm->packages_providing($_);
@list > 0 and push @{$found->{$v}}, join '|', @list;
}
}
@@ -49,9 +49,7 @@ sub search_packages {
$urpm->{searchmedia}{start} <= $_->id
&& $urpm->{searchmedia}{end} >= $_->id)
? $_ : @{[]};
- } map {
- $urpm->{depslist}[$_];
- } keys %{$urpm->{provides}{$v} || {}})
+ } $urpm->packages_providing($v))
{
#- we assume that if there is at least one package providing
#- the resource exactly, this should be the best one; but we
@@ -194,33 +192,44 @@ sub resolve_dependencies {
start => $urpm->{searchmedia}{start}, end => $urpm->{searchmedia}{end});
}
- #- resolve dependencies which will be examined for packages that need to
- #- have urpmi restarted when they're updated.
- $urpm->resolve_requested($db, $state, $requested, %options);
+ my @priority_upgrade;
+ my $resolve_priority_upgrades = sub {
+ my ($selected, $priority_requested) = @_;
+
+ my %priority_state;
+
+ $urpm->resolve_requested($db, \%priority_state, $priority_requested, %options);
+ if (grep { ! exists $priority_state{selected}{$_} } keys %$priority_requested) {
+ #- some packages which were selected previously have not been selected, strange!
+ } elsif (grep { ! exists $priority_state{selected}{$_} } keys %$selected) {
+ #- there are other packages to install after this priority transaction.
+ %$state = %priority_state;
+ $need_restart = 1;
+ }
+ };
if ($options{priority_upgrade} && !$options{rpmdb}) {
- my (%priority_upgrade, %priority_requested);
- @priority_upgrade{split /,/, $options{priority_upgrade}} = ();
-
- #- check if a priority upgrade should be tried
- foreach (keys %{$state->{selected}}) {
- my $pkg = $urpm->{depslist}[$_] or next;
- exists $priority_upgrade{$pkg->name} or next;
- $priority_requested{$pkg->id} = undef;
+ @priority_upgrade = map {
+ $urpm->packages_by_name($_);
+ } split(/,/, $options{priority_upgrade});
+
+ #- first check if a priority_upgrade package is requested
+ #- (it should catch all occurences in --auto-select mode)
+ #- (nb: a package "foo" may appear twice, and only one will be set flag_upgrade)
+ if (my @l = grep { $_->flag_upgrade } @priority_upgrade) {
+ my %priority_requested = map { $_->id => undef } @l;
+ $resolve_priority_upgrades->($requested, \%priority_requested);
}
+ }
- if (%priority_requested) {
- my %priority_state;
-
- $urpm->resolve_requested($db, \%priority_state, \%priority_requested, %options);
- if (grep { ! exists $priority_state{selected}{$_} } keys %priority_requested) {
- #- some packages which were selected previously have not been selected, strange!
- $need_restart = 0;
- } elsif (grep { ! exists $priority_state{selected}{$_} } keys %{$state->{selected}}) {
- #- there are other packages to install after this priority transaction.
- %$state = %priority_state;
- $need_restart = 1;
- }
+ if (!$need_restart) {
+ $urpm->resolve_requested($db, $state, $requested, %options);
+
+ #- now check if a priority_upgrade package has been required
+ #- by a requested package
+ if (my @l = grep { $state->{selected}{$_->id} } @priority_upgrade) {
+ my %priority_requested = map { $_->id => undef } @l;
+ $resolve_priority_upgrades->($state->{selected}, \%priority_requested);
}
}
}
diff --git a/urpm/util.pm b/urpm/util.pm
index b12c49a0..e6e91dca 100644
--- a/urpm/util.pm
+++ b/urpm/util.pm
@@ -8,10 +8,11 @@ our @ISA = 'Exporter';
our @EXPORT = qw(quotespace unquotespace
remove_internal_name
reduce_pathname offset_pathname
- md5sum untaint
+ untaint
copy_and_own
same_size_and_mtime
- difference2 member file_size cat_ dirname basename
+ partition uniq
+ difference2 member file_size cat_ cat_utf8 dirname basename
);
(our $VERSION) = q($Revision$) =~ /(\d+)/;
@@ -87,21 +88,6 @@ sub untaint {
@r == 1 ? $r[0] : @r;
}
-sub md5sum {
- my ($file) = @_;
- eval { require Digest::MD5 };
- if ($@) {
- #- Use an external command to avoid depending on perl
- return (split ' ', `/usr/bin/md5sum '$file'`)[0];
- } else {
- my $ctx = Digest::MD5->new;
- open my $fh, $file or return '';
- $ctx->addfile($fh);
- close $fh;
- return $ctx->hexdigest;
- }
-}
-
sub copy {
my ($file, $dest) = @_;
!system("/bin/cp", "-p", "-L", "-R", $file, $dest);
@@ -130,9 +116,20 @@ sub same_size_and_mtime {
$sstat[7] == $lstat[7] && $sstat[9] == $lstat[9];
}
+sub partition(&@) {
+ my $f = shift;
+ my (@a, @b);
+ foreach (@_) {
+ $f->($_) ? push(@a, $_) : push(@b, $_);
+ }
+ \@a, \@b;
+}
+
+sub uniq { my %l; $l{$_} = 1 foreach @_; grep { delete $l{$_} } @_ }
sub difference2 { my %l; @l{@{$_[1]}} = (); grep { !exists $l{$_} } @{$_[0]} }
sub member { my $e = shift; foreach (@_) { $e eq $_ and return 1 } 0 }
sub cat_ { my @l = map { my $F; open($F, '<', $_) ? <$F> : () } @_; wantarray() ? @l : join '', @l }
+sub cat_utf8 { my @l = map { my $F; open($F, '<:utf8', $_) ? <$F> : () } @_; wantarray() ? @l : join '', @l }
1;
diff --git a/urpme b/urpme
index 1d5989d1..88072e73 100644
--- a/urpme
+++ b/urpme
@@ -32,9 +32,8 @@ $ENV{PATH} = "/sbin:/usr/sbin:/bin:/usr/bin:/usr/X11R6/bin";
delete @ENV{qw(ENV BASH_ENV IFS CDPATH)};
our ($test, $parallel, $auto, $matches, $verbose, $force, $noscripts, $repackage, @l, $bundle, $restricted);
-my $yesexpr =
- #-PO: Add here the keys which might be pressed in the "Yes"-case.
- N("Yy");
+# Translator: Add here the keys which might be pressed in the "Yes"-case.
+my $yesexpr = N("Yy");
sub usage() {
print N("urpme version %s
diff --git a/urpmi.addmedia b/urpmi.addmedia
index 55fe9a3a..2c014f0a 100755
--- a/urpmi.addmedia
+++ b/urpmi.addmedia
@@ -29,10 +29,11 @@ use urpm::media;
sub usage {
my $m = shift;
- my $usage =
- #-PO: The URI types strings 'file:', 'ftp:', 'http:', and 'removable:' must not be translated!
- #-PO: neither the ``with''. Only what is between <brackets> can be translated.
- N("usage: urpmi.addmedia [options] <name> <url>
+# Translator: The URI types strings 'file:', 'ftp:', 'http:',
+# Translator: and 'removable:' must not be translated!
+# Translator: neither the ``with''.
+# Translator: only what is between <brackets> can be translated.
+ my $usage = N("usage: urpmi.addmedia [options] <name> <url>
where <url> is one of
[file:/]/<path>
ftp://<login>:<password>\@<host>/<path>
@@ -54,6 +55,7 @@ and [options] are from
") . N(" --probe-synthesis - use synthesis file.
") . N(" --probe-hdlist - use hdlist file.
") . N(" --probe-rpms - use rpm files (instead of synthesis/hdlist).
+") . N(" --probe-hdlist - use hdlist file.
") . N(" --no-probe - do not try to find any synthesis or hdlist file.
") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
") . N(" --distrib - automatically create all media from an installation
diff --git a/urpmi.bash-completion b/urpmi.bash-completion
index 3bec9b53..10322fd2 100644
--- a/urpmi.bash-completion
+++ b/urpmi.bash-completion
@@ -174,13 +174,13 @@ _urpmq()
if [[ "$cur" == -* ]]; then
# return list of available options
- COMPREPLY=( $( compgen -W '-v -d -u -m -a -c -y -s -i -g \
+ COMPREPLY=( $( compgen -W '-v -d -u -m -a -c -y -s -i -g -p \
-r -f -h -l --help --update --media --excludemedia \
--sortmedia --synthesis --auto-select --fuzzy --keep --nokeep \
--list --list-url --list-media --list-nodes --list-aliases \
--src --sources --force --parallel --wget --curl --prozilla \
--changelog --proxy --proxy-user --env --dump-config \
- --whatrequires --whatrequires-recursive \
+ --whatprovides --whatrequires --whatrequires-recursive \
--use-distrib --searchmedia --ignorearch' -- $cur))
else
# return available packages (unless it is clearly a file) and rpm files
diff --git a/urpmi.removemedia b/urpmi.removemedia
index 00af3991..54474da9 100755
--- a/urpmi.removemedia
+++ b/urpmi.removemedia
@@ -43,6 +43,7 @@ where <name> is a medium name to remove.
") . N(" -y - fuzzy match on media names.
") . N(" -q - quiet mode.
") . N(" -v - verbose mode.
+") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
") . $msg;
exit 0;
}
@@ -71,8 +72,14 @@ my @entries = map { $_->{name} } @{$urpm->{media}};
my @toremove;
if ($options{all}) {
- !@cmdline or usage('');
- @toremove = @entries or die N("nothing to remove (use urpmi.addmedia to add a media)\n");
+ if (@cmdline) {
+ usage('');
+ } elsif (!@entries) {
+ print STDERR N("nothing to remove (use urpmi.addmedia to add a media)\n");
+ exit 0;
+ } else {
+ @toremove = @entries;
+ }
} else {
@toremove = @cmdline or usage(N("the entry to remove is missing\n(one of %s)\n", join(", ", @entries)));
}
diff --git a/urpmi.update b/urpmi.update
index 4dd84128..d47e7a70 100755
--- a/urpmi.update
+++ b/urpmi.update
@@ -43,9 +43,11 @@ where <name> is a medium name to update.
") . N(" --force-key - force update of gpg key.
") . N(" --ignore - don't update, mark the media as ignored.
") . N(" --no-ignore - don't update, mark the media as enabled.
+") . N(" --urpmi-root - use another root for urpmi db & rpm installation.
+") . N(" --probe-rpms - do not use synthesis/hdlist, use rpm files directly
") . N(" -a - select all non-removable media.
") . N(" -c - clean headers cache directory.
-") . N(" -f - force generation of hdlist files.
+") . N(" -f - force updating synthesis/hdlist
") . N(" -q - quiet mode.
") . N(" -v - verbose mode.
");
@@ -100,7 +102,9 @@ if (defined $options{ignore}) {
$urpm->{log}($options{ignore} ? N("ignoring media %s", $str) : N("enabling media %s", $str));
urpm::media::write_config($urpm);
} else {
- urpm::media::update_media($urpm, %options, callback => \&urpm::download::sync_logger);
+ urpm::media::update_media($urpm, %options,
+ quiet => $options{verbose} < 0,
+ callback => \&urpm::download::sync_logger);
#- try to umount removable device which may have been mounted.
urpm::removable::try_umounting_removables($urpm);
}
diff --git a/urpmq b/urpmq
index 3d44b840..6348e281 100755
--- a/urpmq
+++ b/urpmq
@@ -288,7 +288,7 @@ if ($urpm::args::options{list_aliases}) {
#- If more than one thing provides this requirement
#- then don't bother finding stuff
#- that needs it as it will be invalid
- my @l = grep { $_ ne $pkg->name } map { $urpm->{depslist}[$_]->name } keys %{$urpm->{provides}{$n}};
+ my @l = grep { $_ ne $pkg->name } map { $_->name } $urpm->packages_providing($n);
$urpm->{log}(sprintf "skipping package(s) requiring %s via %s, since %s is also provided by %s", $pkg->name, $n, $n, join(' ', @l));
next;
}
@@ -413,8 +413,6 @@ if ($urpm::args::options{list_aliases}) {
if ($urpm::args::options{list_files}) {
if ($pkg->files) {
print join("\n", $pkg->files) . "\n";
- } else {
- print STDERR N("No filelist found\n");
}
}
if ($urpm::args::options{changelog}) {