aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuillaume Cottenceau <gc@mandriva.com>2002-08-30 18:15:36 +0000
committerGuillaume Cottenceau <gc@mandriva.com>2002-08-30 18:15:36 +0000
commit825a6a0d7b41e624c01d0236ec73d31296c352c6 (patch)
tree9932bf3bb6ca7b5d10ca80aca7e4d122a402d5bd
parent0e08c3052db01f30ac90f56c6d57a8ec3b01e29b (diff)
downloadrpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar
rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar.gz
rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar.bz2
rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.tar.xz
rpmdrake-825a6a0d7b41e624c01d0236ec73d31296c352c6.zip
handle /etc/urpmi/proxy.cfg proxies, have a proxy dialog config in
edit-urpm-sources
-rwxr-xr-xedit-urpm-sources.pl37
-rw-r--r--grpmi/curl_download/curl_download.pm27
-rw-r--r--grpmi/curl_download/curl_download.xs11
-rwxr-xr-xgrpmi/grpmi.pl5
-rw-r--r--po/af.po277
-rw-r--r--po/ar.po275
-rw-r--r--po/az.po283
-rw-r--r--po/bg.po283
-rw-r--r--po/br.po275
-rw-r--r--po/bs.po283
-rw-r--r--po/ca.po283
-rw-r--r--po/cs.po271
-rw-r--r--po/cy.po271
-rw-r--r--po/cy.pom2
-rw-r--r--po/da.po271
-rw-r--r--po/de.po283
-rw-r--r--po/de.pom259
-rw-r--r--po/el.po275
-rw-r--r--po/eo.po283
-rw-r--r--po/es.po275
-rw-r--r--po/es.pom259
-rw-r--r--po/et.po283
-rw-r--r--po/eu.po269
-rw-r--r--po/fi.po275
-rw-r--r--po/fr.po277
-rw-r--r--po/fr.pom263
-rw-r--r--po/ga.po274
-rw-r--r--po/gl.po275
-rw-r--r--po/hr.po283
-rw-r--r--po/hu.po275
-rw-r--r--po/id.po283
-rw-r--r--po/is.po275
-rw-r--r--po/it.po283
-rw-r--r--po/it.pom255
-rw-r--r--po/ja.po283
-rw-r--r--po/ko.po271
-rw-r--r--po/lt.po285
-rw-r--r--po/lv.po283
-rw-r--r--po/ms.po275
-rw-r--r--po/mt.po275
-rw-r--r--po/nl.po77
-rw-r--r--po/nl.pom1
-rw-r--r--po/no.po283
-rw-r--r--po/pl.po271
-rw-r--r--po/pt.po275
-rw-r--r--po/pt_BR.po271
-rw-r--r--po/ro.po271
-rw-r--r--po/ru.po283
-rw-r--r--po/sk.po271
-rw-r--r--po/sl.po275
-rw-r--r--po/sp.po271
-rw-r--r--po/sr.po271
-rw-r--r--po/sv.po271
-rw-r--r--po/ta.po271
-rw-r--r--po/tr.po283
-rw-r--r--po/uk.po275
-rw-r--r--po/vi.po283
-rw-r--r--po/wa.po271
-rw-r--r--po/zh_CN.po275
-rw-r--r--po/zh_TW.po283
-rw-r--r--rpmdrake.pm4
-rw-r--r--rpmdrake.spec8
62 files changed, 8078 insertions, 6696 deletions
diff --git a/edit-urpm-sources.pl b/edit-urpm-sources.pl
index 2d53c58f..d72dfbc1 100755
--- a/edit-urpm-sources.pl
+++ b/edit-urpm-sources.pl
@@ -211,6 +211,40 @@ sub update_callback {
}
}
+sub proxy_callback {
+ my $w = my_gtk->new(_("Configure proxies"));
+ my ($proxy, $proxy_user) = curl_download::readproxy;
+ my ($user, $pass) = $proxy_user =~ /^([^:]+):([^:]+)$/;
+ gtkadd($w->{window},
+ gtkpack__(new Gtk::VBox(0, 5),
+ new Gtk::Label(_("If you need a proxy, enter the hostname and an optional port (syntax: <proxyhost[:port]>):")),
+ gtkpack_(new Gtk::HBox(0, 10),
+ 0, gtkset_active(my $proxybutton = new Gtk::CheckButton(_("Proxy hostname:")), to_bool($proxy)),
+ 1, gtkset_sensitive(my $proxyentry = gtkentry($proxy), to_bool($proxy))),
+ new Gtk::Label(_("You may specify a user/password for the proxy authentication:")),
+ gtkpack_(new Gtk::HBox(0, 10),
+ 0, gtkset_active(my $proxyuserbutton = new Gtk::CheckButton(_("User:")), to_bool($proxy_user)),
+ 1, gtkset_sensitive(my $proxyuserentry = gtkentry($user), to_bool($proxy_user)),
+ 0, new Gtk::Label(_("Password:")),
+ 1, gtkset_sensitive(my $proxypasswordentry = gtkentry($pass), to_bool($proxy_user))),
+ new Gtk::HSeparator,
+ gtkpack(create_hbox(),
+ gtksignal_connect(new Gtk::Button(_("Ok")), clicked => sub { $w->{retval} = 1; Gtk->main_quit }),
+ gtksignal_connect(new Gtk::Button(_("Cancel")), clicked => sub { $w->{retval} = 0; Gtk->main_quit }))));
+ $proxybutton->signal_connect(clicked => sub { $proxyentry->set_sensitive($_[0]->get_active);
+ $_[0]->get_active and return;
+ $proxyuserbutton->set_active(0);
+ $proxyuserentry->set_sensitive(0);
+ $proxypasswordentry->set_sensitive(0); });
+ $proxyuserbutton->signal_connect(clicked => sub { $proxyuserentry->set_sensitive($_[0]->get_active);
+ $proxypasswordentry->set_sensitive($_[0]->get_active) });
+ $w->{rwindow}->set_position('center');
+ if ($w->main) {
+ curl_download::writeproxy($proxybutton->get_active ? $proxyentry->get_text : '',
+ $proxyuserbutton->get_active ? ($proxyuserentry->get_text.':'.$proxypasswordentry->get_text) : '');
+ }
+}
+
sub mainwindow {
my %pixmaps = (selected => [ gtkcreate_png('selected') ], unselected => [ gtkcreate_png('unselected') ]);
my $mainw = my_gtk->new(_("Configure sources"));
@@ -248,7 +282,8 @@ sub mainwindow {
clicked => sub { edit_callback and $reread_media->() }), 0),
gtksignal_connect(new Gtk::Button(but(_("Add..."))),
clicked => sub { add_callback and $reread_media->(); }),
- gtksignal_connect(new Gtk::Button(but(_("Update..."))), clicked => \&update_callback))),
+ gtksignal_connect(new Gtk::Button(but(_("Update..."))), clicked => \&update_callback),
+ gtksignal_connect(new Gtk::Button(but(_("Proxy..."))), clicked => \&proxy_callback))),
0, new Gtk::HSeparator,
0, gtkpack(create_hbox(),
gtksignal_connect(new Gtk::Button(_("Save and quit")), clicked => sub { $mainw->{retval} = 1; Gtk->main_quit }),
diff --git a/grpmi/curl_download/curl_download.pm b/grpmi/curl_download/curl_download.pm
index 329a05c2..7c6ec472 100644
--- a/grpmi/curl_download/curl_download.pm
+++ b/grpmi/curl_download/curl_download.pm
@@ -1,14 +1,39 @@
package curl_download;
use strict;
-use vars qw($VERSION @ISA);
+use vars qw($VERSION @ISA @EXPORT);
+use MDK::Common;
require DynaLoader;
@ISA = qw(DynaLoader);
+@EXPORT = qw(download readproxy writeproxy);
$VERSION = '1.0';
bootstrap curl_download $VERSION;
+sub readproxy {
+ my ($proxy, $proxy_user);
+ foreach (cat_('/etc/urpmi/proxy.cfg')) {
+ /^http_proxy\s*=\s*(.*)$/ and $proxy = $1;
+ /^ftp_proxy\s*=\s*(.*)$/ and $proxy = $1;
+ /^proxy_user\s*=\s*(.*)$/ and $proxy_user = $1;
+ }
+ ($proxy, $proxy_user);
+}
+
+sub writeproxy {
+ my ($proxy, $proxy_user) = @_;
+ output("/etc/urpmi/proxy.cfg",
+ if_($proxy, "http_proxy=$proxy\n"),
+ if_($proxy_user, "proxy_user=$proxy_user\n"));
+}
+
+sub download {
+ my ($url, $location, $downloadprogress_callback) = @_;
+
+ download_real($url, $location, $downloadprogress_callback, readproxy());
+}
+
1;
diff --git a/grpmi/curl_download/curl_download.xs b/grpmi/curl_download/curl_download.xs
index ab200d6f..2297555d 100644
--- a/grpmi/curl_download/curl_download.xs
+++ b/grpmi/curl_download/curl_download.xs
@@ -71,7 +71,7 @@ int my_progress_func(void *ptr, double td, double dd, double tu, double du)
return 0;
}
-char * download_url_real(char * url, char * location, char * proxy)
+char * download_url_real(char * url, char * location, char * proxy, char * proxy_user)
{
CURL *curl;
CURLcode rescurl = CURL_LAST;
@@ -108,6 +108,8 @@ char * download_url_real(char * url, char * location, char * proxy)
if (proxy && strcmp(proxy, ""))
curl_easy_setopt(curl, CURLOPT_PROXY, proxy);
+ if (proxy_user && strcmp(proxy_user, ""))
+ curl_easy_setopt(curl, CURLOPT_PROXYUSERPWD, proxy_user);
rescurl = curl_easy_perform(curl);
@@ -269,14 +271,15 @@ MODULE = curl_download PACKAGE = curl_download
PROTOTYPES : DISABLE
char *
-download(url, location, proxy, downloadprogress_callback)
+download_real(url, location, downloadprogress_callback, proxy, proxy_user)
char * url
char * location
- char * proxy
SV * downloadprogress_callback
+ char * proxy
+ char * proxy_user
CODE:
downloadprogress_callback_sv = downloadprogress_callback;
- RETVAL = download_url_real(url, location, proxy);
+ RETVAL = download_url_real(url, location, proxy, proxy_user);
OUTPUT:
RETVAL
diff --git a/grpmi/grpmi.pl b/grpmi/grpmi.pl
index ea9c165b..b76f23a3 100755
--- a/grpmi/grpmi.pl
+++ b/grpmi/grpmi.pl
@@ -81,8 +81,6 @@ my $exitstatus = -1;
# -=-=-=---=-=-=---=-=-=-- download potential URL's, and verify signatures -=-=-=---=-=-=--
-my $proxy;
-/http_proxy = (http:[^:]+:\d+)/ and $proxy = $1 foreach cat_("$ENV{HOME}/.wgetrc");
my $cache_location = '/var/cache/urpmi/rpms';
my $url_regexp = '^http://|^https://|^ftp://';
my $nb_downloads = int(grep { m,$url_regexp, } @ARGV);
@@ -93,8 +91,7 @@ for (my $i=0; $i<@ARGV; $i++) {
$download_progress++;
$label->set(_("Downloading package `%s' (%s/%s)...", basename($ARGV[$i]), $download_progress, $nb_downloads));
select(undef, undef, undef, 0.1); $mainw->flush; #- hackish :-(
- my $res = curl_download::download($ARGV[$i], $cache_location, $proxy,
- sub { $_[0] and $progressbar->update($_[1]/$_[0]); $mainw->flush });
+ my $res = curl_download::download($ARGV[$i], $cache_location, sub { $_[0] and $progressbar->update($_[1]/$_[0]); $mainw->flush });
my $url = $ARGV[$i];
$ARGV[$i] = "$cache_location/" . basename($ARGV[$i]);
if ($res) {
diff --git a/po/af.po b/po/af.po
index 24ceee2c..9538b4e5 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: Wed Sep 27 2000 10:18:51+0200\n"
"Last-Translator: Schalk W. Cronjé <schalkc@ntaba.co.za>\n"
"Language-Team: Afrikaans <lia@af.org.za>\n"
@@ -61,7 +61,7 @@ msgstr ""
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
#, fuzzy
msgid "Security updates"
msgstr "Vertoon slegs sekuriteitsopgraderings"
@@ -78,7 +78,7 @@ msgstr ""
msgid "Login:"
msgstr "Inteken:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Wagwoord:"
@@ -111,14 +111,16 @@ msgid "Type of source:"
msgstr "Tipes media:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Kanselleer"
@@ -185,49 +187,79 @@ msgstr ""
"Wag asb.\n"
"Media word sorteer"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr ""
+"Dateer\n"
+"media op"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr ""
"Dateer\n"
"media op"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Bron"
#
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Verwyder media"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
#, fuzzy
msgid "Update..."
msgstr "Opgradeer"
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Fout..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Verlaat"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -235,7 +267,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -368,11 +400,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -380,15 +412,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -398,12 +430,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "spieël"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -412,7 +444,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -423,104 +455,104 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Soek"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Soek"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr ""
"Wag asb.\n"
"Pakkette word verwyder"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
#
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr ""
"Installeer\n"
"geselekteer"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
#
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Deselekteer\n"
"almal"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Kies geen"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "One of the following packages is needed:"
msgstr ""
"Om alle afhanklikhede te bevredig moet hierdie\n"
"pakkette verwyder word:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Onbekend"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr ""
"Wag asb.\n"
"Pakkette word verwyder"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr ""
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "Dateer media op"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -530,53 +562,53 @@ msgstr ""
"Om alle afhanklikhede te bevredig moet hierdie\n"
"pakkette verwyder word:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr ""
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "%d geselekteerde pakkette: %.1f MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, fuzzy, c-format
msgid "Selected size: %d MB"
msgstr "%d geselekteerde pakkette: %.1f MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -586,12 +618,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Bron"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -604,7 +636,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -616,73 +648,73 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr ""
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr ""
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
#
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "Verwydering"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Beskrywings"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
#
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Plaaslik"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normale opdaterings"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -692,36 +724,36 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr ""
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Soek"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
#, fuzzy
msgid "Install"
msgstr "Installering:"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr ""
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -729,23 +761,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -754,15 +786,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -775,51 +807,55 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr ""
"Wag asb.\n"
"Pakkette word verwyder"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Besig met installasie "
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
#
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Verwyder media"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -828,86 +864,82 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr ""
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Besig met installasie "
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Wag asb.\n"
"Pakkette word verwyder"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
#, fuzzy
msgid "Please wait, reading packages database..."
msgstr ""
"Wag asb.\n"
"Pakkette word verwyder"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr ""
"Wag asb.\n"
"Pakkette word verwyder"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -915,7 +947,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -923,7 +955,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1008,9 +1040,6 @@ msgstr "Installering:"
#~ msgid "Error while checking dependencies :("
#~ msgstr "Fout met afhanklikhede verifikasie :("
-#~ msgid "Error..."
-#~ msgstr "Fout..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Daar was probleme tydens installasie"
diff --git a/po/ar.po b/po/ar.po
index 4b35e89d..64b1f705 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-11-28 17:26GMT+3\n"
"Last-Translator: Mohammed Gamal <f2c2001@yahoo.com>\n"
"Language-Team: Arabic\n"
@@ -56,7 +56,7 @@ msgstr "المسار أو نقطة التحميل:"
msgid "Removable device"
msgstr "الأجهزة القابلة للإزالة"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "تحديثات أمنية"
@@ -72,7 +72,7 @@ msgstr "اختار المرآة..."
msgid "Login:"
msgstr "اسم الدخول:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "كلمة المرور:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "نوع المصدر:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "مواÙÙ‚"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "الغاء"
@@ -160,43 +162,71 @@ msgstr "حدّث"
msgid "Please wait, updating media..."
msgstr "انتظر من Ùضلك, جاري تحديث الوسائط..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "تهيئة المصادر"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "تهيئة المصادر"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "متاح؟"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "المصدر"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "احذÙ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "حرّر"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "أضÙ..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "حدّث..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "خطأ..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "احÙظ Ùˆ اخرج"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "خروج"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +237,7 @@ msgstr ""
"\n"
"هل من الممكن المتابعة؟"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -338,11 +368,11 @@ msgid "China"
msgstr "الصين"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "الولايات المتحدة"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -354,15 +384,15 @@ msgstr ""
"\n"
"هل من الممكن المتابعة؟"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "انتظر من Ùضلك, جاري تنزيل عناوين المرايا من موقع MandrakeSoft"
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "خطأ أثناء التنزيل"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -377,11 +407,11 @@ msgstr ""
"الشبكة, أو موقع MandrakeSoft قد يكون غير موجود.\n"
"Ùضلا حاول مرة أخرى ÙÙŠ وقت لاحق."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "لا مرايا"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -395,7 +425,7 @@ msgstr ""
":أن يكون نوع المعالج الخاص بك غير مدعوم\n"
"من تحديثات Mandrake Linux الرسمية."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Ùضلاً اختر المرآة المطلوبة."
@@ -403,71 +433,71 @@ msgstr "Ùضلاً اختر المرآة المطلوبة."
msgid "Other"
msgstr "أخرى"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(غير موجود)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "نتائج البحث"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "نتائج البحث (لا شئ)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "انتظر من Ùضلك, جاري البحث..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Ù‚Ù"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "قابلة للإضاÙØ©"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "قابلة للترقية"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "معلومات أكثر حول الحزمة..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "أحد هذه الحزم مطلوب:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Ùضلاً اختر"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "حزمة غير معروÙØ©"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "انتظر من Ùضلك, جاري سرد الحزم..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(لا شئ)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "لا تحديث"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -477,11 +507,11 @@ msgstr ""
"لا توجد تحديثات للحزم الموجودة على جهازك,\n"
"أو أنك قمت بتثبيت كل التحديثات مسبقا."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "هذه الحزم الاضاÙية يجب أن تحذÙ"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -491,11 +521,11 @@ msgstr ""
"تحذÙ:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "بعض الحزم لا يمكن حذÙها"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -505,11 +535,11 @@ msgstr ""
"الرجوع عن اختيارها الآن:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "هناك حزم اضاÙية مطلوبة"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -519,11 +549,11 @@ msgstr ""
"التالية:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "لا يمكن تثبيت بعض الحزم"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -531,21 +561,21 @@ msgstr ""
"عÙواً, لا يمكن اختيار الحزمة/الحزم التالية:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "بعض الحزم يجب ازالتها"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "تم اختيار: %d ميغابايت / المساحة المتوÙرة ÙÙŠ القرص: %d ميغابايت"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "الحجم المختار: %d ميغابايت"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -555,12 +585,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "المصدر"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -581,7 +611,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -600,68 +630,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "تحديثات ازالة العيوب"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "تحديثات عادية"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "اختيارات Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "كل الحزم, أبجدياً"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "كل الحزم,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "بالمجموعة"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "بالحجم"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "بحالة الإختيار"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "بمخزن المصدر"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "بتواجد التحديث"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "ÙÙŠ الوصÙ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "ÙÙŠ الأسماء"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "ÙÙŠ الملÙات"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "تحديثات عادية"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -676,35 +706,35 @@ msgstr ""
"\n"
"هل من الممكن المتابعة؟"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "ابحث عن:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "ابحث"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "تثبيت"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "تحديث Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "حذ٠حزم البرامج"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "تثبيت حزم البرامج"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -716,23 +746,23 @@ msgstr ""
"\n"
"هل من الممكن المتابعة؟"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "انتظر من Ùضلك, جاري الإتصال بالمرآة لتحديث معلومات الحزم"
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "خطأ ÙÙŠ تحديث الوسيط"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "كان هناك خطأ غير قابل للإصلاح أثناء تحديث معلومات الحزم"
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "كيÙية اختيار المرآة يدوياً"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -746,15 +776,15 @@ msgstr ""
"\n"
"ثم أعد تشغيل أداة تحديث Mandrake."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "انتظر من Ùضلك, جاري الإتصال بالمرآة لبدء تحديث الحزم."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "خطأ أثناء اضاÙØ© وسيط التحديث"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -775,48 +805,52 @@ msgstr ""
"\n"
"هل تريد المحاولة مع مرآة أخرى؟"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "اتنظر من Ùضلك, جاري ايجاد الحزم المتوÙرة..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "تم تثبيت كل الحزم المطلوبة بنجاح."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "تم تثبيت كل شئ بنجاح"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Ùشل التثبيت"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "احذÙ"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -825,44 +859,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "لا يمكن تثبيت بعض الحزم"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "تم تثبيت كل شئ بنجاح"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "تعذر الحصول على الحزم المصدرية"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "تعذر ايجاد الحزم المصدرية, عÙواً"
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "غير الوسيط"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ùضلاً أدخل الوسيط المسمى \"%s\" الى الجهاز [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Ùشل التثبيت"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -870,35 +900,35 @@ msgstr ""
"Ùشل التثبيت, بعض الملÙات Ù…Ùقودة.\n"
"ربما تحتاج الى تحديث Ùاعدة بيانات المصادر."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "انتظر من Ùضلك, جاري ازالة الحزم للسماح بترقية الحزم الأخرى..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "البرنامج Ù…Ùقود"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "هناك برنامج ضروري (grpmi) Ù…Ùقود. تأكد من التثبيت."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "كل شئ مثبت مسبقاً."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "كل شئ مثبت مسبقا (أليس المÙروض أن يحدث هذا؟)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "انتظر من Ùضلك, جاري قراءة قاعدة بيانات الحزم..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "انتظر من Ùضلك, جاري ازالة الحزم..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -910,7 +940,7 @@ msgstr ""
"هذه الأداة ستسمح لك باختيار البرامج التي تريد ازالتها\n"
"من جهازك."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -922,7 +952,7 @@ msgstr ""
"هذه الأداة ستساعدك ÙÙŠ اختيار التحديثات التي تريد تثبيتها على\n"
"جهازك."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1169,9 +1199,6 @@ msgstr "ثبـت البرنامج"
#~ msgid "Force"
#~ msgstr "اجبار"
-#~ msgid "Error..."
-#~ msgstr "خطأ..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "ظهرت مشاكل أثناء التثبيت"
diff --git a/po/az.po b/po/az.po
index 35fa07a7..29b07a0f 100644
--- a/po/az.po
+++ b/po/az.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-11-14 17:09GMT+0200\n"
"Last-Translator: Vasif İsmayıloğlu MD <azerb_linux@hotmail.com>\n"
"Language-Team: Azerbaijani Turkic <linuxaz@azerimail.net>\n"
@@ -60,7 +60,7 @@ msgstr "bağlama nöqtəsi:"
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Təhlükəsizlik güncəlləmələri"
@@ -78,7 +78,7 @@ msgstr "Æksi seçin:"
msgid "Login:"
msgstr "giriÅŸ:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Parol:"
@@ -114,14 +114,16 @@ msgid "Type of source:"
msgstr "Mənbə növü:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Oldu"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Ləğv et"
@@ -180,45 +182,75 @@ msgstr "Güncəllə"
msgid "Please wait, updating media..."
msgstr "Asılılıqlar yoxlanılır..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Mənbəni quraq?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Vəkil verici istifadəçi adı:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "İstifadəçi adı:"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Mənbəni quraq?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Qaynaq"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Çıxardıla Bilən"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Düzəlt"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Xəta..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Çıx"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -226,7 +258,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -357,11 +389,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -369,15 +401,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -387,12 +419,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Xətasz"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +433,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -412,95 +444,95 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Axtarış Nəticələri"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Axtarış Nəticələri"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Hamısını\n"
" burax"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Hamısını Seç"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Namə'lum səhifə"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(heç biri)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "normal güncəlləmələr"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr ""
"İşlərin düzgün getməyi üçün burdakı əlavə proqram tə'minatlarına ehtiyac "
"vardır:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -510,54 +542,54 @@ msgstr ""
"Bütün asılılıqlara cavab vermək üçün\n"
"bu paketlər silinəcəklər:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Paketlər onsuz da quruludur"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -567,12 +599,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Qaynaq"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -585,7 +617,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -597,75 +629,75 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Təhlükəsizlik güncəlləmələri"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "normal güncəlləmələr"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeUpdate"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "o paket, o bayt"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Dərinliklər"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Ä°zahatlar"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Yerli"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "normal güncəlləmələr"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -675,41 +707,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Axtar:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
#, fuzzy
msgid "Search"
msgstr "axtar"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Qurulur"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Güncəlləmə"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Proqram Tə'minatı İdarəçisi "
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Paketlərin qurulumu"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -717,23 +749,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -742,15 +774,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -763,48 +795,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "mövcud paketlərin siyahısını yenidən yüklə"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Qurula Bilən"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Çıxardıla Bilən"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -813,83 +849,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Paketlər onsuz da quruludur"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Paket onsuz da quruludur"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Çox pis, oxuna bilməyən və ya tapılmayan paketlər"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Qurula Bilən"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Xahiş edirik, güncəlləmək istədiyiniz paketi seçin"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Paket onsuz da quruludur"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Xahiş edirik rpm paketləri çıxardana qədər gözləyin"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -897,7 +929,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -905,7 +937,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1129,9 +1161,6 @@ msgstr "Hamısını qur"
#~ msgid "Force"
#~ msgstr "Məcbur Et"
-#~ msgid "Error..."
-#~ msgstr "Xəta..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Qurma əsnasında problemlər oldu"
@@ -1431,9 +1460,6 @@ msgstr "Hamısını qur"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp Vəkil Verici:"
-#~ msgid "Proxy username:"
-#~ msgstr "Vəkil verici istifadəçi adı:"
-
#~ msgid "Proxy password:"
#~ msgstr "Vəkil verici Parolu:"
@@ -1473,9 +1499,6 @@ msgstr "Hamısını qur"
#~ msgid "Choose Packages"
#~ msgstr "Paketləri Seçin"
-#~ msgid "Username:"
-#~ msgstr "İstifadəçi adı:"
-
#~ msgid "Security"
#~ msgstr "Təhlükəsizlik"
diff --git a/po/bg.po b/po/bg.po
index d5d5d6f5..c897aa12 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-01-31 03:36+0200\n"
"Last-Translator: Boyan Ivanov <boyan17@mail.bg>\n"
"Language-Team: Bulgarian\n"
@@ -56,7 +56,7 @@ msgstr "íàìèðà ñå â:"
msgid "Removable device"
msgstr "Ïðåìåñòâàåìî óñòðîéñòâî"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Îáíîâÿâàíèÿ çà ñèãóðíîñò"
@@ -72,7 +72,7 @@ msgstr "Èçáåðåòå ñúðâúð:"
msgid "Login:"
msgstr "Ïîòðåáèòåëñêî èìå:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Ïàðîëà:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr "Òèï íà èçòî÷íèêà:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Äîáðå"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Îòêàç"
@@ -171,45 +173,75 @@ msgstr ""
"Ìîëÿ Èç÷àêàéòå\n"
"Îáíîâÿâà ñå èçòî÷íèê"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Êîíôèãóðèðàíå íà èçòî÷íèê?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Ïîòðåáèòåë çà ïðîêñè:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Ïîòðåáèòåë:"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Êîíôèãóðèðàíå íà èçòî÷íèê?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Ñîðñ"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Ïðåíîñèì"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Ïðîìÿíà"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Äîáàâè"
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Îáíîâè"
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Ãðåøêà..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Çàïèøè è èçëåç"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Èçõîä"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -217,7 +249,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +375,11 @@ msgid "China"
msgstr "Êèòàé"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "ÑÀÙ"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +387,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Ãðåøêà ïî âðåìå íà ñâàëÿíå"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -373,12 +405,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Áåç ãðeøêà"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -387,7 +419,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -398,89 +430,89 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Ðåçóëòàò îò òúðñåíå"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Ðåçóëòàò îò òúðñåíåòî (íÿìà)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Ìîëÿ èç÷àêàéòå, ïðåìàõâàò ñå ïàêåòèòå"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Äîñòúïíè"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Çà îáíîâÿâàíå"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Äåñåëåêòèðàé\n"
"âñè÷êè"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Èçáåðè âñè÷êè"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Åäèí îò ñëåäíèòå ïàêåòè å íåîáõîäèì:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Ìîëÿ èçáåðåòå"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "íåðàçïîçíàò ïàêåò"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Ìîëÿ èç÷àêàéòå, ïðàâè ñå ñïèñúê íà ïàêåòèòå"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(íÿìà)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "íÿìà îáíîâÿâàíèÿ"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr ""
"Íåîáõîäèìî å äà ñå èíñòàëèðàò è òåçè ïàêåòè çà äà ðàáîòè âñèêî íîðìàëíî:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -490,53 +522,53 @@ msgstr ""
"Çà äà ñå óäîâîëåòâîðÿò çàâèñèìîñòèòå,\n"
"ñëåäíèòå ïàêåòè ùå áúäàò ïðåìàõíàòè:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Íÿêîè ïàêåòè íå ìîãàò äà áúäàò ïðåìàõíàòè"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Òðÿáâàò ìè äîïúëíèòåëíè ïàêåòè"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Íÿêîè ïàêåòè íå ìîãàò äà áúäàò èíñòàëèðàíè"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Íÿêîè ïàêåòè òðÿáâà äà áúäàò ïðåìàõíàòè"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "%d èçáðàíè ïàêåòè: %.1f MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, fuzzy, c-format
msgid "Selected size: %d MB"
msgstr "%d èçáðàíè ïàêåòè: %.1f MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -546,12 +578,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Ñîðñ"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -564,7 +596,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -576,74 +608,74 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Îáíîâÿâàíèÿ çà ñèãóðíîñò"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "íîðìàëíè îáíîâÿâàíèÿ"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "Ìàíäðåéê Ïîäíîâÿâàíå"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Âñè÷êè ïàêåòè ïî àçáó÷åí ðåä"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 ïàêåòà, 0 áàéòà"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "ïî ãðóïà"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "ïî ãîëåìèíà"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "ïî ñúñòîÿíèå"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Îïèñàíèÿ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Ëîêàëåí"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "íîðìàëíè îáíîâÿâàíèÿ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -653,41 +685,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Íàìåðè:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Òúðñåíå"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Èíñòàëàöèÿ"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
#, fuzzy
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Ìàíäðåéê\n"
"Ïîäíîâÿâàíå"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Ñîôòóåðåí Ìåíàæåð "
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Èíñòàëèðàíå íà ïàêåòè"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -695,23 +727,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -720,15 +752,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -741,49 +773,53 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "Ìîëÿ èç÷àêàéòå, ïðåìàõâàò ñå ïàêåòèòå"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Èíñòàëèðàé "
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Ïðåíîñèì"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -792,84 +828,80 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Íÿêîè ïàêåòè íå ìîãàò äà áúäàò èíñòàëèðàíè"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Âå÷å èíñòàëèðàí ïàêåò"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Ëîøè, íå÷åòèìè èëè íåíàìåðåíè ïàêåòè"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Èíñòàëèðàé "
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Ìîëÿ èç÷àêàéòå, ïðåìàõâàò ñå ïàêåòèòå"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Âå÷å èíñòàëèðàí ïàêåò"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
#, fuzzy
msgid "Please wait, reading packages database..."
msgstr "Ìîëÿ èç÷àêàéòå, ïðåìàõâàò ñå ïàêåòèòå"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Ìîëÿ èç÷àêàéòå, ïðåìàõâàò ñå ïàêåòèòå"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -877,7 +909,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -885,7 +917,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1112,9 +1144,6 @@ msgstr "Èíñòàëèðàé âñè÷êî"
#~ msgid "Force"
#~ msgstr "Èãíîðèðàé"
-#~ msgid "Error..."
-#~ msgstr "Ãðåøêà..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Ïîÿâèõà ñå ïðîáëåìè ïî âðåìå íà èíñòàëàöèÿòà"
@@ -1398,9 +1427,6 @@ msgstr "Èíñòàëèðàé âñè÷êî"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp Ïðîêñè:"
-#~ msgid "Proxy username:"
-#~ msgstr "Ïîòðåáèòåë çà ïðîêñè:"
-
#~ msgid "Proxy password:"
#~ msgstr "Ïàðîëà çà ïðîêñè:"
@@ -1440,9 +1466,6 @@ msgstr "Èíñòàëèðàé âñè÷êî"
#~ msgid "Choose Packages"
#~ msgstr "Èçáåðåòå Ïàêåòè"
-#~ msgid "Username:"
-#~ msgstr "Ïîòðåáèòåë:"
-
#~ msgid "Security"
#~ msgstr "Ñèãóðíîñò"
diff --git a/po/br.po b/po/br.po
index 32c90cdf..95eaf2ad 100644
--- a/po/br.po
+++ b/po/br.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2000-02-11 14:01+0100\n"
"Last-Translator: Jañ-Mai Drapier <jan-mai.drapier@mail.dotcom.fr>\n"
"Language-Team: Brezhoneg <ofisk.bzh@wanadoo.fr>\n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr ""
@@ -73,7 +73,7 @@ msgstr ""
msgid "Login:"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr ""
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr ""
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Mat eo"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Nullañ"
@@ -167,46 +169,74 @@ msgstr ""
msgid "Please wait, updating media..."
msgstr "Gortozit mar plij"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Ouzhpennañ un arveriad"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Ouzhpennañ un arveriad"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
#, fuzzy
msgid "Source"
msgstr "Etre"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Dilemel"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Fazi..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Kuitaat"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -214,7 +244,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +373,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +385,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -373,11 +403,11 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr ""
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -386,7 +416,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr ""
@@ -394,144 +424,144 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Klask"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Klask"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Gortozit mar plij"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Staliañ ar reizhiad"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Andiuz\n"
"an holl"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Diuz an holl"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Gortozit mar plij"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr ""
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr ""
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr ""
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr ""
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr ""
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -541,12 +571,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Etre"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -559,7 +589,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -571,71 +601,71 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr ""
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr ""
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "Distaliañ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Deskrivadurioù"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Skridennad"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Bremanaat Linux-Mandrake"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -645,35 +675,35 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr ""
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Klask"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Staliañ"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr ""
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -681,23 +711,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -706,15 +736,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -727,47 +757,51 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "O staliañ"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Dilemel"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -776,78 +810,74 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr ""
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "O staliañ"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Gortozit mar plij"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -855,7 +885,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -863,7 +893,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -938,9 +968,6 @@ msgstr "Staliañ an holl"
#~ msgid "Package can't be installed"
#~ msgstr "Ne m'eus ket gallet staliañ pakad"
-#~ msgid "Error..."
-#~ msgstr "Fazi..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Kudennoù ho staliadur"
diff --git a/po/bs.po b/po/bs.po
index 4753c8e7..5f9038b1 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -4,7 +4,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-22 17:57+0200\n"
"Last-Translator: Vedran Ljubovic <vljubovic@smartnet.ba>\n"
"Language-Team: Bosnian <lokal@lugbih.org>\n"
@@ -54,7 +54,7 @@ msgstr "Put ili taÄka montiranja:"
msgid "Removable device"
msgstr "Izmjenjivi uređaj"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Sigurnosna unaprjeđenja"
@@ -70,7 +70,7 @@ msgstr "Izaberite neki mirror..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Å ifra:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "Tip izvora:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "U redu"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Odustani"
@@ -160,43 +162,73 @@ msgstr "Update"
msgid "Please wait, updating media..."
msgstr "Molim saÄekajte, unaprjeÄ‘ujem medije..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfiguriši izvor"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Proxy korisniÄko ime:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "KorisniÄko ime:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Konfiguriši izvor"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "UkljuÄeno?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Izvor"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Briši"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Izmjeni"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Dodaj..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Unaprijedi..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Greška..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Snimi i izađi"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Izlaz"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +239,7 @@ msgstr ""
"\n"
"Želite li da nastavim?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -339,11 +371,11 @@ msgid "China"
msgstr "Kina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "SAD"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +387,15 @@ msgstr ""
"\n"
"Mogu li nastaviti?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Molim saÄekajte, skidam adrese mirrora sa MandrakeSoft web stranice."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Greška prilikom downloada"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -378,11 +410,11 @@ msgstr ""
"Mreža ili MandrakeSoft web stranica su možda nedostupni.\n"
"Molim probajte ponovo kasnije."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nema mirrora"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -396,7 +428,7 @@ msgstr ""
"arhitektura vašeg procesora nije podržana od strane Mandrake Linux\n"
"oficijelnih update-a."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Molimo izaberite željeni mirror"
@@ -404,76 +436,76 @@ msgstr "Molimo izaberite željeni mirror"
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Nijedan nije dostupan)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Rezultati pretrage"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Rezultati pretrage (ništa)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Molim saÄekajte, pretražujem datoteke..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Može se dodati"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Može se unaprijediti"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"IskljuÄi\n"
"sve"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Izaberi sve"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Potreban je jedan od sljedećih paketa:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Molim izaberite"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "nepoznat paket"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Molim saÄekajte, listam pakete..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ništa)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Nema update-a"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -483,11 +515,11 @@ msgstr ""
"za pakete koji su instalirani na vaÅ¡em raÄunaru, ili da ste ih\n"
"već posjedujete."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Potrebno je obrisati neke dodatne pakete"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -497,11 +529,11 @@ msgstr ""
"ukloniti:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Neke pakete se ne može ukloniti"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -511,11 +543,11 @@ msgstr ""
"odznaÄiti:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Potrebni su dodatni paketi"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -525,11 +557,11 @@ msgstr ""
"instalirati:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Neki paketi se ne mogu instalirati"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -537,21 +569,21 @@ msgstr ""
"Žalim, sljedeće pakete ne možete izabrati:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Neke pakete treba obrisati"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Izabrano: %d MB / Slobodno: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "VeliÄina izabranog: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -561,12 +593,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Izvor"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -587,7 +619,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -606,70 +638,70 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Ispravke bugova"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normalni update-i"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake izbori"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Svi paketi, abecedno"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Svi paketi,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "po grupi"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "po veliÄini"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "po stanju izabranosti"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "po izvornom spremištu"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "po dostupnosti update-a"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Opisi"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Lokalne datoteke"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normalni update-i"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -684,35 +716,35 @@ msgstr ""
"\n"
"Mogu li nastaviti?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Pronađi:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Pretraga"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instaliraj"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Uklanjanje softverskih paketa"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalacija softverskih paketa"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -724,25 +756,25 @@ msgstr ""
"\n"
"Mogu li nastaviti?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Molim saÄekajte, kontaktiram mirror za update informacija o paketima."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Greška u osvježavanju medija"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Došlo je do nepopravljive greške prilikom update-ovanja informacija o "
"paketima."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -751,15 +783,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Molim saÄekajte, kontaktiram mirror za inicijalizaciju update paketa."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Greška u dodavanju update medija"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -780,48 +812,52 @@ msgstr ""
"\n"
"Želite li probati neki drugi mirror?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Molim saÄekajte, tražim dostupne pakete..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalacija nije uspjela"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Briši"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -830,44 +866,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Neki paketi se ne mogu instalirati"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Sve je već instalirano."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ne mogu da dobavim izvorne pakete."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Ne mogu da dobavim izvorne pakete, žalim."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Promjeni medij"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Molim ubacite medij pod imenom \"%s\" u uređaj [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalacija nije uspjela"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -875,36 +907,36 @@ msgstr ""
"Instalacija nije uspjela, nedostaju neke od datoteka.\n"
"Vjerovatno trebate update-ovati vašu bazu izvora."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Molim saÄekajte, uklanjam pakete kako bi drugi mogli biti unaprijeÄ‘eni..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Sve je već instalirano."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Sve je već instalirano (da li se ovo uopšte smije desiti?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Molim saÄekajte, Äitam bazu paketa..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Molim saÄekajte, uklanjam pakete..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -916,7 +948,7 @@ msgstr ""
"Ovaj alat će vam pomoći da izaberete koji softver želite ukloniti sa vašeg\n"
"raÄunara."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -928,7 +960,7 @@ msgstr ""
"Ovaj alat će vam pomoći da izaberete update koje želite instalirati na\n"
"vaÅ¡ raÄunar."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1170,9 +1202,6 @@ msgstr "Instaliraj sve"
#~ msgid "Force"
#~ msgstr "Na silu"
-#~ msgid "Error..."
-#~ msgstr "Greška..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Došlo je do problema prilikom instalacije"
@@ -1473,9 +1502,6 @@ msgstr "Instaliraj sve"
#~ msgid "Ftp Proxy:"
#~ msgstr "FTP Proxy:"
-#~ msgid "Proxy username:"
-#~ msgstr "Proxy korisniÄko ime:"
-
#~ msgid "Proxy password:"
#~ msgstr "Proxy Å¡ifra:"
@@ -1515,9 +1541,6 @@ msgstr "Instaliraj sve"
#~ msgid "Choose Packages"
#~ msgstr "Izaberite pakete"
-#~ msgid "Username:"
-#~ msgstr "KorisniÄko ime:"
-
#~ msgid "Security"
#~ msgstr "Sigurnost"
diff --git a/po/ca.po b/po/ca.po
index a0a6e677..ea035244 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-09-20 20:49+0200\n"
"Last-Translator: Softcatalà <traddrake@softcatala.org>\n"
"Language-Team: Catalan <info@softcatala.org>\n"
@@ -62,7 +62,7 @@ msgstr "punt de muntatge:"
msgid "Removable device"
msgstr "Elimina el suport"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Actualitzacions de seguretat"
@@ -80,7 +80,7 @@ msgstr "Escolliu la rèplica:"
msgid "Login:"
msgstr "entrada:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Contrasenya:"
@@ -113,14 +113,16 @@ msgid "Type of source:"
msgstr "Tipus de font:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "D'acord"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Cancel·la"
@@ -187,45 +189,75 @@ msgstr ""
"Si us plau, espereu\n"
"S'està eliminant el suport"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Voleu configurar una font?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Nom d'usuari del servidor intermediari:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Nom d'usuari:"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Voleu configurar una font?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Font"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Extraïble"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Edita"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Error..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Surt"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -233,7 +265,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -365,11 +397,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -377,15 +409,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -395,12 +427,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Cap error"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -409,7 +441,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -420,97 +452,97 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Cerca resultats"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Cerca resultats"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Si us plau, espereu; s'estan eliminant els paquets"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Disponible"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Desselecciona-ho\n"
"tot"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "No en seleccionis cap"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Si us plau, confirmeu-ho"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Pàgina desconeguda"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Si us plau, espereu; s'estan eliminant els paquets"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(cap)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "actualitzacions normals"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr ""
"Cal instal·lar aquests paquets addicionals per tal que tot funcioni "
"correctament:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -520,54 +552,54 @@ msgstr ""
"Per poder satisfer totes les dependències,\n"
"s'eliminaran aquests paquets:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Els paquets ja estan instal·lats"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "%d paquets seleccionats: %.1f MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, fuzzy, c-format
msgid "Selected size: %d MB"
msgstr "%d paquets seleccionats: %.1f MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -577,12 +609,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Font"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -595,7 +627,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -607,75 +639,75 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Actualitzacions de seguretat"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "actualitzacions normals"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeUpdate"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 paquets, 0 bytes"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Mida profunda"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Descripcions"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "%d fitxers"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "actualitzacions normals"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -685,41 +717,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Cerca:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Cerca"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instal·lació"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
#, fuzzy
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-iso8859-*,*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Gestor de programari "
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Instal·lació de paquets"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -727,23 +759,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -752,15 +784,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -773,49 +805,53 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "Si us plau, espereu; s'estan eliminant els paquets"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "S'està instal·lant "
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Extraïble"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-iso8859-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -824,84 +860,80 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Els paquets ja estan instal·lats"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "El paquet ja està instal·lat"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Paquets incorrectes, il·legibles o no trobats"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "S'està instal·lant "
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Si us plau, espereu; s'estan eliminant els paquets"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "El paquet ja està instal·lat"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
#, fuzzy
msgid "Please wait, reading packages database..."
msgstr "Si us plau, espereu; s'estan eliminant els paquets"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Si us plau, espereu; s'estan eliminant els paquets"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -909,7 +941,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -917,7 +949,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1141,9 +1173,6 @@ msgstr "Instal·la'ls tots"
#~ msgid "Force"
#~ msgstr "Imposa"
-#~ msgid "Error..."
-#~ msgstr "Error..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Hi ha hagut problemes durant la instal·lació"
@@ -1447,9 +1476,6 @@ msgstr "Instal·la'ls tots"
#~ msgid "Ftp Proxy:"
#~ msgstr "Proxy FTP:"
-#~ msgid "Proxy username:"
-#~ msgstr "Nom d'usuari del servidor intermediari:"
-
#~ msgid "Proxy password:"
#~ msgstr "Contrasenya del servidor intermediari:"
@@ -1489,9 +1515,6 @@ msgstr "Instal·la'ls tots"
#~ msgid "Choose Packages"
#~ msgstr "Trieu els paquets"
-#~ msgid "Username:"
-#~ msgstr "Nom d'usuari:"
-
#~ msgid "Security"
#~ msgstr "Seguretat"
diff --git a/po/cs.po b/po/cs.po
index b1c0e425..bcb94747 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-28 15:54GMT\n"
"Last-Translator: Michal Bukovjan <bukm@centrum.cz>\n"
"Language-Team: Czech <cs@li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Cesta nebo pøípojný bod:"
msgid "Removable device"
msgstr "Vyjímatelné zaøízení"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Bezpeènostní aktualizace"
@@ -73,7 +73,7 @@ msgstr "Vyberte zrcadlo..."
msgid "Login:"
msgstr "Pøihlá¹ení:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Heslo:"
@@ -106,14 +106,16 @@ msgid "Type of source:"
msgstr "Typ zdroje:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Zru¹it"
@@ -163,43 +165,70 @@ msgstr "Aktualizovat"
msgid "Please wait, updating media..."
msgstr "Prosím poèkejte, aktualizuji zdroje..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Nastavit zdroje"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Nastavit zdroje"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Povolen?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Zdroj"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Odstranit"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Upravit"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Pøidat..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Aktualizovat..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Ulo¾it a ukonèit"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Konec"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -210,7 +239,7 @@ msgstr ""
"\n"
"Mohu pokraèovat?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -341,11 +370,11 @@ msgid "China"
msgstr "Èína"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Spojené státy"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,16 +386,16 @@ msgstr ""
"\n"
"Mohu pokraèovat?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Prosím poèkejte, stahuji adresy zrcadel ze stránek spoleènosti MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Chyba pøi stahování"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -381,11 +410,11 @@ msgstr ""
"Je mo¾né, ¾e sí» nebo stránky spoleènosti MandrakeSoft nejsou k dispozici.\n"
"Zkuste to prosím pozdìji."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Není zrcadlo"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -399,7 +428,7 @@ msgstr ""
"kdy architektura va¹eho procesoru není podporovaná slu¾bou\n"
"oficiálních aktualizací distribuce Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Vyberte prosím vhodné zrcadlo."
@@ -407,71 +436,71 @@ msgstr "Vyberte prosím vhodné zrcadlo."
msgid "Other"
msgstr "Jiné"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Není k dispozici)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Výsledky hledání"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Výsledky hledání (¾ádné)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Prosím poèkejte, hledám..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Stop"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Lze pøidat"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Lze aktualizovat"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Více informací o balíèku..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Je potøeba jeden z následujících balíèkù:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Prosím vyberte"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "neznámý balíèek"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Prosím poèkejte, vypisuji balíèky..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(¾ádná)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "®ádná aktualizace"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -481,11 +510,11 @@ msgstr ""
"¾ádné aktualizace pro balíèky instalované na va¹em poèítaèi, nebo u¾\n"
"máte v¹echny aktualizace nainstalované."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Je tøeba odstranit nìkteré dal¹í balíèky"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -495,11 +524,11 @@ msgstr ""
"balíèky:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Nìkteré balíèky nelze odstranit"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -509,11 +538,11 @@ msgstr ""
"balíèkù:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Jsou potøeba dal¹í balíèky"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -523,11 +552,11 @@ msgstr ""
"balíèky:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Nìkteré balíèky nelze nainstalovat"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -535,21 +564,21 @@ msgstr ""
"Promiòte, ale následující balíèky nelze vybrat:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Nìkteré balíèky musí být odebrány"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Vybráno: %d MB / Volné místo na disku: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Velikost výbìru: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -559,12 +588,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Zdroj"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -585,7 +614,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -604,68 +633,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Opravy chyb"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Bì¾né aktualizace"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Volby Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "V¹echny balíèky, abecednì"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "V¹echny balíèky,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "podle skupiny"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "podle velikosti"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "podle stavu výbìru"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "podle umístìní zdroje"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "podle dostupnosti aktualizace"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "v popisech"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "v názvech"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "v souborech"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Bì¾né aktualizace"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -680,35 +709,35 @@ msgstr ""
"\n"
"Mohu pokraèovat?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Najít:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Hledat"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalovat"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-2,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Odstranìní balíèkù software"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalace balíèkù software"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -720,25 +749,25 @@ msgstr ""
"\n"
"Mohu pokraèovat?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Prosím poèkejte, kontaktuji zrcadlo a stahuji poslední informace o "
"aktualizacích."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Chyba pøi aktualizaci zdroje"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Pøi aktualizaci informací o balíècích do¹lo k neopravitelné chybì."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Jak ruènì vybrat va¹e zrcadlo"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -752,16 +781,16 @@ msgstr ""
"\n"
"Poté znovu spus»te aplikaci MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Prosím poèkejte, kontaktuji zrcadlo a inicializuji aktualizace balíèkù."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Chyba pøi pøidávání zdroje pro aktualizaci"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -782,46 +811,50 @@ msgstr ""
"\n"
"Chcete zkusit jiné zrcadlo?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Prosím poèkejte, hledám dostupné balíèky..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "V¹echny po¾adované balíèky byly úspì¹nì nainstalovány."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "V¹echno bylo úspì¹nì nainstalováno."
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Instalace dokonèena"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Prohlí¾ím %s"
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Odebrat .%s"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Pou¾ít .%s jako hlavní soubor"
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Nedìlat nic"
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal-*-12-*-*-*-c-*-iso8859-2"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Prozkoumat..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -834,7 +867,7 @@ msgstr ""
"Nìkteré soubory s nastavením byly vytvoøeny s pøíponou `.rpmnew' nebo\n"
"`.rpmsave'. Nìkteré z nich mù¾ete nyní prozkoumat a rozhodnout, co s nimi:"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -842,36 +875,32 @@ msgstr ""
"nìkteré balíèky se nenainstalovaly\n"
"správnì"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "v¹e bylo úspì¹nì nainstalováno"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr "Prozkoumat..."
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Nelze získat balíèky se zdroji."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Nelze získat balíèky se zdroji, promiòte."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Zmìnit zdroj"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vlo¾te prosím zdroj nazvaný \"%s\" do zaøízení [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalace selhala"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -879,35 +908,35 @@ msgstr ""
"Instalace selhala, nìkteré soubory chybí.\n"
"Mo¾ná byste mìl aktualizovat va¹i databázi zdrojù."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Prosím poèkejte, odebírám balíèky, aby mohly být jiné aktualizovány..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Chybìjící program"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Chybí nezbytný program (grpmi). Zkontrolujte va¹i instalaci."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "V¹e je ji¾ nainstalováno."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "V¹e je ji¾ nainstalováno. (Mù¾e tento stav vùbec nastat?)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Prosím poèkejte, naèítám databázi balíèkù..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Prosím poèkejte, odebírám balíèky..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -919,7 +948,7 @@ msgstr ""
"Tento nástroj vám pomù¾e vybrat, které balíèky chcete odstranit ze svého\n"
"poèítaèe."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -931,7 +960,7 @@ msgstr ""
"Tento nástroj vám pomù¾e vybrat aktualizace, které chcete instalovat na\n"
"va¹em poèítaèi."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/cy.po b/po/cy.po
index 4468e8b2..50b16e70 100644
--- a/po/cy.po
+++ b/po/cy.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-29 18:09-0000\n"
"Last-Translator: Rhoslyn Prys <rhoslyn.prys@ntlworld.com>\n"
"Language-Team: Cymraeg/Welsh <cy@li.org>\n"
@@ -54,7 +54,7 @@ msgstr "Llwybr neu bwynt gosod:"
msgid "Removable device"
msgstr "Dyfais symudol"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Diweddariadau diogelwch"
@@ -70,7 +70,7 @@ msgstr "Dewis drych..."
msgid "Login:"
msgstr "Mewngofnod:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Cyfrinair:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "Math o ffynonellau:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Iawn"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Dileu"
@@ -160,43 +162,70 @@ msgstr "Diweddaru"
msgid "Please wait, updating media..."
msgstr "Arhoswch, diweddaru cyfrwng..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Ffurfweddu'r ffynonellau"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Ffurfweddu'r ffynonellau"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Galluogwyd?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Ffynhonell"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Tynnu"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Golygu"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Ychwanegu..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Diweddau..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Cadw a gadael"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Gadael"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +236,7 @@ msgstr ""
"\n"
"Ydi hi'n iawn parhau?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -338,11 +367,11 @@ msgid "China"
msgstr "Tseina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Yr Unod Daleithiau"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -354,16 +383,16 @@ msgstr ""
"\n"
"Ydi hi'n iawn parhau?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Arhoswch, llwytho i lawr cyfeiriaidau drychau o safle gwe MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Gwall wrth lwytho i lawr"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -378,11 +407,11 @@ msgstr ""
"Efallai nad yw'r rhwydwaith neu safle gwe MandrakeSoft ar gael.\n"
"Ceisiwch eto'n hwyrach."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Dim drych"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -395,7 +424,7 @@ msgstr ""
"Gall fod nifer o resymau am hyn; yr amlycaf yw lle nad yw pensaerniaeth eich "
"prosesydd yn cael ei gynnal gan Ddiweddariad Swyddogol Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Dewiswch ddrych"
@@ -403,71 +432,71 @@ msgstr "Dewiswch ddrych"
msgid "Other"
msgstr "Arall"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Dim ar gael)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Canlyniadau'r chwilio"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Canlyniadau'r chwilio (dim)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Arhoswch, chwilio..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Atal"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Ychwanegadwy"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Diweddariadwy"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Rhagor o wybodaethar becyn..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Mae angen un o'r pecynnau canlynol:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Dewiswch"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pecyn anhysbys"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Arhoswch, rhestri pecynnau..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(dim)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Dim diweddariad"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -477,11 +506,11 @@ msgstr ""
"diweddariad ar gyfer y pecynnau ar eich cyfrifiadur, neu eich bod\n"
"wedi eu gosod."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Mae angen tynnu rhai pecynnau ychwanegol"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -491,11 +520,11 @@ msgstr ""
"hefyd: \n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Nid oes modd tynnu rhai pecynnau"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -504,11 +533,11 @@ msgstr ""
"Oherwydd eu dibyniaethau, rhaid i'r pecyn(nau) canlynol gael\n"
"eu dad-ddewis nawr:\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Pecynnau ychwanegol angenrheidiol"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -518,11 +547,11 @@ msgstr ""
"hefyd:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Nid oes modd gosod rhai pecynnau"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -530,21 +559,21 @@ msgstr ""
"Yn anffodus, nid oes modd dewis y pecyn(nau) canlynol:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Rhaid tynnu rhai pecynnau"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Dewiswyd: %d MB / Lle gwag ar ddisg: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Maint dewisiwyd: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -559,12 +588,12 @@ msgstr ""
"Cofnod Newid:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Ffynhonell: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -585,7 +614,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -604,67 +633,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Diweddariad cywiro gwallau"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Diweddariadau arferol"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Dewisiadau Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Pob pecyn, trefn yr wyddor"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Pob pecyn,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "yn ôl grwp"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "yn ôl maint"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "yn ôl cyflwr dewis"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "yn ôl ffynhonnell eu tarddiad"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "yn ôl diweddariad"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "disgrifiadau"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "enwau"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "mewn ffeiliau"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Gwybodath lawn"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Gwybodaeth arferol"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -679,35 +708,35 @@ msgstr ""
"\n"
"Ydi hi'n iawn parhau?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Canfod:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Chwilio"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Gosod"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Diweddaru Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Tynnu Pecynnau Meddalwedd"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Gosodiad Pecynnau Meddalwedd"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -719,24 +748,24 @@ msgstr ""
"\n"
"Ydi hi'n iawn i mi barhau?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Arhoswch, yn cysylltu â'r drych i ddiweddaru gwybodaeth am y pecynnau."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Gwall wrth ddiweddaru'r cyfrwng"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Digwyddodd gwall anadferadwy wrth ddiweddaru'r wybodaeth am y pecynnau."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Sut i ddewis drych gyda llaw."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -750,15 +779,15 @@ msgstr ""
"\n"
"Yna ailgychwynnwch MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Arhoswch, yn cysylltu â'r drych i gychwyn pecynnau diweddaru."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Gwall wrth ychwanegu cyfrwng diweddaru"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -780,46 +809,50 @@ msgstr ""
"\n"
"Hoffech chi drio drych arall?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Arhoswch, canfod pecynnau sydd ar gael..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Gosodwyd pob pecyn angenrheidiol yn llwyddiannus."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Gosodwyd popeth yn llwyddiannus"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Gorffennodd y gosodiad"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Archwilio %s"
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Tynnu .%s"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Defnyddio .%s fel y brif ffeil"
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Gwneud dim"
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Archwilio..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -832,7 +865,7 @@ msgstr ""
"Cafodd rhai ffeiliau ffurfweddu eu creu fel `.rpmnew' neu `.rpmsave',\n"
"mae modd eu harchwilio i weithredu arnynt:"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -840,36 +873,32 @@ msgstr ""
"methodd rhai pecynnau a chael eu gosod\n"
"yn gywir"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "gosodwyd popeth yn llwyddiannus"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr "Archwilio..."
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Methu estyn pecynnau ffynhonnell."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Methu estyn pecynnau ffynhonnell."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Newid cyfrwng"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Rhowch gyfrwng \"%s\" ar ddyfais [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Methodd y gosodiad"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -877,35 +906,35 @@ msgstr ""
"Methodd y gosodiad, mae rhai ffeiliau ar goll.\n"
"Efallai'r hoffech ddiweddaru eich cronfa ddata o ffynonellau."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Arhoswch, tynnu pecynnau i eraill gael eu diweddaru"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Rhaglen ar goll"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Mae rhaglen angenrheidiol ar goll (grpmi). Gwiriwch eich gosodiad."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Popeth wedi ei osod eisoes"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Mae popeth wedi ei osod (ydy hyn i fod i ddigwydd o gwbl?)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Arhoswch, darlen cronfa ddata'r pecynnau..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Arhoswch tynnu'r pecynnau..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -917,7 +946,7 @@ msgstr ""
"Bydd yr offeryn hwn yn eich cynorthwyo o ddewis pa feddalwedd rydych\n"
"am ei dynnu oddi ar eich cyfrifiadur."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -928,7 +957,7 @@ msgstr ""
"Bydd yr offeryn hwn yn eich cynorthwyo i ddewis diweddariadau i'w gosod\n"
"ar eich cyfrifiadur."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/cy.pom b/po/cy.pom
index ae241433..19d30690 100644
--- a/po/cy.pom
+++ b/po/cy.pom
@@ -263,7 +263,7 @@ msgstr "Clientiaid ar gyfer protocolau amrywiol yn cynnwys ssh"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
msgid "LSB"
-msgstr ""
+msgstr "LSB"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
diff --git a/po/da.po b/po/da.po
index d867bfd3..eba66919 100644
--- a/po/da.po
+++ b/po/da.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-23 00:35+0200\n"
"Last-Translator: Keld Simonsen <keld@dkuug.dk>\n"
"Language-Team: Danish <dansk@klid.dk>\n"
@@ -57,7 +57,7 @@ msgstr "sti eller monteringspunkt:"
msgid "Removable device"
msgstr "Udskiftelig enhed"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Sikkerhedsopdateringer"
@@ -73,7 +73,7 @@ msgstr "Vælg et spejl..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Adgangskode:"
@@ -106,14 +106,16 @@ msgid "Type of source:"
msgstr "Kildetype:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "O.k."
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Annullér"
@@ -163,43 +165,70 @@ msgstr "Opdatér"
msgid "Please wait, updating media..."
msgstr "Vent venligst, opdaterer medie..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfigurér kilder"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Konfigurér kilder"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Aktiveret?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Kilde"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Fjern"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Redigér"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Tilføj..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Opdatér..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "gem og afslut"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Afslut"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -210,7 +239,7 @@ msgstr ""
"\n"
"Er det O.k. at fortsætte?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -341,11 +370,11 @@ msgid "China"
msgstr "Kina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "U.S.A."
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,15 +386,15 @@ msgstr ""
"\n"
"Er det O.k. at fortsætte?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Vent venligst, henter spejladresser fra MandrakeSofts websted."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Fejl under hentning"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -380,11 +409,11 @@ msgstr ""
"Netværket eller MandrakeSofts websted kan være utilgængelige.\n"
"Forsøg igen senere."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Intet spejl"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -398,7 +427,7 @@ msgstr ""
"når arkitekturen på din processor ikke understøttes af\n"
"Mandrake Linux' officielle opdateringer."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Vælg ønsket spejl."
@@ -406,71 +435,71 @@ msgstr "Vælg ønsket spejl."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Ingen tilgængelig)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Søgeresultater"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Søgeresultater (ingen)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Vent venligst, søger..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Stop"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Kan tilføjes"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Kan opdateres"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "En af følgende pakker behøves:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Vælg"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Ukendt pakke "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Vent venligst, lister pakker..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ingen)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Ingen opdatering"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -480,11 +509,11 @@ msgstr ""
"findes nogen tilgængelige opdateringer for programmerne installeret\n"
"på maskinen eller at du allerede har installeret dem alle."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Nogle yderligere pakker skal fjernes"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -493,11 +522,11 @@ msgstr ""
"På grund af deres afhængigheder vil disse pakker også blive fjernet:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Visse pakker kan ikke fjernes"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -507,11 +536,11 @@ msgstr ""
"afmarkeres nu:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Yderligere pakker behøves"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -520,11 +549,11 @@ msgstr ""
"For at opfylde afhængigheder skal følgende pakker også installeres:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Visse pakker kan ikke installeres"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -532,21 +561,21 @@ msgstr ""
"Desværre, følgende pakker kan ikke vælges:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Visse pakker skal fjernes"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Valgt: %d MB / Fri diskplads: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Valgt størrelse: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -556,12 +585,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Kilde"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -582,7 +611,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -601,68 +630,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Fejlretningsopdateringer"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normale opdateringer"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake-valg"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Alle pakker, alfabetisk"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Alle pakker,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "efter gruppe"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "efter størrelse"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "efter valgstatus"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "efter kildelagringsplads"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "efter opdateringstilgængelighed"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "i beskrivelser"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "i navne"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "i filer"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normale opdateringer"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -677,35 +706,35 @@ msgstr ""
"\n"
"Er det O.k. at fortsætte?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Find:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Søg"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installér"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Opdatér"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Fjernelse af programmelpakker"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Installation af programmelpakker"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -717,24 +746,24 @@ msgstr ""
"\n"
"Er det O.k. at fortsætte?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Vent venligst, kontakter spejl for at opdatere pakkeinformation."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Fejl ved opdatering af medie"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"En fejl som ikke kan reddes opstod under opdatering af pakkeinformation."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Hvordan du manuelt vælger dit spejl"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -747,15 +776,15 @@ msgstr ""
"'Sikkerhedsopdateringer'.\n"
"Derefter skal MandrakeUpdate genstartes."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Vent venligst, kontakter spejl for at initiere opdateringspakker."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Fejl ved tilføjelse af opdateringsmedia"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -777,48 +806,52 @@ msgstr ""
"\n"
"Vil du forsøge med et andet spejl?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Vent venligst, finder tilgængelige pakker..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Alle ønskede pakker blev installeret uden problemer."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Alting installeret uden problemer"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Installationen mislykkedes"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Fjern"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -827,44 +860,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Visse pakker kan ikke installeres"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Alting installeret uden problemer"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Kunne ikke hente kildepakker."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Desværre, kunne ikke hente kildepakker."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Skift media"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Indsæt venligst media med navn \"%s\" i enhed [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Installationen mislykkedes"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -872,35 +901,35 @@ msgstr ""
"Installationen mislykkedes, visse filer mangler.\n"
"Du skal måske opdatere din kildedatabase."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Vent venligst, fjerner pakker for at andre skal kunne opdateres..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Program mangler"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Et nødvendigt program mangler (grpmi). Tjek din installation."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Alting er allerede installeret."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Alt er allerede installeret (bør dette ske overhovedet?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Vent venligst, læser pakkedatabase..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Vent venligst, fjerner pakker..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -912,7 +941,7 @@ msgstr ""
"Dette værktøj hjælper dig med at vælge hvilke programmer du vil fjerne fra\n"
"maskinen."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -924,7 +953,7 @@ msgstr ""
"Dette værktøj hjælper dig med at vælge opdateringarne du vil\n"
"installere på maskinen."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/de.po b/po/de.po
index ca8182cf..5b3f1c6f 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: RpmDrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-25 09:15+0200\n"
"Last-Translator: Stefan Siegel <siegel@linux-mandrake.com>\n"
"Language-Team: German <cooker-i18n@linux-mandrake.com>\n"
@@ -55,7 +55,7 @@ msgstr "Pfad oder Einhängpunkt:"
msgid "Removable device"
msgstr "Wechselmedium"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Sicherheitsaktualisierungen"
@@ -71,7 +71,7 @@ msgstr "Wählen Sie einen Mirror ..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Passwort:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr "Typ der Quelle:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Abbruch"
@@ -161,43 +163,73 @@ msgstr "Neue Version"
msgid "Please wait, updating media..."
msgstr "Quellen aktualisieren, bitte warten ..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Quellen einrichten"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Proxy Kennzeichen:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Kennzeichen:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Quellen einrichten"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Aktiviert?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Quelle"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Entfernen"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Bearbeiten"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Hinzufügen ..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Aktualisieren ..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Fehler ..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Speichern und beenden"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Beenden"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -208,7 +240,7 @@ msgstr ""
"\n"
"Wollen Sie fortfahren?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -339,11 +371,11 @@ msgid "China"
msgstr "China"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Vereinigte Staaten"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +387,15 @@ msgstr ""
"\n"
"Soll ich fortfahren?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Bitte Waten: Besorgen der Serverliste vom MandrakeSoft-Server ..."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Fehler beim Herunterladen"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -377,11 +409,11 @@ msgstr ""
"%s\n"
"Bitte versuchen Sie es später erneut."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Kein Mirror"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -395,7 +427,7 @@ msgstr ""
"ist, dass es für Ihre Prozessorarchitektur keine regulären Mandrake\n"
"Linux Aktualisierungen gibt."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
@@ -403,75 +435,75 @@ msgstr "Bitte wählen Sie Ihren bevorzugten Mirror."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Nicht vorhanden)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Suchergebnisse"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Suchergebnisse (keine)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Bitte warten, ich suche ..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Stopp"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Hinzufügbar"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Aktualisierbar"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Auswahl\n"
"zurücksetzen"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Alle auswählen"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Sie benötigen eines der folgenden Pakete:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Bitte Wählen Sie"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Unbekanntes Paket "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Auflisten der Pakete, bitte warten ..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(keine)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Keine Aktualisierungen"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -481,11 +513,11 @@ msgstr ""
"(noch) keine Aktualisierungen für Ihr System gibt oder das Sie\n"
"breits alle Aktualisierungen auf Ihren Rechner aufgespielt haben."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Einige weitere Pakete müssen ebenfalls entfernt werden."
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -495,11 +527,11 @@ msgstr ""
"werden folgende Pakete gelöscht:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Einige Pakete können nicht entfernt werden"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -508,11 +540,11 @@ msgstr ""
"Um die Abhängigkeiten zu berücksichtigen, muss die Auswahl folgender\n"
"Pakete zurüchgesetzt werden:\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Es werden zusätzliche Pakete benötigt"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -522,11 +554,11 @@ msgstr ""
"Pakete ebenfalls installiert werden:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Einige Pakete konnten nicht installiert werden"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -534,21 +566,21 @@ msgstr ""
"Die folgenden Pakete können nicht ausgewählt werden:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Einige Pakete müssen entfernt werden"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Ausgewählt: %d MB / Freier Plattenplatz: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Gewählte Größe: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -558,12 +590,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Quelle"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -584,7 +616,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -603,68 +635,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Sicherheitsaktualisierungen"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normale Aktualisierungen"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake Auswahl"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Alle Pakete, alphabetisch sortiert"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Alle Pakete,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "nach Gruppen"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "nach Größe"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "nach Auswahlstadium"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "nach Quellen"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "nach Verfügbarkeit"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "in Beschreibungen"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "in Namen"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "in Dateien"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normale Aktualisierungen"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -679,35 +711,35 @@ msgstr ""
"\n"
"Soll ich fortfahren?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Finden:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Suche"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installieren"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Aktualisierung"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Softwarepakete-Entferner"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Softwarepakete-Installierer"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -719,25 +751,25 @@ msgstr ""
"\n"
"Soll ich fortfahren?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Besorge Paketinformationen vom Server, bitte warten ..."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Fehler beim Aktualisieren des Mediums"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Es trat ein gravierender Fehler beim Aktualisieren der Paketinformationen "
"auf."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Wie Sie Ihren Paketserver selbst auswählen"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -751,16 +783,16 @@ msgstr ""
"\n"
"Starten Sie anschließend erneut MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Besorge Liste der zu aktualisierenden Pakete vom Server, bitte warten ..."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Fehler beim Erstellen eines Aktualisierungsmediums"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -773,48 +805,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Suche nach vorhandenen Pakete, bitte warten ..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Installation schlug fehl"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Entfernen"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -823,44 +859,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Einige Pakete konnten nicht installiert werden"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Alle gewünschten Pakete sind bereits installiert"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Kann Quellpakete nicht bekommen."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Ich kann leider die Quellpakete nicht bekommen."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Medienwechsel"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Bitte legen Sie das Medium „%s“ in Laufwerk [%s]."
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Installation schlug fehl"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -868,40 +900,40 @@ msgstr ""
"Die Installation schlug fehl, da einige Pakete fehlen.\n"
"Sie sollten Ihre Paketliste aktualisieren."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Pakete entfernen, um Aktualisierung anderer zu ermöglichen, bitte warten ..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Programm fehlt"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
"Ein zum Funktionieren benötigtes Programm (grpmi) fehlt, bitte Kontrollieren "
"Sie Ihr System."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Alle gewünschten Pakete sind bereits installiert"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
"Alle gewünschten Pakete sind bereits installiert (Das sollte eigentlich nie "
"Workommen!)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Lesen der Paketdatenbank, bitte warten ..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Entfernen der Pakete, bitte warten ..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -913,7 +945,7 @@ msgstr ""
"Dieses Programm wird Ihnen helfen, die Softwarepakete auszuwählen,\n"
"die Sie von Ihrem Rechner entfernen wollen.."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -921,7 +953,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1156,9 +1188,6 @@ msgstr "Software installieren"
#~ msgid "Force"
#~ msgstr "Forciert"
-#~ msgid "Error..."
-#~ msgstr "Fehler ..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Währen der Installation sind Fehler aufgetreten."
@@ -1461,9 +1490,6 @@ msgstr "Software installieren"
#~ msgid "Ftp Proxy:"
#~ msgstr "FTP Proxy:"
-#~ msgid "Proxy username:"
-#~ msgstr "Proxy Kennzeichen:"
-
#~ msgid "Proxy password:"
#~ msgstr "Proxy Passwort:"
@@ -1503,9 +1529,6 @@ msgstr "Software installieren"
#~ msgid "Choose Packages"
#~ msgstr "Pakete wählen"
-#~ msgid "Username:"
-#~ msgstr "Kennzeichen:"
-
#~ msgid "Security"
#~ msgstr "Sicherheit"
diff --git a/po/de.pom b/po/de.pom
index 6a75642a..1756fd52 100644
--- a/po/de.pom
+++ b/po/de.pom
@@ -3,168 +3,170 @@ msgid "Server"
msgstr "Server"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Entwicklungsplattform"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Server, Web/FTP"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Netzwerk-Computer (Klient)"
+msgid "Office Workstation"
+msgstr "Büro-Arbeitsplatz"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
+"(KSpread, Gnumeric), PDF-Betrachter, usw."
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Workstation"
+msgstr "Arbeitsplatzrechner"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Gnome-Arbeitsplatz"
+msgid "Game station"
+msgstr "Spiel-Station"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Werkzeuge für Ihren Palm Pilot oder Ihren Visor"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Arbeitsplatzrechner"
+msgid "Multimedia station"
+msgstr "Multimediarechner"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Server, Firewall/Router"
+msgid "Sound and video playing/editing programs"
+msgstr "Sound- und Video-Abspieler/Editoren"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Domänen- (DNS) und Netzwerk Informationsserver (NIS)"
+msgid "Internet station"
+msgstr "Internetrechner"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
msgstr ""
-"Office-Programme: Textverarbeitung (KWord, Abiword), Tabellenkalkulation "
-"(KSpread, Gnumeric), PDF-Betrachter, usw."
+"Programme zum E-Mail bzw. News lesen und senden (pine, mutt, tin, ...)sowie "
+"zum durchstöbern des WWW"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Audio Programme: MP3- und Midi-Abspieler, Mixer, usw."
+msgid "Network Computer (client)"
+msgstr "Netzwerk-Computer (Klient)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Drittanbieterunterstützung"
+msgid "Clients for different protocols including ssh"
+msgstr "Klienten für verschiedene Protokolle, u.a. SSH"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
+msgid "Configuration"
+msgstr "Konfiguration"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "KDE-Arbeitsplatz"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Werkzeuge, die die Konfiguration Ihres Rechners erleichtern"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
+msgid "Scientific Workstation"
+msgstr "Wissenschaftlicher Arbeitsplatzrechner"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia / Video"
+msgid "Console Tools"
+msgstr "Konsolen-Werkzeuge"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Programme für Mail, News, WWW, FTP und Chat"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Server, Datenbank"
+msgid "KDE Workstation"
+msgstr "KDE-Arbeitsplatz"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "PostgeSQL oder MySQL Datenbankserver"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Das K Desktop Environment, die Standard-Arbeitsoberfläche mit einer Sammlung "
+"zugehöriger Programme"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Werkzeuge, die die Konfiguration Ihres Rechners erleichtern"
+msgid "Graphical Environment"
+msgstr "Grafische Arbeitsoberfläche"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia / Sound"
+msgid "Gnome Workstation"
+msgstr "Gnome-Arbeitsplatz"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Dokumentation"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Eine grafische Oberfläche mit anwenderfreundlichen Anwendungen und Werkzeugen"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Konsolen-Werkzeuge"
+msgid "Other Graphical Desktops"
+msgstr "Andere grafische Arbeitsoberflächen"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr ""
-"Postfix E-Mail-Server und\n"
-"Inn Diskussionsforen-Server"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, usw."
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internetrechner"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Entwicklungsplattform"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimediarechner"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "C und C++ Entwicklung: Bibliotheken, Programme und Include-Dateien"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Konfiguration"
+msgid "Documentation"
+msgstr "Dokumentation"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Weitere Arbeitsoberflächen (GNOME, IceWM)"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Bücher und HOWTOs zu GNU/Linux und Freier Software"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "LSB"
msgstr ""
-"Das K Desktop Environment, die Standard-Arbeitsoberfläche mit einer Sammlung "
-"zugehöriger Programme"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Grafische Arbeitsoberfläche"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Drittanbieterunterstützung"
+
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Web/FTP"
+msgstr "Server, Web/FTP"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -173,120 +175,115 @@ msgstr "Apache und Pro-ftpd"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Werkzeuge zur Erstellung und zum Brennen von CDs"
+msgid "Mail/Groupware/News"
+msgstr "Server, Mail/Groupware/News"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Büro-Arbeitsplatz"
+msgid "Postfix mail server, Inn news server"
+msgstr ""
+"Postfix E-Mail-Server und\n"
+"Inn Diskussionsforen-Server"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "GNOME, IceWM, Window Maker, Enlightenment, Fvwm, usw."
+msgid "Database"
+msgstr "Server, Datenbank"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Bildverarbeitungsprogramme wie der GIMP"
+msgid "PostgreSQL or MySQL database server"
+msgstr "PostgeSQL oder MySQL Datenbankserver"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Firewall/Router"
+msgstr "Server, Firewall/Router"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "C und C++ Entwicklung: Bibliotheken, Programme und Include-Dateien"
+msgid "Internet gateway"
+msgstr "Internet-Gateway"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Netzwerkrechner Server"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Server, Mail/Groupware/News"
+msgid "Domain Name and Network Information Server"
+msgstr "Domänen- (DNS) und Netzwerk Informationsserver (NIS)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Spiel-Station"
+msgid "Network Computer server"
+msgstr "Netzwerkrechner Server"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Videoabspieler und Editoren"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "NFS-Server, SMB-Server, Proxy-Server, SSH-Server"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia / Grafik"
+msgid "Office"
+msgstr "Office"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Spiele: Arcade-, Brett-, Strategiespiele, usw."
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Programme für Mail, News, WWW, FTP und Chat"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Programme zum E-Mail bzw. News lesen und senden (pine, mutt, tin, ...)sowie "
-"zum durchstöbern des WWW"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia / Grafik"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanzverwaltung"
+msgid "Graphics programs such as The Gimp"
+msgstr "Bildverarbeitungsprogramme wie der GIMP"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Eine grafische Oberfläche mit anwenderfreundlichen Anwendungen und Werkzeugen"
+msgid "Multimedia - Sound"
+msgstr "Multimedia / Sound"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Klienten für verschiedene Protokolle, u.a. SSH"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Audio Programme: MP3- und Midi-Abspieler, Mixer, usw."
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Multimedia / Video"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Internet-Gateway"
+msgid "Video players and editors"
+msgstr "Videoabspieler und Editoren"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Sound- und Video-Abspieler/Editoren"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia / CD-Brenner"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Andere grafische Arbeitsoberflächen"
+msgid "Tools to create and burn CD's"
+msgstr "Werkzeuge zur Erstellung und zum Brennen von CDs"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editoren, Shells, Dateiwerkzeuge, Konsolen"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Weitere Arbeitsoberflächen (GNOME, IceWM)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Finanzverwaltungsprogramme, etwa Gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "GNOME, IceWM, Window Maker, Enlightenment, Fvwm, usw."
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -295,11 +292,15 @@ msgstr "Persönliches Informationsmanagement"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia / CD-Brenner"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Werkzeuge für Ihren Palm Pilot oder Ihren Visor"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Wissenschaftlicher Arbeitsplatzrechner"
+msgid "Personal Finance"
+msgstr "Finanzverwaltung"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Finanzverwaltungsprogramme, etwa Gnucash"
diff --git a/po/el.po b/po/el.po
index 9d053415..23b29932 100644
--- a/po/el.po
+++ b/po/el.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-29 18:53+0300\n"
"Last-Translator: Íßêïò Íýêôáñçò (Nick Niktaris) <niktaris@yahoo.com>\n"
"Language-Team: Greek <nls@hellug.gr>\n"
@@ -55,7 +55,7 @@ msgstr "ÈÝóç Þ óçìåßï ðñïóÜñôçóçò: "
msgid "Removable device"
msgstr "Áöáéñïýìåíç óõóêåõÞ"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Áíáíåþóåéò Áóöáëåßáò"
@@ -71,7 +71,7 @@ msgstr "ÅðéëÝîôå ìéá åíáëëáêôéêÞ..."
msgid "Login:"
msgstr "ÐñïóðÝëáóç:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Êùäéêüò ðñüóâáóçò:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr "Ôýðïò ðçãÞò:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Áêýñùóç"
@@ -162,43 +164,71 @@ msgstr "ÁíáíÝùóç"
msgid "Please wait, updating media..."
msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáíåþíåôáé ôï ìÝóï..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Ñýèìéóç ðçãþí"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Ñýèìéóç ðçãþí"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Åíåñãïðïßçóç;"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "ÐçãÞ"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Áöáßñåóç"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Åðåîåñãáóßá"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "ÐñïóèÞêç..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "ÁíáíÝùóç..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "ÓöÜëìá..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "ÁðïèÞêåõóç êáé Ýîïäïò"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "¸îïäïò"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +239,7 @@ msgstr ""
"\n"
"Íá óõíå÷éóôåß;"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -340,11 +370,11 @@ msgid "China"
msgstr "Êßíá"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "ÇíùìÝíåò Ðïëéôåßåò ÁìåñéêÞò"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,17 +387,17 @@ msgstr ""
"\n"
"Íá óõíå÷éóôåß;"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Ðáñáêáëþ ðåñéìÝíåôå ãßíåôáé ç ëÞøç ôùí äéåõèýíóåùí ôùí åíáëëáêôéêþí èÝóåùí "
"áðü ôçí MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "ÓöÜëìá êáôÜ ôç ëÞøç"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -382,11 +412,11 @@ msgstr ""
"Ôï äßêôõï Þ ç éóôïóåëßäá ôçò MandrakeSoft ìðïñåß íá ìçí åßíáé äéáèÝóéìç.\n"
"Ðáñáêáëþ ðñïóðáèÞóôå îáíÜ áñãüôåñá."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "×ùñßò åíáëëáêôéêÝò"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +431,7 @@ msgstr ""
"ç áñ÷éôåêôïíéêÞ ôïõ åðåîåñãáóôÞ óáò áðü ôéò åðßóçìåò áíáâáèìßóåéò áðü ôï \n"
"Mandrake Linux"
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Ðáñáêáëþ åðéëÝîôå ôçí åðéèõìçôÞ åíáëëáêôéêÞ."
@@ -409,71 +439,71 @@ msgstr "Ðáñáêáëþ åðéëÝîôå ôçí åðéèõìçôÞ åíáëëáêôéêÞ."
msgid "Other"
msgstr "¶ëëá"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Äåí åßíáé äéáèÝóéìï/ç)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "ÁðïôÝëåóìá ÁíáæÞôçóçò (êáíÝíá)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé áíáæÞôçóç..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Ôåñìáôéóìüò"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "ÐñïóôéèÝìåíá"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Áíáâáèìßóéìá"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Ðåñéóóüôåñåò ðëçñïöïñßåò ãéá ôï ðáêÝôï..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "¸íá áðü ôá ðáñáêÜôù ðáêÝôá áðáéôïýíôáé:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Ðáñáêáëþ åðéëÝîôå"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "¶ãíùóôï ðáêÝôï"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Ðáñáêáëþ ðåñéìÝíåôå, ôáîéíïìïýíôáé ôá ðáêÝôá"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(êáíÝíá)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "×ùñßò áíáâáèìßóåéò"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -483,11 +513,11 @@ msgstr ""
"õðÜñ÷ïõí äéáèÝóéìá ðáêÝôá ãéá áíáâÜèìéóç ãéá ôá åãêáôåóôçìÝíá\n"
"ðáêÝôá ôïõ õðïëïãéóôÞ óáò Þ ôá Ý÷åôå Þäç áíáâáèìßóåé."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "ÏñéóìÝíá åðéðëÝïí ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -497,11 +527,11 @@ msgstr ""
"íá áöáéñåèïýí:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "ÏñéóìÝíá ðáêÝôá äåí ìðïñïýí íá áöáéñåèïýí"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -511,11 +541,11 @@ msgstr ""
"íá áðïåðéëåãïýí:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Áðáéôïýíôáé åðéðëÝïí ðáêÝôá"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -525,11 +555,11 @@ msgstr ""
" ôá ðáñáêÜôù ðáêÝôá:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "ÏñéóìÝíá ðáêÝôá äåí ìðïñïýí íá åãêáôáóôáèïýí"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -537,21 +567,21 @@ msgstr ""
"Óõãíþìç, ôá ðáñáêÜôù ðáêÝôá äåí ìðïñïýí íá åðéëåãïýí:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "ÏñéóìÝíá ðáêÝôá ðñÝðåé íá áöáéñåèïýí"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "ÅðéëåãìÝíï: %d MB/ Åëåýèåñïò ÷þñïò óôïí äßóêï: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "ÅðéëåãìÝíï ìÝãåèïò: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -566,12 +596,12 @@ msgstr ""
"ÁëëáãÝò:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "ÐçãÞ: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +622,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -611,67 +641,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Áíáâáèìßóåéò äéïñèþóåùí"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "ÊáíïíéêÝò áíáâáèìßóåéò"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "ÅðéëïãÝò Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "¼ëá ôá ðáêÝôá, áëöáâçôéêÜ"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "¼ëá ôá ðáêÝôá,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "âÜóç ïìÜäáò"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "âÜóç ìåãÝèïõò"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "âÜóç êáôÜóôáóçò åðéëïãÞò"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "âÜóç áðïèçêåõìÝíùí ðçãþí"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "âÜóç äéáèåóéìüôçôáò áíáâÜèìéóçò"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "óôéò ðåñéãñáöÝò"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "óôá ïíüìáôá"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "óôá áñ÷åßá"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "ÌÝãéóôåò ðëçñïöïñßåò"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "ÊáíïíéêÝò ðëçñïöïñßåò"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -686,35 +716,35 @@ msgstr ""
"\n"
"Íá óõíå÷éóôåß;"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Åýñåóç:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "ÁíáæÞôçóç"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "ÅãêáôÜóôáóç"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Áöáßñåóç ÐáêÝôùí Ëïãéóìéêïý"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "ÅãêáôÜóôáóç ÐáêÝôùí Ëïãéóìéêïý"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -727,27 +757,27 @@ msgstr ""
"\n"
"Íá óõíå÷ßóù;"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé óýíäåóç ìå ôçí åíáëëáêôéêÞ äéåýèõíóç ãéá ôçí "
"áíáâÜèìéóç ôùí ðëçñïöïñéþí ôùí ðáêÝôùí."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "ÓöÜëìá êáôÜ ôçí áíáíÝùóç ôïõ ìÝóïõ"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"ÕðÞñîå Ýíá áíåðáíüñèùôï óöÜëìá êáôÜ ôçí áíáâÜèìéóç ôùí ðëçñïöïñéþí ôùí "
"ðáêÝôùí."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Ðùò íá äéáëÝîåôå ìüíïé óáò ôçí åíáëëáêôéêÞ óáò"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -761,17 +791,17 @@ msgstr ""
"\n"
"ÌåôÜ, îåêéíÞóôå îáíÜ ôï MandrakeUpdate."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Ðáñáêáëþ ðåñéìÝíåôå, ãßíåôáé óýíäåóç ìå ôçí åíáëëáêôéêÞ äéåýèõíóç ãéá ôçí "
"åêêßíçóç ôùí áíáâáèìßóåùí ôùí ðáêÝôùí."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "ÓöÜëìá êáôÜ ôçí ðñïóèÞêç ôïõ ìÝóïõ áíáâáèìßóåùí"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -793,46 +823,50 @@ msgstr ""
"\n"
"ÈÝëåôå íá äïêéìÜóåôå Üëëç åíáëëáêôéêÞ;"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áíáæçôïýíôáé ôá äéáèÝóéìá ðáêÝôá..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "¼ëá ôá æçôçèÝíôá ðáêÝôá åãêáôáóôÜèçêáí åðéôõ÷þò."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "¼ëá åãêáôáóôÜèçêáí åðéôõ÷þò"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Ç åãêáôÜóôáóç ôåëåßùóå"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "ÅëÝã÷åôáé ôï %s"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Áöáßñåóç.%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "×ñÞóç ôïõ .%s ùò êýñéï áñ÷åßï"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Íá ìç ãßíåé ôßðïôá"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "¸ëåã÷ïò..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -845,7 +879,7 @@ msgstr ""
"ÏñéóìÝíá áñ÷åßá ñýèìéóåùí äçìéïõñãÞèçêáí ùò `.rpmnew' Þ`.rpmsave',\n"
"ßóùò íá ðñÝðåé íá ôá åëÝãîåôå ãéá íá åêôåëÝóåôå ïñéóìÝíåò åíÝñãåéåò:"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -853,36 +887,32 @@ msgstr ""
"ïñéóìÝíá ðáêÝôá áðÝôõ÷áí íá \n"
"åãêáôáóôáèïýí"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "üëá åãêáôáóôÜèçêáí óùóôÜ"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "¸ëåã÷ïò..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Áäýíáôç ç ëÞøç ôùí ðçãáßùí ðáêÝôùí."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Áäýíáôç ç ëÞøç ôùí ðçãáßùí ðáêÝôùí, óõãíþìç."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "ÁëëáãÞ ìÝóïõ"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ðáñáêáëþ åéóÜãåôå ôï ìÝóï ìå üíïìá \"%s\" óôç óõóêåõÞ [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Ç åãêáôÜóôáóç áðÝôõ÷å"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -890,37 +920,37 @@ msgstr ""
"Ç åãêáôÜóôáóç áðÝôõ÷å, ïñéóìÝíá áñ÷åßá äåí õðÜñ÷ïõí.\n"
"ºóùò íá ðñÝðåé íá áíáâáèìßóåôå ôçí âÜóç äåäïìÝíùí ôùí ðçãþí."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Ðáñáêáëþ ðåñéìÝíåôå, áöáéñïýíôáé ðáêÝôá ãéá íá ìðïñÝóïõí íá áíáâáèìéóôïýí "
"Üëëá..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Ëåßðåé ðñüãñáììá"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "¸íá áðáéôïýìåíï ðñüãñáììá (ôï grpmi).ÅëÝãîôå ôçí åãêáôÜóôáóÞ óáò"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "¼ëá åßíáé Þäç åãêáôåóôçìÝíá."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "¼ëá åßíáé Þäç åãêáôåóôçìÝíá.(èá Ýðñåðå íá óõìâáßíåé áõôü;)"
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Ðáñáêáëþ ðåñéìÝíåôå, äéáâÜæåôáé ç âÜóç äåäïìÝíùí ôùí ðáêÝôùí..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Ðáñáêáëþ ðåñéìÝíåôå, áöáéñïýíôáé ôá ðáêÝôá..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -932,7 +962,7 @@ msgstr ""
"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá åðéëÝîåôå ôï ðñüãñáììá ðïõ èÝëåôå\n"
"íá áöáéñÝóåôå áðü ôïí õðïëïãéóôÞ óáò."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -944,7 +974,7 @@ msgstr ""
"Áõôü ôï åñãáëåßï èá óáò âïçèÞóåé íá åðéëÝîåôå ôéò áíáâáèìßóåéò ðïõ èÝëåôå\n"
"íá åãêáôáóôÞóåôå óôïí õðïëïãéóôÞ óáò."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1195,9 +1225,6 @@ msgstr "ÅãêáôÜóôáóç Ëïãéóìéêïý"
#~ msgid "Force"
#~ msgstr "Åîáíáãêáóìüò"
-#~ msgid "Error..."
-#~ msgstr "ÓöÜëìá..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "ÕðÞñîáí ðñïâëÞìáôá êáôÜ ôçí åãêáôÜóôáóç"
diff --git a/po/eo.po b/po/eo.po
index fb84999b..9a327da3 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-09-14 07:53-0500\n"
"Last-Translator: D. Dale Gulledge <dsplat@rochester.rr.com>\n"
"Language-Team: Esperanto <eo@li.org>\n"
@@ -59,7 +59,7 @@ msgstr "surmetingo:"
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Sekurecaj øisdatigoj"
@@ -77,7 +77,7 @@ msgstr "Elektu vian spegulon:"
msgid "Login:"
msgstr "salutnomo:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Passvorto:"
@@ -113,14 +113,16 @@ msgid "Type of source:"
msgstr "Speco de fonto:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Jes"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Forigu"
@@ -179,45 +181,75 @@ msgstr "Øisdatigu"
msgid "Please wait, updating media..."
msgstr "Kontrolas dependa¼ojn..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Æu konfiguri fonton?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Salutnomo por prokura servilo:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Salutnomo:"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Æu konfiguri fonton?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Fonto"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Deprenebla"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Redaktu"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Eraro..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Forlasu"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -225,7 +257,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -356,11 +388,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -368,15 +400,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -386,12 +418,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Neniu eraro"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -400,7 +432,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -411,93 +443,93 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Serærezulto"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Serærezulto"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Bonvole atendu dum rpm-o malinstalas æi tiujn paka¼ojn:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Malelektu\n"
"æiujn"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Elektu æiujn"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Nekonata paøo"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Bonvole atendu dum rpm-o malinstalas æi tiujn paka¼ojn:"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nenio)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "normaj øisdatigoj"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr "Vi devas instali æi tiujn paka¼ojn por æiuj bone funkcias:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -507,54 +539,54 @@ msgstr ""
"Por plenumi æiujn el la dependa¼oj,\n"
"æi tiuj paka¼oj estos malinstalataj:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Paka¼oj jam estas instalataj"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -564,12 +596,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Fonto"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -582,7 +614,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -594,75 +626,75 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Sekurecaj øisdatigoj"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "normaj øisdatigoj"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeØisdatigilo"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 paka¼oj, 0 bitokoj"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Profunda grandeca"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Priskriboj"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Loka"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "normaj øisdatigoj"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -672,41 +704,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Trovu:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
#, fuzzy
msgid "Search"
msgstr "seræu"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalu"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Øisdatigilo"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " ProgramarAdministrilo "
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Instalado de paka¼oj"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -714,23 +746,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -739,15 +771,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -760,48 +792,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "resarøu listojn de haveblaj paka¼oj"
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalebla"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Deprenebla"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -810,83 +846,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Paka¼oj jam estas instalataj"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Paka¼o estas jam instalata"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Malbonaj, nelegeblaj aý netrovataj paka¼oj"
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Instalebla"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Bonvole elektu la paka¼ojn vi deziras øisdatigi"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Paka¼o estas jam instalata"
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Bonvole atendu dum rpm-o malinstalas æi tiujn paka¼ojn:"
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -894,7 +926,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -902,7 +934,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1126,9 +1158,6 @@ msgstr "Instalu æio"
#~ msgid "Force"
#~ msgstr "Devigu"
-#~ msgid "Error..."
-#~ msgstr "Eraro..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Problemo okazis dum instalado"
@@ -1428,9 +1457,6 @@ msgstr "Instalu æio"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp Prokura Servilo:"
-#~ msgid "Proxy username:"
-#~ msgstr "Salutnomo por prokura servilo:"
-
#~ msgid "Proxy password:"
#~ msgstr "Passvorto por prokura servilo:"
@@ -1470,9 +1496,6 @@ msgstr "Instalu æio"
#~ msgid "Choose Packages"
#~ msgstr "Elektu Paka¼ojn"
-#~ msgid "Username:"
-#~ msgstr "Salutnomo:"
-
#~ msgid "Security"
#~ msgstr "Sekureco"
diff --git a/po/es.po b/po/es.po
index 414e02fc..06f1dfa3 100644
--- a/po/es.po
+++ b/po/es.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 20:55+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-29 13:13-0300\n"
"Last-Translator: Fabian Mandelbaum <fabman@mandrakesoft.com>\n"
"Language-Team: Spanish <cooker-i18n@linux-mandrake.com>\n"
@@ -58,7 +58,7 @@ msgstr "Ruta o punto de montaje:"
msgid "Removable device"
msgstr "Dispositivo removible"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Actualizaciones de seguridad"
@@ -74,7 +74,7 @@ msgstr "Elija un sitio de réplica..."
msgid "Login:"
msgstr "Cuenta:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Contraseña:"
@@ -107,14 +107,16 @@ msgid "Type of source:"
msgstr "Tipo de fuente:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Aceptar"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Cancelar"
@@ -164,43 +166,71 @@ msgstr "Actualizar"
msgid "Please wait, updating media..."
msgstr "Por favor espere, actualizando soportes..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Configurar fuentes"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Configurar fuentes"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "¿Habilitada?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Fuente"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Quitar"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Editar"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Agregar..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Actualizar..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Error..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Guardar y salir"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Salir"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -211,7 +241,7 @@ msgstr ""
"\n"
"¿Desea continuar?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -342,11 +372,11 @@ msgid "China"
msgstr "China"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Estados Unidos"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -358,17 +388,17 @@ msgstr ""
"\n"
"¿Desea continuar?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Por favor espere, descargando las direcciones de los sitios de réplica desde "
"el sitio web de MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Error durante la descarga"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -383,11 +413,11 @@ msgstr ""
"Tal vez no está disponible la red, o el sitio web de MandrakeSoft.\n"
"Por favor, intente nuevamente más tarde."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Sin sitio de réplica"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +431,7 @@ msgstr ""
"arquitectura de su procesador no está soportada por las Actualizaciones\n"
"Oficiales de Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Por favor, elija el sitio de réplica deseado."
@@ -409,71 +439,71 @@ msgstr "Por favor, elija el sitio de réplica deseado."
msgid "Other"
msgstr "Otro"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(No disponible)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Resultados de la búsqueda"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Resultados de la búsqueda (ninguno)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Por favor espere, buscando ..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Detener"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Agregable"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Actualizable"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Más información sobre el paquete..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Se necesita uno de los paquetes siguientes:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Por favor, elija"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "paquete desconocido "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Por favor espere, listando paquetes..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ninguno)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Sin actualizaciones"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -483,11 +513,11 @@ msgstr ""
"actualizaciones disponibles para los paquetes instalados en su computadora,\n"
"o bien ya los instaló a todos."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Se necesitan quitar algunos paquetes adicionales"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -497,11 +527,11 @@ msgstr ""
"siguientes:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "No se pueden quitar algunos paquetes"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -511,11 +541,11 @@ msgstr ""
"paquetes siguientes:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Se necesitan paquetes adicionales"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -525,11 +555,11 @@ msgstr ""
"paquetes siguientes:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "No se pueden instalar algunos paquetes"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -537,21 +567,21 @@ msgstr ""
"Lo siento, no se puede seleccionar el o los paquetes siguientes:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Se necesita quitar algunos paquetes"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Seleccionado: %d MB / Disponible en disco: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Tamaño seleccionado: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -566,12 +596,12 @@ msgstr ""
"Cambios:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Fuente: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +622,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -611,67 +641,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Actualizaciones que corrigen bugs"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Actualizaciones normales"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Selecciones de Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Todos los paquetes, alfabético"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Todos los paquetes,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "por grupo"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "por tamaño"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "por estado de la selección"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "por repositorio fuente"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "por disponibilidad de actualización"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "en descripciones"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "en nombres"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "en archivos"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Información máxima"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Información normal"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -686,35 +716,35 @@ msgstr ""
"\n"
"¿Desea continuar?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Encontrar:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Buscar"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalar"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Actualización de Mandrake"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Quitar paquetes de software"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalación de paquetes de software"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -727,27 +757,27 @@ msgstr ""
"\n"
"¿Desea continuar?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Por favor espere, contactando al sitio de réplica para actualizar la "
"información de los paquetes."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Error actualizando soporte"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Hubo un error irrecuperable mientras se actualizaba la información de los "
"paquetes."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Cómo elegir manualmente su sitio de réplica"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -761,17 +791,17 @@ msgstr ""
"\n"
"Luego, vuelva a iniciar MandrakeUpdate."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Por favor espere, contactando al sitio de réplica para incicializar los "
"paquetes actualizados."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Error agregando soporte de actualizaciones"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -791,46 +821,50 @@ msgstr ""
"\n"
"¿Desea intentar con otro sitio de réplica?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Por favor espere, encontrando los paquetes disponibles..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Se instalaron satisfactoriamente todos los paquetes pedidos."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Se instaló todo satisfactoriamente"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Finalizó la instalación"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Inspeccionando %s"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Quitar .%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Usar .%s como archivo principal"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Hacer nada"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Inspeccionar..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -843,7 +877,7 @@ msgstr ""
"Algunos archivos de configuración se crearon como `.rpmnew' o `.rpmsave',\n"
"ahora puede inspeccionar algunos para poder tomar acción:"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -851,36 +885,32 @@ msgstr ""
"no se pueden instalar correctamente algunos\n"
"paquetes"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "se instaló todo correctamente"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "Inspeccionar..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "No se pueden obtener los paquetes de la fuente."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "No se pueden obtener los paquetes de la fuente, lo siento."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Cambiar el soporte"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor inserte el soporte denominado \"%s\" en el dispositivo [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Falló la instalación"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -888,35 +918,35 @@ msgstr ""
"Falló la instalación, faltan algunos archivos.\n"
"Puede que desee actualizar la base de datos de sus fuentes."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Por favor espere, quitando paquetes para permitir actualizar otros..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Falta un programa"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Falta un programa necesario (grpmi). Verifique su instalación."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Ya está todo instalado."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Ya está todo instalado (¿seguro que debería ocurrir esto?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Por favor espere, leyendo la base de datos de paquetes..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Por favor espere, quitando paquetes..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -928,7 +958,7 @@ msgstr ""
"Esta herramienta lo ayudará a elegir el software que desea quitar de su "
"computadora."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -940,7 +970,7 @@ msgstr ""
"Esta herramienta lo ayudará a elegir las actualizaciones que desea instalar "
"en su computadora."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1191,9 +1221,6 @@ msgstr "Instalar software"
#~ msgid "Force"
#~ msgstr "Forzar"
-#~ msgid "Error..."
-#~ msgstr "Error..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Ocurrió un problema durante la instalación"
diff --git a/po/es.pom b/po/es.pom
index 2330ea8a..5ddcd231 100644
--- a/po/es.pom
+++ b/po/es.pom
@@ -3,168 +3,171 @@ msgid "Server"
msgstr "Servidor"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Desarrollo"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Estación de trabajo de Oficina"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Servidor, Web/FTP"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
+"de cálculo (kspread, gnumeric), visualizadores PDF, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computadora de Red (cliente)"
+msgid "Workstation"
+msgstr "Estación de trabajo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
+msgid "Game station"
+msgstr "Estación de Juegos"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Oficina"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Estación de trabajo GNOME"
+msgid "Multimedia station"
+msgstr "Estación Multimedios"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Herramientas para su Palm Pilot o su Visor"
+msgid "Sound and video playing/editing programs"
+msgstr "Programas de reproducción/edición de sonido y vídeo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Estación de trabajo"
+msgid "Internet station"
+msgstr "Estación Internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Servidor, Cortafuegos/Router"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Conjunto de herramientas para leer y enviar correo y noticiar (pine, mutt, "
+"tin...) y para navegar por la Web"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Servidor de Información de Red y de Nombres de Dominio"
+msgid "Network Computer (client)"
+msgstr "Computadora de Red (cliente)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programas de Oficina: procesadores de palabras (kword, abiword), plantillas "
-"de cálculo (kspread, gnumeric), visualizadores PDF, etc"
+msgid "Clients for different protocols including ssh"
+msgstr "Clientes para los distintos protocolos incluyendo a ssh"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Herramientas de audio: reproductores mp3 o midi, mezcladores, etc"
+msgid "Configuration"
+msgstr "Configuración"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Herramientas para facilitar la configuración de su computadora"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libros y COMOs sobre Linux y Software Libre"
+msgid "Scientific Workstation"
+msgstr "Estación de trabajo Científica"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Estación de trabajo KDE"
+msgid "Console Tools"
+msgstr "Herramientas para la consola"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editores, shells, manipulación de archivos, terminales"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedios - Vídeo"
+msgid "KDE Workstation"
+msgstr "Estación de trabajo KDE"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
msgstr ""
-"Conjunto de herramientas para correo, noticias, web, transferencia de "
-"archivos, y chat"
+"El K Desktop Environment, el entorno gráfico básico con una colección de "
+"herramientas que lo acompañan"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Servidor, Bases de Datos"
+msgid "Graphical Environment"
+msgstr "Entorno gráfico"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Servidor de base de datos PostgreSQL o MySQL"
+msgid "Gnome Workstation"
+msgstr "Estación de trabajo GNOME"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Herramientas para facilitar la configuración de su computadora"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
+"amigables"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedios - Sonido"
+msgid "Other Graphical Desktops"
+msgstr "Otros entornos gráficos"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentación"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Herramientas para la consola"
-
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Servidor de correo Postfix, servidor de noticias Inn"
+msgid "Development"
+msgstr "Desarrollo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Estación Internet"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Estación Multimedios"
+msgid "Documentation"
+msgstr "Documentación"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuración"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libros y COMOs sobre Linux y Software Libre"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Más escritorios gráficos (Gnome, IceWM)"
+msgid "LSB"
+msgstr "LSB"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"El K Desktop Environment, el entorno gráfico básico con una colección de "
-"herramientas que lo acompañan"
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Linux Standard Base. Soporte de aplicaciones de terceros"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Entorno gráfico"
+msgid "Web/FTP"
+msgstr "Servidor, Web/FTP"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -173,121 +176,115 @@ msgstr "Apache y Pro-ftpd"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Herramientas para crear y grabar CDs"
+msgid "Mail/Groupware/News"
+msgstr "Servidor, Correo/Groupware/Noticias"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Estación de trabajo de Oficina"
+msgid "Postfix mail server, Inn news server"
+msgstr "Servidor de correo Postfix, servidor de noticias Inn"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Servidor, Bases de Datos"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programas gráficos, tales como El Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Servidor de base de datos PostgreSQL o MySQL"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Firewall/Router"
+msgstr "Servidor, Cortafuegos/Router"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Bibliotecas de desarrollo C y C++, programas y archivos *.h"
+msgid "Internet gateway"
+msgstr "Pasarela de acceso a Internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Computadora servidor de red"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Servidor, Correo/Groupware/Noticias"
+msgid "Domain Name and Network Information Server"
+msgstr "Servidor de Información de Red y de Nombres de Dominio"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Estación de Juegos"
+msgid "Network Computer server"
+msgstr "Computadora servidor de red"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Reproductores y editores de vídeo"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Servidor NFS, servidor SMB, servidor proxy, servidor SSH"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedios - Gráficos"
+msgid "Office"
+msgstr "Oficina"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programas de entretenimiento: arcade, tableros, estrategia, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr ""
+"Conjunto de herramientas para correo, noticias, web, transferencia de "
+"archivos, y chat"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Conjunto de herramientas para leer y enviar correo y noticiar (pine, mutt, "
-"tin...) y para navegar por la Web"
+msgid "Multimedia - Graphics"
+msgstr "Multimedios - Gráficos"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanzas personales"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programas gráficos, tales como El Gimp"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Entorno gráfico con un conjunto de herramientas de escritorio y aplicaciones "
-"amigables"
+msgid "Multimedia - Sound"
+msgstr "Multimedios - Sonido"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clientes para los distintos protocolos incluyendo a ssh"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Herramientas de audio: reproductores mp3 o midi, mezcladores, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimedios - Vídeo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Pasarela de acceso a Internet"
+msgid "Video players and editors"
+msgstr "Reproductores y editores de vídeo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programas de reproducción/edición de sonido y vídeo"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedios - Grabación de CD"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Otros entornos gráficos"
+msgid "Tools to create and burn CD's"
+msgstr "Herramientas para crear y grabar CDs"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editores, shells, manipulación de archivos, terminales"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Más escritorios gráficos (Gnome, IceWM)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programas para administrar sus finanzas, tales como gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -296,11 +293,15 @@ msgstr "Administración de la información personal"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedios - Grabación de CD"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Herramientas para su Palm Pilot o su Visor"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Estación de trabajo Científica"
+msgid "Personal Finance"
+msgstr "Finanzas personales"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programas para administrar sus finanzas, tales como gnucash"
diff --git a/po/et.po b/po/et.po
index a00a4383..51aba145 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-24 10:49+0300\n"
"Last-Translator: Riho Kurg <rx@linux.ee>\n"
"Language-Team: Estonian <et@li.org>\n"
@@ -56,7 +56,7 @@ msgstr "Otsingutee või haakepunkt:"
msgid "Removable device"
msgstr "Eemaldatav seade"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Turvaparandused"
@@ -72,7 +72,7 @@ msgstr "Valige peegel.."
msgid "Login:"
msgstr "Kasutaja:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Salasõna:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "Andmekandja tüüp:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Katkesta"
@@ -162,43 +164,73 @@ msgstr "Uuendus"
msgid "Please wait, updating media..."
msgstr "Palun oodake, uuendan meediat.."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Seadista meedia(d)"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Vahendaja kasutajatunnus:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Kasutajatunnus:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Seadista meedia(d)"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Kasutatav?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Allikas"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Eemalda"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Muuda"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Lisa.."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Uuenda.."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Viga..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Salvesta ja välju"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Välju"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +241,7 @@ msgstr ""
"\n"
"Kas jätkan?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -340,11 +372,11 @@ msgid "China"
msgstr "Hiina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "USA"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,15 +389,15 @@ msgstr ""
"\n"
"Kas jätkan?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Palun oodake, peeglite aadresse laetakse.."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Viga allalaadimisel"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -380,11 +412,11 @@ msgstr ""
"Võrk või MandrakeSoft-i veebisait ei ole kättesaadav.\n"
"Palun proovige hiljem uuesti."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Peeglit ei leita"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -399,7 +431,7 @@ msgstr ""
"mil Teie arvuti protsessori arhitektuur ei ole Mandrake Linuxi ametlike\n"
"uuenduste poolt toetatud."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Palun valige peegel."
@@ -407,75 +439,75 @@ msgstr "Palun valige peegel."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(kättesaamatu)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Otsingu tulemused"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Otsingu tulemus (ei leitud)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Palun oodake, otsin.."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Peatu"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Lisatavad"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Uuendatavad"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Ei vali\n"
"midagi"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Vali kõik"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "vajalik on üks järgmistest pakettidest:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Palun valige"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Tundmatu pakett "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Palun oodake, koostan nimekirja.."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ühtki)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Uuendusi ei ole"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -484,11 +516,11 @@ msgstr ""
"Uuenduste nimekiri on tühi. See tähendab, et uuendusi hetkel ei ole \n"
"või olete kõik need juba installinud."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Et kõik töötaks, on vaja lisaks installida mõned paketid"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -498,11 +530,11 @@ msgstr ""
"järgmised paketid:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Mõned paketid ei ole eemaldatavad"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -511,11 +543,11 @@ msgstr ""
"Sõltuvuste tõttu ei saa järgmiseid pakette valida:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Vajalikud lisapaketid"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -524,11 +556,11 @@ msgstr ""
"Sõltuvuste rahuldamiseks tuleb installida järgmised paketid:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Mõned paketid jäävad installimata"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -536,21 +568,21 @@ msgstr ""
"Kahjuks ei saa järgmiseid pakette valida:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Mõned paketid tuleb eemaldada"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Valitud: %d MB / Vaba kettapinda %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Valitud pakettide maht: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -560,12 +592,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Allikas"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -586,7 +618,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -605,68 +637,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Turvaparandused/uuendused"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Uuendused"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake valikud"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Kõik paketid, tähestikuliselt"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Kõik paketid,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "grupi järgi"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "suuruse järgi"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "oleku järg"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "installimeedia järgi"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "uuenduse järgi"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "kirjeldustest"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "nimedest"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "failidest"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Uuendused"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -680,35 +712,35 @@ msgstr ""
"\n"
"Kas jätkan?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Leia:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Otsi"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Paigalda"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Uuendused"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Pakettide eemaldamine"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Pakettide installimine"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -720,23 +752,23 @@ msgstr ""
"\n"
"Kas jätkata?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Palun oodake, uuendan pakettide infot."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Viga installimeedia uuendamisel"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Paketiinfo uuendamisel tekkis viga, ei saa jätkata."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Kuidas valida peeglit käsitsi"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -750,15 +782,15 @@ msgstr ""
"\n"
"Seejärel restartige MandrakeUpdate."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Palun oodake võtan ühendust uuenduste saidiga."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Viga uuenduste meedia lisamisel."
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -777,48 +809,52 @@ msgstr ""
"\n"
"Kas soovite proovide mõnd muud peegelsaiti?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Palun oodake, otsin kättesaadavaid pakette.."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Kõik soovitud paketid said edukalt installitud"
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Kõik on edukalt installitud"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Install ebaõnnestus "
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Eemalda"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -827,44 +863,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Mõned paketid jäävad installimata"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Kõik on edukalt installitud"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ei saa pakette kätte."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Ei ole võimalik pakette kätte saada, vabandan."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Muudke installimeedia"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Palun sisestage meedia nimega \"%s\" seadmesse [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Install ebaõnnestus "
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -872,36 +904,36 @@ msgstr ""
"Install ebaõnnestus, osa faile on puudu.\n"
"Võimalik, et peate meediat uuendama."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Palun oodake, eemaldan pakette, et uuendus oleks võimalik.."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Programm puudub"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
"Vajalik programm (grpmi) puudub Teie süsteemist. Palun vaadake, milles viga."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Kõik on juba installitud."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Kõik on juba installitud (kas see pidigi nii juhtuma?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Palun oodake, loed pakettide andmebaasi.."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Palun oodake, eemaldan pakette.."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -912,7 +944,7 @@ msgstr ""
"\n"
"Selle tööriista abil saate valida eemaldatava tarkvara."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -923,7 +955,7 @@ msgstr ""
"\n"
"Selle tööriista abil saate oma Mandrake Linuxit uuendada."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1173,9 +1205,6 @@ msgstr "Pakettide paigaldus"
#~ msgid "Force"
#~ msgstr "Ikka tahan!"
-#~ msgid "Error..."
-#~ msgstr "Viga..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Paigaldusel tekkinud probleemid"
@@ -1475,9 +1504,6 @@ msgstr "Pakettide paigaldus"
#~ msgid "Ftp Proxy:"
#~ msgstr "FTP vahendaja:"
-#~ msgid "Proxy username:"
-#~ msgstr "Vahendaja kasutajatunnus:"
-
#~ msgid "Proxy password:"
#~ msgstr "Vahendaja salasõna:"
@@ -1517,9 +1543,6 @@ msgstr "Pakettide paigaldus"
#~ msgid "Choose Packages"
#~ msgstr "Valige paketid"
-#~ msgid "Username:"
-#~ msgstr "Kasutajatunnus:"
-
#~ msgid "Security"
#~ msgstr "Turvalisus"
diff --git a/po/eu.po b/po/eu.po
index 6efee5b7..8c68826d 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 12:15+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-30 10:48+0200\n"
"Last-Translator: Iñigo Salvador Azurmendi <xalba@euskalnet.net>\n"
"Language-Team: Euskara <linux-eu@chanae.alphanet.ch>\n"
@@ -56,7 +56,7 @@ msgstr "bidea edo muntatze-puntua:"
msgid "Removable device"
msgstr "Gailu aldagarriak"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Segurtasunaren eguneratzeak"
@@ -72,7 +72,7 @@ msgstr "Aukeratu ispilua..."
msgid "Login:"
msgstr "Sarrera:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Pasahitza:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "Sorburu-mota:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:781 ../rpmdrake_.c:807
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ados"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:807
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Utzi"
@@ -162,43 +164,71 @@ msgstr "Eguneratu"
msgid "Please wait, updating media..."
msgstr "Itxoin mesedez, euskarria eguneratzen..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Sorburuak konfiguratu"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Sorburuak konfiguratu"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Gaitu?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sorburua"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Ezabatu"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Editatu"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Gehitu..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Eguneratu..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Errorea..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Gorde eta irten"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Irten"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:906
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +239,7 @@ msgstr ""
"\n"
"Jarraitu nahi dezaket?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -341,11 +371,11 @@ msgid "China"
msgstr "Txina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Estatu Batuak"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -358,15 +388,15 @@ msgstr ""
"\n"
"Jarraitu dezaket?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Itxoin mesedez, ispiluen helbideak eskuratzen MandrakeSoft webgunetik."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Okerra jaisterakoan"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -381,11 +411,11 @@ msgstr ""
"Sarea, edo MandrakeSoft webgunea ez daude eskuragarri seguraski.\n"
"Mesedez saiatu berriro beranduago."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Ispilurik ez"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -399,7 +429,7 @@ msgstr ""
"prozesagailuaren arkitekturak Mandrake Linux Eguneratze Ofizialen\n"
"euskarririk ez izatea."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Mesedez hautatu nahi duzun ispilua."
@@ -407,71 +437,71 @@ msgstr "Mesedez hautatu nahi duzun ispilua."
msgid "Other"
msgstr "Beste bat"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Ez dago eskuragarri)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Bilaketaren emaitzak"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Bilaketaren emaitzak (batere ez)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Itxoin mesedez, bilatzen..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Gelditu"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Gehigarria"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Eguneragarria"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Paketeari buruzko informazio gehiago..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Ondorengo paketeetako bat behar da:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Hautatu mesedez"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pakete ezezaguna"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Itxoin, paketeak zerrendatzen..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(bat ere ez)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Eguneratzerik ez"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -481,11 +511,11 @@ msgstr ""
"zure konputagailuan instalatutako paketeentzako eguneratzerik, edo\n"
"guztiak instalatuta dauzkazula dagoeneko."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Pakete osagarri batzu kendu behar dira"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -495,11 +525,11 @@ msgstr ""
"dira:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Pakete batzu ezin dira ezabatu"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -509,11 +539,11 @@ msgstr ""
"behar dira:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Pakete osagarriak behar dira"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -523,11 +553,11 @@ msgstr ""
"behar dira:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Pakete batzu ezin dira instalatu"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -535,21 +565,21 @@ msgstr ""
"Barkatu, ondorengo paketeak ezin dira hautatu:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Zenbait pakete ezabatu egin behar dira"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Aukeratutakoak: %d MB / Diskoan leku askea: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Aukeratutakoen neurria: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -564,12 +594,12 @@ msgstr ""
"Aldakketa-Erregistroa:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Sorburua: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -590,7 +620,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -609,67 +639,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Akatsak konpontzeko eguneratzeak"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Eguneratze arruntak"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake aukerak"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Pakete guztiak, alfabetikoki"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Pakete guztiak,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "talde arabera"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "neurri arabera"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "hautapenaren arabera"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "sorburu gordailuaren arabera"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "eguneratze eskuragarritasun arabera"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "deskribapenetan"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "izenetan"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "fitxategitan"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Informazio zabalenak"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Informazio arruntak"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -683,35 +713,35 @@ msgstr ""
"%s\n"
"Jarraitu dezaket?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Aurkitu:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Bilatu"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalatu"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Eguneratu"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Software Paketeen Ezabaketa"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Software Paketeen instalazioa"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -724,24 +754,24 @@ msgstr ""
"\n"
"Jarraitu dezaket?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Itxoin mesedez, ispiluarekin kontaktatzen paketeen informazioa eguneratzeko."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Okerra euskarria eguneratzen"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Oker zuzenezina gertatu da paketeen informazioa eguneratzekoan."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Nola hautatu eskuz zure ispilua"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -755,16 +785,16 @@ msgstr ""
"\n"
"Gero, berrabiarazi MandrakeUpdate"
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Itxoin mesedez, ispiluarekin kontaktatzen eguneratze paketeak hasieratzeko."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Okerra eguneratze euskarria gehitzerakoan"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -786,50 +816,50 @@ msgstr ""
"\n"
"Beste ispilu batekin froga egin nahi duzu?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Itxoin mesedez, eskuratu daitezkeen paketeak bilatzen..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Eskatutako pakete guztiak ondo instalatu dira."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Guztia ondo instalatu da."
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Instalazioa amaitu da"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "%s ikertzen"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Ezabatu .%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Erabili %s fitxategi nagusi gisa"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Ez egin ezer"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:759
msgid "Inspect..."
msgstr "Ikertu..."
-#: ../rpmdrake_.c:776
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -842,7 +872,7 @@ msgstr ""
"Zenbait konfigurazio fitxategi `.rpmnew' edo `.rpmsave' bezala\n"
"gorde dira, orain aztertu ditzakezu behar diren ekintzak burutzeko:"
-#: ../rpmdrake_.c:777
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -850,32 +880,32 @@ msgstr ""
"Zenbait pakete ezin dira ondo\n"
"instalatu"
-#: ../rpmdrake_.c:778
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "guztia ondo instalatu da"
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ezin dira sorburuko paketeak jaso."
-#: ../rpmdrake_.c:798
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Barkatu, ezin dira sorburuko paketeak jaso."
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Aldatu euskarria"
-#: ../rpmdrake_.c:806
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Mesedez sartu \"%s\" izeneko euskarria [%s] gailuan"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalazioak huts egin du"
-#: ../rpmdrake_.c:815
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -883,36 +913,36 @@ msgstr ""
"Instalazioak hutsegin du, zenbait fitxategi falta dira.\n"
"Zure sorburuen datubasea eguneratu nahia izan dezakezu."
-#: ../rpmdrake_.c:818
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Itxoin mesedez, paketeak ezabatzen beste batzu eguneratu ahal daitezen..."
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Programa falta da"
-#: ../rpmdrake_.c:828
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Behar den programa bat falta da (grpmi). Egiaztatu zure instalazioa."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Guztia instalatuta dago."
-#: ../rpmdrake_.c:847
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Guztia dagoeneko instalatuta (hau gertatu daiteke?)"
-#: ../rpmdrake_.c:857
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Itxoin mesedez, paketeen datubasea irakurtzen..."
-#: ../rpmdrake_.c:895
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Itxaoin mesedez, paketeak ezabatzen..."
-#: ../rpmdrake_.c:910
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -924,7 +954,7 @@ msgstr ""
"Tresna honek zure konputagailutik ezabatu nahi duzun softwarea aukeratzen\n"
"lagunduko dizu."
-#: ../rpmdrake_.c:915
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -937,7 +967,7 @@ msgstr ""
"aukeratzen\n"
"lagunduko dizu."
-#: ../rpmdrake_.c:920
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1176,9 +1206,6 @@ msgstr "Instalatu Softwarea"
#~ msgid "Force"
#~ msgstr "Behartu"
-#~ msgid "Error..."
-#~ msgstr "Errorea..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Arazoak izan dira instalazioan zehar"
diff --git a/po/fi.po b/po/fi.po
index 78dd3b0e..1453b5e7 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-03-01 09:10EET\n"
"Last-Translator: Matias Griese <mahagr@utu.fi>\n"
"Language-Team: Finnish\n"
@@ -63,7 +63,7 @@ msgstr "polku liitoskohtaan: "
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Tietoturvapäivitykset"
@@ -81,7 +81,7 @@ msgstr "Valitse käytettävä peili:"
msgid "Login:"
msgstr "käyttäjätunnus:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
#, fuzzy
msgid "Password:"
msgstr "salasana:"
@@ -118,14 +118,16 @@ msgid "Type of source:"
msgstr "Lähteen tyyppi:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Peruuta"
@@ -185,45 +187,73 @@ msgstr "Vain päivitykset"
msgid "Please wait, updating media..."
msgstr "Riippuvuuksien tarkistus..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Määritelläänkö lähde?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Määritelläänkö lähde?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Lähde"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Siirrettävä"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Muokkaa"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Virhe..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Poistu"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -231,7 +261,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -362,11 +392,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -374,15 +404,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -392,12 +422,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Ei virhettä"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -406,7 +436,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -417,89 +447,89 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Haun tulokset"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Haun tulokset"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Odota sen aikaa kun rpm poistaa seuraavia paketteja:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Tuntematon sivu"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Odota sen aikaa kun rpm poistaa seuraavia paketteja:"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(tyhjä)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "normaalit päivitykset"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr "Nämä paketit pitää vielä asentaa, jotta kaikki toimisi hyvin:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -509,54 +539,54 @@ msgstr ""
"Riippuvuussuhteiden täyttämiseksi\n"
"seuraavat paketit poistetaan:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Paketit on jo asennettu"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -566,12 +596,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Lähde"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -584,7 +614,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -596,74 +626,74 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Tietoturvapäivitykset"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "normaalit päivitykset"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeUpdate"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 pakettia, 0 tavua"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Syvä koko"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Paikallinen"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "normaalit päivitykset"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -673,41 +703,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Etsi:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
#, fuzzy
msgid "Search"
msgstr "hae"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Asenna"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Järjestelmänhallinta "
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Pakettien asennus"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -715,23 +745,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -740,15 +770,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -761,48 +791,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "Lataa saatavilla olevien pakettien listat uudelleen"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Asennettavissa"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Siirrettävä"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -811,83 +845,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Paketit on jo asennettu"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Paketti on jo asennettu"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Huonoja, ei luettavia tai puuttuvia paketteja"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Asennettavissa"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Valitse paketit, jotka haluat päivittää"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Paketti on jo asennettu"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Odota sen aikaa kun rpm poistaa seuraavia paketteja:"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -895,7 +925,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -903,7 +933,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1127,9 +1157,6 @@ msgstr "Asenna kaikki"
#~ msgid "Force"
#~ msgstr "Pakota"
-#~ msgid "Error..."
-#~ msgstr "Virhe..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Ongelmia asennuksen aikana"
diff --git a/po/fr.po b/po/fr.po
index 0d7d00b2..7d44867f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -10,8 +10,8 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
-"PO-Revision-Date: 2002-08-29 17:03+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
+"PO-Revision-Date: 2002-08-30 20:14+0200\n"
"Last-Translator: David BAUDENS <baudens@mandrakesoft.com>\n"
"Language-Team: French\n"
"MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "Chemin ou point de montage :"
msgid "Removable device"
msgstr "Périphérique amovible"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Mises à jour de sécurité"
@@ -75,7 +75,7 @@ msgstr "Choisissez votre miroir..."
msgid "Login:"
msgstr "Login :"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Mot de passe :"
@@ -108,14 +108,16 @@ msgid "Type of source:"
msgstr "Type de source :"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Annuler"
@@ -167,43 +169,74 @@ msgstr "Mettre à jour"
msgid "Please wait, updating media..."
msgstr "Veuillez patienter, mise à jour des média..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+msgid "Configure proxies"
+msgstr "Configurer les serveurs mandataires (proxy)"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+"Si vous avez besoin d'utiliser un proxy (serveur mandataire),\n"
+"veuillez entrer le nom de la machine et un port optionnel\n"
+"(la syntaxe est : <nommachine[:port]>) :"
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr "Nom du serveur mandataire"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+"Vous pouvez aussi utiliser un nom d'utilisateur/mot de passe pour\n"
+"la connexion au serveur mandataire :"
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr "Nom d'utilisateur :"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Configurer les sources"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Activée ?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Source"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Supprimer"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Éditer"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Ajouter..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Mettre à jour..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr "Mandataire..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Sauver et quitter"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Quitter"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -214,7 +247,7 @@ msgstr ""
"\n"
"Êtes-vous d'accord pour continuer ?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -346,11 +379,11 @@ msgid "China"
msgstr "Chine"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "États-Unis"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -363,17 +396,17 @@ msgstr ""
"\n"
"Êtes-vous d'accord pour continuer ?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Veuillez patienter, téléchargement de la liste des miroirs à partir du site "
"web de MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Erreur pendant le téléchargement"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -389,11 +422,11 @@ msgstr ""
"indisponibles.\n"
"Veuillez réessayer ultérieurement."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Pas de miroir"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -407,7 +440,7 @@ msgstr ""
"d'entre elles est que l'architecture de votre processeur n'est\n"
"pas supportée par les Mises à jour Officielle Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Veuillez choisir le miroir."
@@ -415,71 +448,71 @@ msgstr "Veuillez choisir le miroir."
msgid "Other"
msgstr "Autre"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Non disponible)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Résultats de la recherche"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Résultats de la recherche (aucun)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Veuillez patienter, recherche en cours..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Arrêter"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Nouveaux"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Mises à jour"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr "Non sélectionnés"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr "Sélectionnés"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Plus d'informations sur le paquetage..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "L'un des paquetages suivants est nécessaire :"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Veuillez choisir"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "paquetage inconnu "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Veuillez patienter, énumération des paquetages..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(aucun)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Pas de mise à jour"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -489,11 +522,11 @@ msgstr ""
"pas de mises à jour pour les paquetages installés sur votre\n"
"ordinateur, ou bien que vous les avez déjà toutes installées."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Des paquetages supplémentaires doivent être supprimés"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -504,11 +537,11 @@ msgstr ""
"doivent aussi être supprimés :\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Des paquetages ne peuvent pas être enlevés"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -518,11 +551,11 @@ msgstr ""
"doivent être déselectionnés :\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Des paquetages supplémentaires sont nécessaires"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -532,11 +565,11 @@ msgstr ""
"doivent aussi être installés :\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Certains paquetages ne peuvent pas être installés"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -544,21 +577,21 @@ msgstr ""
"Désolé, le(s) paquetage(s) suivant(s) ne peuvent pas être sélectionnés :\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Certains paquetages doivent être enlevés"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Sélectionnés : %d Mo / Place libre sur disque : %d Mo"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Taille sélectionnée : %d Mo"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -573,12 +606,12 @@ msgstr ""
"Changelog :\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Source : %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -599,7 +632,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -618,67 +651,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Corrections de bogues"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Mises à jour normales"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Choix Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Tous les paquetages, classement alphabétique"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Tous les paquetages,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "par groupe"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "par taille"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "sélectionnés ou non"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "par source"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "nouveaux ou mis à jour"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "parmi les descriptions"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "parmi les noms"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "parmi les fichiers"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Informations maximales"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Informations normales"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -694,35 +727,35 @@ msgstr ""
"\n"
"Voulez-vous continuer ?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Rechercher :"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Chercher"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installer"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Suppression de Paquetages Logiciels"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Installation de Paquetages Logiciels"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -735,27 +768,27 @@ msgstr ""
"\n"
"Êtes-vous d'accord pour continuer ?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Veuillez patienter, connexion au miroir afin de mettre à jour les "
"informations sur les paquetages."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Erreur pendant la mise à jour du médium"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Une erreur fatale est survenue pendant la mise à jour des informations sur "
"les paquetages."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Comment choisir manuellement votre mirroir"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -769,16 +802,16 @@ msgstr ""
"\n"
"Puis, redémarrez MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Veuillez patienter, connexion au miroir afin de trouver les mises à jour."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Erreur pendant l'ajout du médium de mise à jour"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -798,46 +831,50 @@ msgstr ""
"\n"
"Voulez-vous essayer avec un autre miroir ?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Veuillez patienter, recherche des paquetages disponibles..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Tous les paquetages demandés ont été installés correctement."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Tout a été installé correctement"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "L'installation est terminée"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Examen de %s"
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Supprimer le .%s"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Utiliser le .%s"
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Ne rien faire"
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Examiner..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -851,7 +888,7 @@ msgstr ""
"`.rpmnew' ou `.rpmsave', vous pouvez maintenant les examiner\n"
"afin de décider ce que vous souhaitez en faire :"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -859,36 +896,32 @@ msgstr ""
"certains paquetages n'ont pas été installés\n"
"correctement"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "tout a été installé correctement"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr "Examiner..."
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Impossible d'obtenir les paquetages sources."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Impossible d'obtenir les paquetages sources, désolé."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Changement de médium"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Veuillez insérer le médium nommé \"%s\" dans le périphérique [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "L'installation a échoué"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -896,39 +929,39 @@ msgstr ""
"L'installation a échoué, certains fichiers sont introuvables.\n"
"Vous pouvez mettre à jour vos sources."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Veuillez patienter, suppression de paquetages afin de pouvoir installer les "
"autres..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Un programme manque"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
"Un programme indispensable (grpmi) est manquant. Vérifiez votre\n"
"installation."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Tout a déjà été installé."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Tout a déjà été installé (est-ce que c'est vraiment censé arriver ?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Veuillez patienter, lecture de la base de donnée des paquetages..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Veuillez patienter, suppression des paquetages..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -940,7 +973,7 @@ msgstr ""
"Cet outil va vous aider à choisir quel(s) logiciel(s) vous\n"
"souhaitez supprimer de votre ordinateur."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -952,7 +985,7 @@ msgstr ""
"Cet outil va vous aider à choisir les mises à jour que vous\n"
"souhaiter installer sur votre ordinateur."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/fr.pom b/po/fr.pom
index 70943ab6..9e6a9ccd 100644
--- a/po/fr.pom
+++ b/po/fr.pom
@@ -3,169 +3,174 @@ msgid "Server"
msgstr "Serveur"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Développement"
+#: ../../share/compssUsers:999
+msgid "Office Workstation"
+msgstr "Station de bureautique"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmes pour la bureautique : traitements de texte (kword, abiword), "
+"tableurs (kspread, gnumeric), visualiseur pdf, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Ordinateur réseau (client)"
+msgid "Workstation"
+msgstr "Station de travail"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
+msgid "Game station"
+msgstr "Jeux"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Bureautique"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr ""
+"Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Station de travail Gnome"
+msgid "Multimedia station"
+msgstr "Multimédia"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Outils pour votre Palm Pilot ou votre Visor"
+msgid "Sound and video playing/editing programs"
+msgstr "Programmes pour jouer/éditer du son et de la vidéo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Station de travail"
+msgid "Internet station"
+msgstr "Internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Pare Feu/Routeur"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Ensemble d'outils pour lire ou envoyer des courriers électronique (pine, "
+"mutt), des news (tin), et pour naviguer sur l'internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Serveur de Nom (DNS) et Serveur d'Information (NIS)"
+msgid "Network Computer (client)"
+msgstr "Ordinateur réseau (client)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programmes pour la bureautique : traitements de texte (kword, abiword), "
-"tableurs (kspread, gnumeric), visualiseur pdf, etc"
+msgid "Clients for different protocols including ssh"
+msgstr "Clients pour différents protocoles, dont ssh"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Outils audio : lecteurs mp3 ou midi, mixeurs, etc"
+msgid "Configuration"
+msgstr "Configuration"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-#, fuzzy
-msgid "Linux Standard Base. Third party applications support"
-msgstr "Paquetages conformes à la « Linux Standard Base »"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Outils pour faciliter la configuration de votre ordinateur"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
+msgid "Scientific Workstation"
+msgstr "Applications scientifiques"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Station de travail KDE"
+msgid "Console Tools"
+msgstr "Utilitaires console"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimédia - Vidéo"
+msgid "KDE Workstation"
+msgstr "Station de travail KDE"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
msgstr ""
-"Utilitaires pour le courrier électronique, les news, le web, le transfert de "
-"fichiers, les discussions en ligne"
+"Le K Desktop Environement, l'environnement de bureau de base avec sa "
+"collection d'outils"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Base de Données"
+msgid "Graphical Environment"
+msgstr "Environnement graphique"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
+msgid "Gnome Workstation"
+msgstr "Station de travail Gnome"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Outils pour faciliter la configuration de votre ordinateur"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Un environnement de bureau avec un ensemble d'applications et d'outils "
+"intuitifs"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimédia - Son"
+msgid "Other Graphical Desktops"
+msgstr "Autres Environnements de Bureau"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentation"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Utilitaires console"
-
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-#: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Serveur de courrier Postfix, serveur de news Inn"
+msgid "Development"
+msgstr "Développement"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Internet"
+msgid "C and C++ development libraries, programs and include files"
+msgstr ""
+"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Multimédia"
+msgid "Documentation"
+msgstr "Documentation"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configuration"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Livres et Howto's sur Linux et le Logiciel Libre"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Plus d'Environnements de Bureau (Gnome, IceWM)"
+msgid "LSB"
+msgstr "LSB"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
-msgstr ""
-"Le K Desktop Environement, l'environnement de bureau de base avec sa "
-"collection d'outils"
+#, fuzzy
+msgid "Linux Standard Base. Third party applications support"
+msgstr "Paquetages conformes à la « Linux Standard Base »"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Environnement graphique"
+msgid "Web/FTP"
+msgstr "Web/FTP"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -174,123 +179,115 @@ msgstr "Apache et Pro-ftpd"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Outils pour créer et graver des CD"
+msgid "Mail/Groupware/News"
+msgstr "E-mail/Groupware/News"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Station de bureautique"
+msgid "Postfix mail server, Inn news server"
+msgstr "Serveur de courrier Postfix, serveur de news Inn"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Database"
+msgstr "Base de Données"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programmes de graphisme comme Le Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Serveurs de bases de données PostgreSQL ou MySQL"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Firewall/Router"
+msgstr "Pare Feu/Routeur"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr ""
-"Bibliothèques de développement C et C++, programmes et fichiers d'en-tête"
+msgid "Internet gateway"
+msgstr "Passerelle internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Serveur réseau"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "E-mail/Groupware/News"
+msgid "Domain Name and Network Information Server"
+msgstr "Serveur de Nom (DNS) et Serveur d'Information (NIS)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Jeux"
+msgid "Network Computer server"
+msgstr "Serveur réseau"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Lecteurs et éditeurs vidéo"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Serveur NFS, serveur SMB, serveur Proxy (mandataire), serveur SSH"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimédia - Graphisme"
+msgid "Office"
+msgstr "Bureautique"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
msgstr ""
-"Programmes de divertissement : jeux d'arcade, de plateaux, de stratégie, etc"
+"Utilitaires pour le courrier électronique, les news, le web, le transfert de "
+"fichiers, les discussions en ligne"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Ensemble d'outils pour lire ou envoyer des courriers électronique (pine, "
-"mutt), des news (tin), et pour naviguer sur l'internet"
+msgid "Multimedia - Graphics"
+msgstr "Multimédia - Graphisme"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Gestion Financière"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programmes de graphisme comme Le Gimp"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un environnement de bureau avec un ensemble d'applications et d'outils "
-"intuitifs"
+msgid "Multimedia - Sound"
+msgstr "Multimédia - Son"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clients pour différents protocoles, dont ssh"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Outils audio : lecteurs mp3 ou midi, mixeurs, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr "LSB"
+msgid "Multimedia - Video"
+msgstr "Multimédia - Vidéo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Passerelle internet"
+msgid "Video players and editors"
+msgstr "Lecteurs et éditeurs vidéo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmes pour jouer/éditer du son et de la vidéo"
+msgid "Multimedia - CD Burning"
+msgstr "Multimédia - Gravure de CD"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Autres Environnements de Bureau"
+msgid "Tools to create and burn CD's"
+msgstr "Outils pour créer et graver des CD"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Éditeurs, interpréteurs, outils fichiers, terminaux"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Plus d'Environnements de Bureau (Gnome, IceWM)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmes pour gérer votre finance, comme gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -299,11 +296,15 @@ msgstr "Gestionnaire d'Informations Personnelles"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimédia - Gravure de CD"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Outils pour votre Palm Pilot ou votre Visor"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Applications scientifiques"
+msgid "Personal Finance"
+msgstr "Gestion Financière"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programmes pour gérer votre finance, comme gnucash"
diff --git a/po/ga.po b/po/ga.po
index 7e8d6a48..0d1100c3 100644
--- a/po/ga.po
+++ b/po/ga.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2000-08-24 12:00-0000\n"
"Last-Translator: Alastair McKinstry <mckinstry@computer.org>\n"
"Language-Team: Irish <ga@li.org>\n"
@@ -57,7 +57,7 @@ msgstr ""
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr ""
@@ -74,7 +74,7 @@ msgstr ""
msgid "Login:"
msgstr "logann:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Pasfhocal:"
@@ -108,14 +108,16 @@ msgid "Type of source:"
msgstr ""
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ceart go Leor"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Cealaigh"
@@ -179,43 +181,70 @@ msgstr ""
"Fan tamall\n"
"Checking dependencies"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+msgid "Configure proxies"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Bún"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Eagar"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Earraidh..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Éirigh"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -223,7 +252,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -354,11 +383,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -366,15 +395,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -384,12 +413,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Gan earraidh"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -398,7 +427,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr ""
@@ -406,149 +435,149 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Cuardaigh"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Cuardaigh"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Ag Feistiú"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr "Tóg gach rud"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Tóg gach rud"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Cinntigh, le do thoil"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Gan aithne"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ar bith)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "slí"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr ""
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -558,12 +587,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Bún"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -576,7 +605,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -588,72 +617,72 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr ""
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr ""
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Cuntasaí"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Áit"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr ""
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -663,37 +692,37 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Faigh:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Cuardaigh"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Ag Feistiú:"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr "Bainisteoir Bog-Earraí"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Bainisteoir Bog-Earraí"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -701,23 +730,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -726,15 +755,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -747,50 +776,54 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Ag Feistiú"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr ""
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -799,86 +832,82 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr ""
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Ag Feistiú"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
#, fuzzy
msgid "Please wait, reading packages database..."
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr ""
"Fan tamall\n"
"Ag scrios pacáistí"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -886,7 +915,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -894,7 +923,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -954,9 +983,6 @@ msgstr "Feist gach rud"
#~ msgid "Force"
#~ msgstr "Fórsáil"
-#~ msgid "Error..."
-#~ msgstr "Earraidh..."
-
#~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
#~ msgstr "úsáid: grpmi <[-noupgrade] pacáistí\n"
diff --git a/po/gl.po b/po/gl.po
index 1f3b1f9e..a58ec029 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2000-05-05 20:20+0200\n"
"Last-Translator: Jesús Bravo Álvarez <jba@pobox.com>\n"
"Language-Team: Galician <gpul-traduccion@ceu.fi.udc.es>\n"
@@ -56,7 +56,7 @@ msgstr ""
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
msgid "Login:"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Contrasinal:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr ""
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Aceptar"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Cancelar"
@@ -167,46 +169,74 @@ msgstr "Actualización de Linux-Mandrake"
msgid "Please wait, updating media..."
msgstr "Agarde, por favor"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Engadir usuario"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Engadir usuario"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
#, fuzzy
msgid "Source"
msgstr "Forzar"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Quitar"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Erro..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Saír"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -214,7 +244,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +373,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +385,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -373,11 +403,11 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr ""
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -386,7 +416,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr ""
@@ -394,146 +424,146 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Buscar"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Buscar"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Agarde, por favor"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Instalar sistema"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Des-seleccionar\n"
"Todos"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr ""
"Seleccionar\n"
"Todos"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Agarde, por favor"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr ""
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr ""
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr ""
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr ""
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr ""
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -543,12 +573,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Forzar"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -561,7 +591,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -573,71 +603,71 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr ""
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr ""
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "Desinstalando"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Descripcións"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Etiqueta"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Actualización de Linux-Mandrake"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -647,35 +677,35 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr ""
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Buscar"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalar"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr ""
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -683,23 +713,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -708,15 +738,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -729,47 +759,51 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalando "
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Quitar"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -778,78 +812,74 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr ""
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Instalando "
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Agarde, por favor"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -857,7 +887,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -865,7 +895,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -950,9 +980,6 @@ msgstr "Instalar"
#~ msgid "Force"
#~ msgstr "Forzar"
-#~ msgid "Error..."
-#~ msgstr "Erro..."
-
#~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
#~ msgstr "uso: grpmi <[-noupgrade] rpms>\n"
diff --git a/po/hr.po b/po/hr.po
index 86e6b9a7..8f3b730a 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-03-07 18:34CET\n"
"Last-Translator: Vlatko Kosturjak <kost@iname.com>\n"
"Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -61,7 +61,7 @@ msgstr "putanja ili mjesto za montiranje: "
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Sigurnosne dogradnje"
@@ -79,7 +79,7 @@ msgstr "Izaberite mirror:"
msgid "Login:"
msgstr "login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Lozinka:"
@@ -115,14 +115,16 @@ msgid "Type of source:"
msgstr "Tip izvora:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "U Redu"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Odustani"
@@ -181,45 +183,75 @@ msgstr "Nadogradi"
msgid "Please wait, updating media..."
msgstr "Provjeravam ovisnosti..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Podesiti izvor?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Proxy korisnik:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Korisnik:"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Podesiti izvor?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Izvor"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Prenosivi medij"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "A¾uriraj"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Gre¹ka..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Zavr¹i"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -227,7 +259,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -358,11 +390,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -370,15 +402,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -388,12 +420,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Nema gre¹ke"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -402,7 +434,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -413,95 +445,95 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Rezultati pretra¾ivanja"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Rezultati pretra¾ivanja"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Odznaèi\n"
"sve"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Izaberi sve"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Nepoznata stranica"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nema)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "normalne dogradnje"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr ""
"Ovi dodatni paketi su potrebni da budu instalirani u pravilu da sve radi "
"ispravno:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -511,54 +543,54 @@ msgstr ""
"U pravilu da zadovoljite sve ovisnosti,\n"
"slijedeæi paketi biti æe uklonjeni:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Paketa veæ instalirano"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -568,12 +600,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Izvor"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -586,7 +618,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -598,75 +630,75 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Sigurnosne dogradnje"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "normalne dogradnje"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeDogradnja"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 paketa, 0 byte-ova"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Veliè. Dub."
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Opisi"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Lokalno"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "normalne dogradnje"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -676,41 +708,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Pronaði:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
#, fuzzy
msgid "Search"
msgstr "Tra¾i"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instaliraj"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Dogradnja"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Upravitelj programima "
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Instalacija paketa"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -718,23 +750,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -743,15 +775,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -764,48 +796,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "ponovno uèitaj popise raspolo¾ivih aplikacija"
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "moguæe instalirati"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Prenosivi medij"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -814,83 +850,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Paketa veæ instalirano"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Paket je veæ instaliran"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Lo¹i, neèitljivi ili nisu pronaðeni paketi"
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "moguæe instalirati"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Molimo odaberite pakete koje ¾elite dograditi"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Paket je veæ instaliran"
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Molimo prièekajte dok rpm uklanja navedene pakete:"
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -898,7 +930,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -906,7 +938,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1130,9 +1162,6 @@ msgstr "Instaliraj sve"
#~ msgid "Force"
#~ msgstr "Prisili"
-#~ msgid "Error..."
-#~ msgstr "Gre¹ka..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Dogodili su se problemi prilikom instalacije"
@@ -1433,9 +1462,6 @@ msgstr "Instaliraj sve"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp Proxy:"
-#~ msgid "Proxy username:"
-#~ msgstr "Proxy korisnik:"
-
#~ msgid "Proxy password:"
#~ msgstr "Proxy Lozinka:"
@@ -1475,9 +1501,6 @@ msgstr "Instaliraj sve"
#~ msgid "Choose Packages"
#~ msgstr "Izaberite pakete"
-#~ msgid "Username:"
-#~ msgstr "Korisnik:"
-
#~ msgid "Security"
#~ msgstr "Sigurnost"
diff --git a/po/hu.po b/po/hu.po
index 46021b04..84419bc5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-30 00:35+0000\n"
"Last-Translator: Arpad Biro <biro_arpad@yahoo.com>\n"
"Language-Team: Hungarian\n"
@@ -57,7 +57,7 @@ msgstr "Útvonal vagy csatolási pont:"
msgid "Removable device"
msgstr "Cserélhetõ eszköz"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Biztonsági frissítések"
@@ -73,7 +73,7 @@ msgstr "Válasszon ki egy tükröt..."
msgid "Login:"
msgstr "Felhasználónév:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Jelszó:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "Az adatforrás típusa:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Mégsem"
@@ -163,43 +165,71 @@ msgstr "Frissítés"
msgid "Please wait, updating media..."
msgstr "Az adatforrások frissítése folyamatban..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Források beállítása"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Források beállítása"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Engedélyezve?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Forrás"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Eltávolítás"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Módosítás"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Felvétel..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Frissítés..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Hiba..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Mentés és kilépés"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Kilépés"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -210,7 +240,7 @@ msgstr ""
"\n"
"Kívánja folytatni?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -341,11 +371,11 @@ msgid "China"
msgstr "Kína"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Amerikai Egyesült Államok"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,15 +387,15 @@ msgstr ""
"\n"
"Kívánja folytatni?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "A tükörkiszolgálók listájának letöltése a MandrakeSoft weboldaláról..."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Hiba a letöltés közben"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -380,11 +410,11 @@ msgstr ""
"Elképzelhetõ, hogy a hálózat vagy a MandrakeSoft-weboldal nem\n"
"elérhetõ. Próbálja meg késõbb."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Tükörkiszolgáló nem található"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -398,7 +428,7 @@ msgstr ""
"a hivatalos Mandrake Linux-frissítések nem támogatják az Ön\n"
"gépében levõ processzort."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Válassza ki a kívánt tükörkiszolgálót."
@@ -406,23 +436,23 @@ msgstr "Válassza ki a kívánt tükörkiszolgálót."
msgid "Other"
msgstr "Egyéb"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Nem elérhetõ)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Keresési eredmény"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Keresési eredmény (nincs)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Keresés..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Leállítás"
@@ -430,51 +460,51 @@ msgstr "Leállítás"
# "by update availability"; the first lists the packages you can "add" to your computer
# (new packages), the second lists the packages which are newer versions of already
# installed packages
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Telepíthetõ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Frissíthetõ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "További információ a csomagról..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Szükség van a következõ csomagok valamelyikére:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Válasszon"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "ismeretlen csomag"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "A csomagok listázása folyamatban..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(egyik sem)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Frissítés nem található"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -484,11 +514,11 @@ msgstr ""
"gépére telepített csomagokhoz frissítés, vagy pedig már telepítve\n"
"lett az összes."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Néhány további csomagot is el kell távolítani"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -497,11 +527,11 @@ msgstr ""
"A függõségeik miatt a következõ csomago(ka)t is el kell távolítani:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Bizonyos csomagokat nem lehet eltávolítani"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -510,11 +540,11 @@ msgstr ""
"A függõségeik miatt a következõ csomag(ok) kijelölését törölni kell:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Szükség van további csomagokra"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -523,11 +553,11 @@ msgstr ""
"A függõségek miatt a következõ csomago(ka)t is telepíteni kell:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Bizonyos csomagokat nem lehet telepíteni"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -535,21 +565,21 @@ msgstr ""
"A következõ csomag(ok) nem választható(k):\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Bizonyos csomagokat el kell távolítani"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Kijelölve: %d MB / Üres hely a lemezen: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Kijelölve: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -564,12 +594,12 @@ msgstr ""
"Változások jegyzéke:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Forrás: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -590,7 +620,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -609,71 +639,71 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Hibajavító frissítések"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normál frissítések"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake-válogatás"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Az összes csomag, ábécérendben"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Az összes csomag,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "csoport szerint"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "méret szerint"
# it's a sort method
# "selected or not"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "kijelölési állapot szerint"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "forrás alapján"
# it's a sort method
# "new or update"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "telepítettség alapján"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "a leírásokban"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "a nevekben"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "a fájlokban"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Maximális mennyiségû információ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Normál mennyiségû információ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -689,35 +719,35 @@ msgstr ""
"\n"
"Kívánja folytatni?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Keresés:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Keresés"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Telepítés"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake-frissítés"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Szoftvercsomag-eltávolítás"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Szoftvercsomag-telepítés"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -729,23 +759,23 @@ msgstr ""
"\n"
"Kívánja folytatni?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Kapcsolódás a tükörkiszolgálóhoz; csomaginformációk lekérdezése..."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Hiba az adatforrás frissítése közben"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Helyrehozhatatlan hiba történt a csomaginformációk frissítése közben."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Hogyan lehet tükörkiszolgálót választani saját kezûleg"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -759,15 +789,15 @@ msgstr ""
"\n"
"Ez után indítsa el újra a MandrakeUpdate programot."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Kapcsolódás a tükörkiszolgálóhoz; a frissítõcsomagok inicializálása..."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Hiba a frissítési adatforrás felvétele közben"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -789,46 +819,50 @@ msgstr ""
"\n"
"Megpróbál egy másik tükörkiszolgálót?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "A rendelkezésre álló csomagok lekérdezése..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Az összes kért csomag telepítve lett."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Sikeresen telepítve lett minden"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "A telepítés befejezõdött"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "%s vizsgálata"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr ".%s eltávolítása"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ".%s használata fõfájlként"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Ne tegyen semmit"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Vizsgálat..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -841,7 +875,7 @@ msgstr ""
"Létre lett hozva néhány beállítási fájl \".rpmnew\" vagy \".rpmsave\"\n"
"néven; ha kívánja, tekintse meg a tartalmukat."
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -849,36 +883,32 @@ msgstr ""
"bizonyos csomagokat nem sikerült\n"
"telepíteni"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "megfelelõen telepítve lett minden"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "Vizsgálat..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "A forráscsomagok letöltése sikertelen."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "A forráscsomagok letöltése sikertelen."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Adatforrás váltása"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Helyezze be a(z) \"%s\" nevû adatforrást a(z) \"%s\" eszközbe"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "A telepítés nem sikerült"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -886,37 +916,37 @@ msgstr ""
"A telepítés sikertelen volt, mivel bizonyos fájlok\n"
"nem találhatók. Esetleg frissítse a forrás-adatbázist."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Csomagok eltávolítása annak érdekében, hogy más csomagokat frissíteni "
"lehessen..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Egy program nem található"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Egy szükséges program (grpmi) nem található. Ellenõrizze a telepítést."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Már minden telepítve van."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Már minden telepítve van (esetleg hiba történt?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Csomag-adatbázis olvasása..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Csomagok eltávolítása folyamatban..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -928,7 +958,7 @@ msgstr ""
"Ezzel a programmal kiválaszthatja, mely szoftvertermékeket kívánja\n"
"eltávolítani a gépérõl."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -940,7 +970,7 @@ msgstr ""
"Ezzel a programmal kiválaszthatja, mely frissítéseket kívánja\n"
"telepíteni a gépére."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1187,9 +1217,6 @@ msgstr "Szoftvertelepítés"
#~ msgid "Force"
#~ msgstr "Akkor is"
-#~ msgid "Error..."
-#~ msgstr "Hiba..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Problémák adódtak a telepítés során"
diff --git a/po/id.po b/po/id.po
index ef90ec4f..6e3bf338 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-17 13:54+0900\n"
"Last-Translator: Budi Rachmanto <rac@linux-mandrake.com>\n"
"Language-Team: Bahasa Indonesia <id@li.org>\n"
@@ -56,7 +56,7 @@ msgstr "Path atau titik mount:"
msgid "Removable device"
msgstr "Perangkat portabel"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Update sekuriti"
@@ -72,7 +72,7 @@ msgstr "Pilih mirror..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Password:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "Jenis source:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Batal"
@@ -160,43 +162,73 @@ msgstr "Update"
msgid "Please wait, updating media..."
msgstr "Media sedang di-update..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfigurasikan source"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Username proxy:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Username:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Konfigurasikan source"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Diaktifkan?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sumber"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Hapus"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Edit"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Tambahkan..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Update..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Error..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Simpan dan keluar"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Keluar"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +239,7 @@ msgstr ""
"\n"
"Lanjutkan?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -338,11 +370,11 @@ msgid "China"
msgstr "Cina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Amerika Serikat"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -354,15 +386,15 @@ msgstr ""
"\n"
"Jalan terus?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Tunggu, alamat mirror sedang diambil dari website MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Error saat download"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -377,11 +409,11 @@ msgstr ""
"Jaringan, atau website MandrakeSoft mungkin tak dapat dipakai.\n"
"Cobalah lagi nanti."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Tiada mirror"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -394,7 +426,7 @@ msgstr ""
"Sebabnya mungkin banyak; yang paling sering yaitu jika arsitektur\n"
"prosesor Anda tak ditunjang oleh Update Resmi Linux Mandrake."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Pilih mirror yang diinginkan."
@@ -402,75 +434,75 @@ msgstr "Pilih mirror yang diinginkan."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Tak tersedia)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Hasil pencarian"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Hasil pencarian (tak ada)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Tunggu, sedang dicari..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Stop"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Dapat ditambahkan"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Dapat di-upgrade"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Kosongkan\n"
"pilihan"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Pilih semua"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Satu di antara paket berikut diperlukan:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Pilihlah"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "paket tak dikenal "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Tunggu, daftar paket sedang dibuat..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(tiada)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Tiada update"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -479,22 +511,22 @@ msgstr ""
"Daftar update kosong. Artinya tidak ada update untuk paket yang\n"
"terinstal di komputer Anda, atau Anda sudah menginstalnya."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Beberapa paket tambahan perlu dihapus"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
"\n"
msgstr "Untuk memenuhi dependensi, paket-paket berikut perlu dihapus:\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Beberapa paket tak dapat dihapus"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -503,22 +535,22 @@ msgstr ""
"Karena aspek ketergantungan, paket berikut harus tak dipilih:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Dibutuhkan paket tambahan"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr "Untuk memenuhi ketergantungan, paket berikut juga harus diinstal:\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Beberapa paket tak dapat diinstal"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -526,21 +558,21 @@ msgstr ""
"Maaf, paket berikut tak dapat dipilih:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Beberapa paket perlu dihapus"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Terpilih: %d MB / Tersedia: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Terpilih: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -550,12 +582,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Sumber"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -576,7 +608,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -595,68 +627,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Update pembetulan kutu"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Update normal"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Pilihan Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Semua paket, menurut abjad"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Semua paket,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "menurut grup"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "menurut ukuran"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "menurut status pilihan"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "menurut repositori sumber"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "menurut kesediaan update"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "dalam keterangan"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "dalam nama"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "dalam file"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Update normal"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -671,35 +703,35 @@ msgstr ""
"\n"
"Jalan terus?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Cari:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Cari"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Install"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Update Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Penghapusan Paket Software"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalasi Paket Software"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -711,23 +743,23 @@ msgstr ""
"\n"
"Jalan terus?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Mirror sedang dihubungi untuk meng-update info paket."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Error saat meng-update media"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Ada error yang tak dapat dipulihkan saat meng-update info paket."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Cara memilih mirror"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -741,15 +773,15 @@ msgstr ""
"\n"
"Lalu, restart MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Mirror sedang dihubungi untuk memulai update paket."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Error saat penambahan media"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -769,48 +801,52 @@ msgstr ""
"\n"
"Do you want to try another mirror?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Tunggu, sedang mencari paket yg tersedia..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalasi gagal"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Hapus"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -819,44 +855,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Beberapa paket tak dapat diinstal"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Semua sudah diinstal."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Gagal mendapatkan paket source"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Gagal mendapatkan paket source, maaf."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Ubah media"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Masukkan media \"%s\" di device [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalasi gagal"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -864,35 +896,35 @@ msgstr ""
"Instalasi gagal, beberapa file hilang.\n"
"Anda mungkin perlu meng-update database sumber."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Tunggu, paket sedang dihapus agar yg lain dapat di-upgrade..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Program tak ditemukan"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Tak ditemukan: grpmi. Cek instalasi Anda."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Semua sudah diinstal."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Semua sudah diinstal (inikah yg diharapkan?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Tunggu, database paket sedang dibaca..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Tunggu, paket sedang dihapus..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -904,7 +936,7 @@ msgstr ""
"Perkakas ini membantu Anda memilih piranti lunak yang ingin Anda hapus\n"
"dari komputer Anda."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -916,7 +948,7 @@ msgstr ""
"Perkakas ini membantu Anda memilih update yang ingin Anda instal di\n"
"komputer Anda."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1167,9 +1199,6 @@ msgstr "Install Software"
#~ msgid "Force"
#~ msgstr "Force"
-#~ msgid "Error..."
-#~ msgstr "Error..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Ada masalah saat instalasi"
@@ -1466,9 +1495,6 @@ msgstr "Install Software"
#~ msgid "Ftp Proxy:"
#~ msgstr "Proxy ftp:"
-#~ msgid "Proxy username:"
-#~ msgstr "Username proxy:"
-
#~ msgid "Proxy password:"
#~ msgstr "Password proxy:"
@@ -1508,9 +1534,6 @@ msgstr "Install Software"
#~ msgid "Choose Packages"
#~ msgstr "Pilih Paket"
-#~ msgid "Username:"
-#~ msgstr "Username:"
-
#~ msgid "Security"
#~ msgstr "Sekuriti"
diff --git a/po/is.po b/po/is.po
index d56f29e3..b5967d10 100644
--- a/po/is.po
+++ b/po/is.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 1999-04-18 23:01-0400\n"
"Last-Translator: Thorarinn R. Einarsson <thori@mindspring.com>\n"
"Language-Team: is <kde-isl@mmedia.is>\n"
@@ -56,7 +56,7 @@ msgstr ""
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr ""
@@ -72,7 +72,7 @@ msgstr ""
msgid "Login:"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Lykilorð:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr ""
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Í lagi"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Hætta við"
@@ -167,46 +169,74 @@ msgstr "Linux-Mandrake uppfærsla"
msgid "Please wait, updating media..."
msgstr "Augnablik..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Bæta við notanda"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Bæta við notanda"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
#, fuzzy
msgid "Source"
msgstr "Neyða"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Fjarlægja"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Villa..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Hætta"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -214,7 +244,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +373,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +385,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -373,11 +403,11 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr ""
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -386,7 +416,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr ""
@@ -394,144 +424,144 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Leita"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Leita"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Augnablik..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Setja kerfið inn"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Velja\n"
"enga"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Velja alla"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Augnablik..."
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr ""
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr ""
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr ""
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr ""
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr ""
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -541,12 +571,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Neyða"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -559,7 +589,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -571,71 +601,71 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr ""
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr ""
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "Fjarlægja"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Lýsingar"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Nafn"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Linux-Mandrake uppfærsla"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -645,37 +675,37 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr ""
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Leita"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
#, fuzzy
msgid "Install"
msgstr "Set inn:"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
#, fuzzy
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*,*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr ""
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -683,23 +713,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -708,15 +738,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -729,48 +759,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Set inn"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Fjarlægja"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-helvetica-bold-r-*-*-*-140-*-*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -779,78 +813,74 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr ""
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Set inn"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Augnablik..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -858,7 +888,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -866,7 +896,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -947,9 +977,6 @@ msgstr "Set inn:"
#~ msgid "Force"
#~ msgstr "Neyða"
-#~ msgid "Error..."
-#~ msgstr "Villa..."
-
#~ msgid "usage: grpmi <[-noupgrade] rpms>\n"
#~ msgstr "notkun: grpmi <[-noupgrade] rpms>\n"
diff --git a/po/it.po b/po/it.po
index 117028d9..292836e3 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-24 19:56+0200\n"
"Last-Translator: Simone Riccio <s.riccio@aeb-informatica.it>\n"
"Language-Team: Italian <IT@li.org>\n"
@@ -59,7 +59,7 @@ msgstr "Percorso o punto di mount:"
msgid "Removable device"
msgstr "Dispositivo removibile"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Aggiornamenti sulla sicurezza"
@@ -75,7 +75,7 @@ msgstr "Scegli un mirror..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Password:"
@@ -108,14 +108,16 @@ msgid "Type of source:"
msgstr "Tipo di sorgente:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Annulla"
@@ -165,43 +167,73 @@ msgstr "Aggiorna"
msgid "Please wait, updating media..."
msgstr "Attendere, aggiornamento supporto..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Configura sorgenti"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Username per il Proxy:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Nome utente:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Configura sorgenti"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Abilitato?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sorgente"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Rimuovi"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Modifica"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Aggiungi..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Aggiorna..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Errore..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Salva ed esci"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Esci"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -212,7 +244,7 @@ msgstr ""
"\n"
"Andiamo avanti?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -346,11 +378,11 @@ msgid "China"
msgstr "Cina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Stati Uniti"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -362,16 +394,16 @@ msgstr ""
"\n"
"Proseguiamo?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Attendere, scaricamento degli indirizzi dei mirror dal sito di MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Errore durante lo scaricamento"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -386,11 +418,11 @@ msgstr ""
"La rete, o il sito di MandrakeSoft, sono probabilmente non disponibili.\n"
"Potresti riprovare più tardi."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nessun mirror"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -404,7 +436,7 @@ msgstr ""
"il caso nel quale l'architettura del tuo processore non è supportata\n"
"dagli update ufficiali di Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Scegli il mirror che preferisci."
@@ -412,76 +444,76 @@ msgstr "Scegli il mirror che preferisci."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Non disponibile)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Risultati della Ricerca"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Risultati della Ricerca (nessuno)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Attendere, ricerca nei file..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Aggiungibile"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Aggiornabile"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Scarta\n"
"tutto"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Seleziona tutto"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Uno dei seguenti pacchetti è necessario:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Perfavore scegli"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pacchetto sconosciuto "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Attendere, creo una lista di pacchetti..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nessuno)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Nessun aggiornamento"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -491,11 +523,11 @@ msgstr ""
"non ci sono aggiornamenti per i pacchetti installati sul tuo computer,\n"
"o che li hai già installati tutti."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Devo rimuovere altri pacchetti"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -505,11 +537,11 @@ msgstr ""
"rimossi:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Alcuni pacchetti non possono essere rimossi"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -519,11 +551,11 @@ msgstr ""
"deselezionati ora:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Sono necessari altri pacchetti"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -533,11 +565,11 @@ msgstr ""
"essere installati:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Alcuni pacchetti non possono essere installati"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -545,21 +577,21 @@ msgstr ""
"Spiacente, il seguenti pacchetti non possono essere selezionati:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Alcuni pacchetti devono essere rimossi"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Selezionati: %d MB / Disponibili: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Dimensione selezione: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -569,12 +601,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Sorgente"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -595,7 +627,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -614,70 +646,70 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Correzione bug"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Aggiornamenti comuni"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Scelte di Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Tutti i pacchetti, alfabeticamente"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Tutti i pacchetti,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "per gruppo"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "per dimensione"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "per selezione"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "per repositorio di sorgente"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "per disponibilità aggiornamenti"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Descrizioni"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "File locali"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Aggiornamenti comuni"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -692,35 +724,35 @@ msgstr ""
"\n"
"Proseguiamo?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Trova:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Cerca"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installa"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Rimozione Pacchetti Software"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Installazione Pacchetti Software"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -732,26 +764,26 @@ msgstr ""
"\n"
"Proseguiamo?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Attendere, contatto il mirror per aggiornare le informazioni sui pacchetti."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Errore nell'aggiornamento del supporto"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Si è verificato un errore irreversibile durante l'aggiornamento delle "
"informazioni sui pacchetti."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -760,16 +792,16 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Attendere. contatto il mirror per inizializzare i pacchetti di aggiornamento."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Errore durante l'aggiunta del supporto per gli aggiornamenti"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -791,48 +823,52 @@ msgstr ""
"\n"
"Vuoi provare un altro mirror?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Attendi, cerco i pacchetti disponibili..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Installazione fallita"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Rimuovi"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -841,45 +877,41 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Alcuni pacchetti non possono essere installati"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Guarda che è già tutto installato."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Impossibile recuperare i pacchetti sorgente."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Impossibile recuperare i pacchetti sorgente, mi spiace."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Cambia supporto"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
"Cortesemente, inserisci il supporto etichettato \"%s\" nel dispositivo [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Installazione fallita"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -887,38 +919,38 @@ msgstr ""
"Installazione fallita, alcuni file mancano.\n"
"Potrebbe essere una una buona idea aggiornare il database delle sorgenti."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Attendi, rimuovo dei pacchetti per consentire ad altri di essere "
"aggiornati..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Guarda che è già tutto installato."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
"Guarda che è già tutto installato (ma tutto questo deve veramente succedere?)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Attendi, consulto il database dei pacchetti..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Attendere, sto rimuovendo i pacchetti..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -930,7 +962,7 @@ msgstr ""
"Questa utilità ti aiuterà a scegliere che software vuoi rimuovere dal\n"
"tuo computer."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -943,7 +975,7 @@ msgstr ""
"sul tuo\n"
"computer."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1186,9 +1218,6 @@ msgstr "Installa tutto"
#~ msgid "Force"
#~ msgstr "Forza"
-#~ msgid "Error..."
-#~ msgstr "Errore..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Si sono verificati dei problemi durante l'installazione"
@@ -1488,9 +1517,6 @@ msgstr "Installa tutto"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp Proxy:"
-#~ msgid "Proxy username:"
-#~ msgstr "Username per il Proxy:"
-
#~ msgid "Proxy password:"
#~ msgstr "Password per il Proxy:"
@@ -1530,9 +1556,6 @@ msgstr "Installa tutto"
#~ msgid "Choose Packages"
#~ msgstr "Scegli i pacchetti"
-#~ msgid "Username:"
-#~ msgstr "Nome utente:"
-
#~ msgid "Security"
#~ msgstr "Sicurezza"
diff --git a/po/it.pom b/po/it.pom
index 0355b921..caa5b7d9 100644
--- a/po/it.pom
+++ b/po/it.pom
@@ -3,166 +3,171 @@ msgid "Server"
msgstr "Server"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
-msgid "Development"
-msgstr "Sviluppo"
-
-# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Web/FTP"
-msgstr "Web/FTP"
+msgid "Office Workstation"
+msgstr "Postazione di lavoro con programmi Office"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer (client)"
-msgstr "Computer connesso alla rete (cliente)"
+msgid ""
+"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
+"gnumeric), pdf viewers, etc"
+msgstr ""
+"Programmi Office: wordprocessor (kword, abiword), fogli elettronici "
+"(kspread, gnumeric), visualizzatori pdf, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "NFS server, SMB server, Proxy server, ssh server"
-msgstr "Server NFS, server SMB, server proxy, server SSH"
+msgid "Workstation"
+msgstr "Workstation"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office"
-msgstr "Office"
+msgid "Game station"
+msgstr "Computer predisposto per i giochi"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome Workstation"
-msgstr "Workstation grafica con GNOME"
+msgid "Amusement programs: arcade, boards, strategy, etc"
+msgstr "Programmi di svago: azione, da tavolo, strategia, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools for your Palm Pilot or your Visor"
-msgstr "Utilità per il tuo Palm Pilot o Visor"
+msgid "Multimedia station"
+msgstr "Computer multimediale"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Workstation"
-msgstr "Workstation"
+msgid "Sound and video playing/editing programs"
+msgstr "Programmi di riproduzione/modifica audio e video"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Firewall/Router"
-msgstr "Firewall/Router"
+msgid "Internet station"
+msgstr "Computer con accesso a Internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Domain Name and Network Information Server"
-msgstr "Server di nomi di dominio (DNS) e informazioni sulla rete"
+msgid ""
+"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
+"browse the Web"
+msgstr ""
+"Gruppo di programmi per leggere e inviare posta e news (pine, mutt, tin..) e "
+"per navigare il Web"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Office programs: wordprocessors (kword, abiword), spreadsheets (kspread, "
-"gnumeric), pdf viewers, etc"
-msgstr ""
-"Programmi Office: wordprocessor (kword, abiword), fogli elettronici "
-"(kspread, gnumeric), visualizzatori pdf, etc"
+msgid "Network Computer (client)"
+msgstr "Computer connesso alla rete (cliente)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Audio-related tools: mp3 or midi players, mixers, etc"
-msgstr "Utilità audio: riproduttori mp3 o midi, mixer, etc"
+msgid "Clients for different protocols including ssh"
+msgstr "Clienti per vari protocolli, incluso ssh"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Linux Standard Base. Third party applications support"
-msgstr ""
+msgid "Configuration"
+msgstr "Configurazione"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Books and Howto's on Linux and Free Software"
-msgstr "Libri e Howto su Linux e il software libero"
+msgid "Tools to ease the configuration of your computer"
+msgstr "Strumenti per semplificare la configurazione del computer"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "KDE Workstation"
-msgstr "Workstation grafica con KDE"
+msgid "Scientific Workstation"
+msgstr "Workstation scientifica"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgid "Console Tools"
+msgstr "Programmi da linea di comando"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Video"
-msgstr "Multimedia - Video"
+msgid "Editors, shells, file tools, terminals"
+msgstr "Editor, shell, programmi di utilità riguardo i file, terminali"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Set of tools for mail, news, web, file transfer, and chat"
-msgstr "Set di utilità per posta, news, web, file transfer, e chat"
+msgid "KDE Workstation"
+msgstr "Workstation grafica con KDE"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Database"
-msgstr "Database"
+msgid ""
+"The K Desktop Environment, the basic graphical environment with a collection "
+"of accompanying tools"
+msgstr ""
+"Il K Desktop Environment, l'ambiente grafico di base con una collezione di "
+"utilità che lo accompagnano"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "PostgreSQL or MySQL database server"
-msgstr "Server di database PostgreSQL o MySQL"
+msgid "Graphical Environment"
+msgstr "Ambiente grafico"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to ease the configuration of your computer"
-msgstr "Strumenti per semplificare la configurazione del computer"
+msgid "Gnome Workstation"
+msgstr "Workstation grafica con GNOME"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Sound"
-msgstr "Multimedia - Suono"
+msgid ""
+"A graphical environment with user-friendly set of applications and desktop "
+"tools"
+msgstr ""
+"Un ambiente grafico con un set di applicazioni user-friendly e utilità per "
+"il desktop"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Documentation"
-msgstr "Documentazione"
+msgid "Other Graphical Desktops"
+msgstr "Altri desktop grafici"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Console Tools"
-msgstr "Programmi da linea di comando"
+msgid "Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Icewm, Window Maker, Enlightenment, Fvwm, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Postfix mail server, Inn news server"
-msgstr "Server di posta Postfix, server di news Inn"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+msgid "Development"
+msgstr "Sviluppo"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet station"
-msgstr "Computer con accesso a Internet"
+msgid "C and C++ development libraries, programs and include files"
+msgstr "Librerie di sviluppo, programmi e file include per C e C++"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia station"
-msgstr "Computer multimediale"
+msgid "Documentation"
+msgstr "Documentazione"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Configuration"
-msgstr "Configurazione"
+msgid "Books and Howto's on Linux and Free Software"
+msgstr "Libri e Howto su Linux e il software libero"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "More Graphical Desktops (Gnome, IceWM)"
-msgstr "Altri desktop grafici (Gnome, IceWM)"
+msgid "LSB"
+msgstr ""
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"The K Desktop Environment, the basic graphical environment with a collection "
-"of accompanying tools"
+msgid "Linux Standard Base. Third party applications support"
msgstr ""
-"Il K Desktop Environment, l'ambiente grafico di base con una collezione di "
-"utilità che lo accompagnano"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphical Environment"
-msgstr "Ambiente grafico"
+msgid "Web/FTP"
+msgstr "Web/FTP"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -171,121 +176,113 @@ msgstr "Apache e Pro-ftpd"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Tools to create and burn CD's"
-msgstr "Utilità per creare e masterizzare CD"
+msgid "Mail/Groupware/News"
+msgstr "Posta/Groupware/Newsgroup"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Office Workstation"
-msgstr "Postazione di lavoro con programmi Office"
+msgid "Postfix mail server, Inn news server"
+msgstr "Server di posta Postfix, server di news Inn"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
-msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
+msgid "Database"
+msgstr "Database"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Graphics programs such as The Gimp"
-msgstr "Programmi grafici come The Gimp"
+msgid "PostgreSQL or MySQL database server"
+msgstr "Server di database PostgreSQL o MySQL"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "DNS/NIS "
-msgstr "DNS/NIS"
+msgid "Firewall/Router"
+msgstr "Firewall/Router"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "C and C++ development libraries, programs and include files"
-msgstr "Librerie di sviluppo, programmi e file include per C e C++"
+msgid "Internet gateway"
+msgstr "Gateway per Internet"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Network Computer server"
-msgstr "Server di rete"
+msgid "DNS/NIS "
+msgstr "DNS/NIS"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Mail/Groupware/News"
-msgstr "Posta/Groupware/Newsgroup"
+msgid "Domain Name and Network Information Server"
+msgstr "Server di nomi di dominio (DNS) e informazioni sulla rete"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Game station"
-msgstr "Computer predisposto per i giochi"
+msgid "Network Computer server"
+msgstr "Server di rete"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Video players and editors"
-msgstr "Riproduttori video e programmi di editing"
+msgid "NFS server, SMB server, Proxy server, ssh server"
+msgstr "Server NFS, server SMB, server proxy, server SSH"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - Graphics"
-msgstr "Multimedia - Grafica"
+msgid "Office"
+msgstr "Office"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Amusement programs: arcade, boards, strategy, etc"
-msgstr "Programmi di svago: azione, da tavolo, strategia, etc"
+msgid "Set of tools for mail, news, web, file transfer, and chat"
+msgstr "Set di utilità per posta, news, web, file transfer, e chat"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"Set of tools to read and send mail and news (pine, mutt, tin..) and to "
-"browse the Web"
-msgstr ""
-"Gruppo di programmi per leggere e inviare posta e news (pine, mutt, tin..) e "
-"per navigare il Web"
+msgid "Multimedia - Graphics"
+msgstr "Multimedia - Grafica"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Personal Finance"
-msgstr "Finanza Personale"
+msgid "Graphics programs such as The Gimp"
+msgstr "Programmi grafici come The Gimp"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid ""
-"A graphical environment with user-friendly set of applications and desktop "
-"tools"
-msgstr ""
-"Un ambiente grafico con un set di applicazioni user-friendly e utilità per "
-"il desktop"
+msgid "Multimedia - Sound"
+msgstr "Multimedia - Suono"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Clients for different protocols including ssh"
-msgstr "Clienti per vari protocolli, incluso ssh"
+msgid "Audio-related tools: mp3 or midi players, mixers, etc"
+msgstr "Utilità audio: riproduttori mp3 o midi, mixer, etc"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "LSB"
-msgstr ""
+msgid "Multimedia - Video"
+msgstr "Multimedia - Video"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Internet gateway"
-msgstr "Gateway per Internet"
+msgid "Video players and editors"
+msgstr "Riproduttori video e programmi di editing"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Sound and video playing/editing programs"
-msgstr "Programmi di riproduzione/modifica audio e video"
+msgid "Multimedia - CD Burning"
+msgstr "Multimedia - Masterizzazione CD"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Other Graphical Desktops"
-msgstr "Altri desktop grafici"
+msgid "Tools to create and burn CD's"
+msgstr "Utilità per creare e masterizzare CD"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Editors, shells, file tools, terminals"
-msgstr "Editor, shell, programmi di utilità riguardo i file, terminali"
+msgid "More Graphical Desktops (Gnome, IceWM)"
+msgstr "Altri desktop grafici (Gnome, IceWM)"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Programs to manage your finance, such as gnucash"
-msgstr "Programmi per gestire le tue finanze, come gnucash"
+msgid "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc"
+msgstr "Gnome, Icewm, Window Maker, Enlightenment, Fvwm, etc."
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
@@ -294,11 +291,15 @@ msgstr "Gestione di informazioni personali"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Multimedia - CD Burning"
-msgstr "Multimedia - Masterizzazione CD"
+msgid "Tools for your Palm Pilot or your Visor"
+msgstr "Utilità per il tuo Palm Pilot o Visor"
# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
#: ../../share/compssUsers:999
-msgid "Scientific Workstation"
-msgstr "Workstation scientifica"
+msgid "Personal Finance"
+msgstr "Finanza Personale"
+# DO NOT BOTHER TO MODIFY HERE, BUT IN DRAKX PO
+#: ../../share/compssUsers:999
+msgid "Programs to manage your finance, such as gnucash"
+msgstr "Programmi per gestire le tue finanze, come gnucash"
diff --git a/po/ja.po b/po/ja.po
index 10d9d446..4d7436e0 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2000-09-13 14:44+0200\n"
"Last-Translator: YAMAGATA Hiroo <hiyori13@alum.mit.edu>\n"
"Language-Team: Japanese <ja@li.org>\n"
@@ -54,7 +54,7 @@ msgstr "¥Ñ¥¹¤Þ¤¿¤Ï¥Þ¥¦¥ó¥È¥Ý¥¤¥ó¥È¡§"
msgid "Removable device"
msgstr "¥ê¥à¡¼¥Ð¥Ö¥ë¥Ç¥Ð¥¤¥¹"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "¥»¥­¥å¥ê¥Æ¥£¾å¤Î¹¹¿·"
@@ -70,7 +70,7 @@ msgstr "¥ß¥é¡¼¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡§"
msgid "Login:"
msgstr "Login: "
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "¥Ñ¥¹¥ï¡¼¥É:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "¥½¡¼¥¹¤Î¼ïÎà:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "¥­¥ã¥ó¥»¥ë"
@@ -160,43 +162,73 @@ msgstr "¹¹¿·"
msgid "Please wait, updating media..."
msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥á¥Ç¥£¥¢¹¹¿·Ãæ"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "¥½¡¼¥¹¤ÎÀßÄê"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "¥×¥í¥­¥·¤Î¥æ¡¼¥¶Ì¾¡§"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "¥æ¡¼¥¶Ì¾¡§"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "¥½¡¼¥¹¤ÎÀßÄê"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Í­¸ú¤Ç¤¹¤«¡©"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "¥½¡¼¥¹"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "¼è¤ê½ü¤¯"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "ÊÔ½¸"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "ÄɲÃ..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "¹¹¿·..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "¥¨¥é¡¼..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Êݸ¤·¤Æ½ªÎ»"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "½ªÎ»"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +239,7 @@ msgstr ""
"\n"
"³¤±¤Æ¤¤¤¤¤Ç¤¹¤«¡©"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -337,11 +369,11 @@ msgid "China"
msgstr "Ãæ¹ñ"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "¥¢¥á¥ê¥«"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -353,15 +385,15 @@ msgstr ""
"\n"
"³¤±¤Þ¤¹¤«?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢Mandrake¥¦¥§¥Ö¥µ¥¤¥È¤«¤é¥ß¥é¡¼¥µ¥¤¥È¤ò¼èÆÀÃæ¡£"
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "¥À¥¦¥ó¥í¡¼¥ÉÃæ¤Ë¥¨¥é¡¼"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -376,11 +408,11 @@ msgstr ""
"¥Í¥Ã¥È¥ï¡¼¥¯¤«Mandrakesoft¥¦¥§¥Ö¥µ¥¤¥È¤¬»È¤¨¤Ê¤¤¤è¤¦¤Ç¤¹¡£\n"
"¤¢¤È¤Ç¤ä¤ê¤Ê¤ª¤·¤Æ¤¯¤À¤µ¤¤¡£"
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "¥ß¥é¡¼¤Ê¤·"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -394,7 +426,7 @@ msgstr ""
"¥×¥í¥»¥Ã¥µ¤Î¥¢¡¼¥­¥Æ¥¯¥Á¥ã¤¬Mandrake Linux ¸ø¼°¥¢¥Ã¥×¥Ç¡¼¥È¤Ç\n"
"¤Ï¥µ¥Ý¡¼¥È¤µ¤ì¤Æ¤¤¤Ê¤¤¾ì¹ç¤Ç¤¹¡£"
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "´õ˾¤Î¥ß¥é¡¼¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£"
@@ -402,75 +434,75 @@ msgstr "´õ˾¤Î¥ß¥é¡¼¤òÁª¤ó¤Ç¤¯¤À¤µ¤¤¡£"
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "¡Ê°ì¤Ä¤â¤¢¤ê¤Þ¤»¤ó¡Ë"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "¸¡º÷·ë²Ì"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "¸¡º÷·ë²Ì¡Ê¤Ê¤·¡Ë"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "¥Õ¥¡¥¤¥ë¸¡º÷Ãæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Ää»ß"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "ÄɲòÄǽ¤Ê¤â¤Î"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "¹¹¿·²Äǽ¤Ê¤â¤Î"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"¤¹¤Ù¤Æ\n"
"ÁªÂò²ò½ü"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "¤¹¤Ù¤ÆÁª¤Ö"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤Î¤É¤ì¤«¤¬É¬ÍפǤ¹:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Áª¤ó¤Ç¤¯¤À¤µ¤¤"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "ÃΤé¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤Ç¤¹"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "¥Ñ¥Ã¥±¡¼¥¸°ìÍ÷ɽ¼¨Ãæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(¤Ê¤·)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "¹¹¿·¤Ê¤·"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -479,11 +511,11 @@ msgstr ""
"¹¹¿·°ìÍ÷¤¬Ìµ¸ú¤Ç¤¹¡£¥³¥ó¥Ô¥å¡¼¥¿¤Î¥¤¥ó¥¹¥È¡¼¥ë¤µ¤ì¤¿¥Ñ¥Ã¥±¡¼¥¸¤Î\n"
"¹¹¿·ÈǤ¬¤Ê¤¤¤«¡¢¤½¤ì¤¬¤¹¤Ç¤Ë¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¤È¤¤¤¦¤³¤È¤Ç¤¹¡£"
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "¾¤Ëºï½ü¤¹¤Ù¤­¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -493,11 +525,11 @@ msgstr ""
"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Þ¤¹:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "ºï½ü¤Ç¤­¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -507,11 +539,11 @@ msgstr ""
"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤òº£¤ÏÈóÁªÂò¤Ë¤·¤Æ¤¯¤À¤µ¤¤:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Äɲåѥ屡¼¥¸¤¬É¬ÍפǤ¹"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -521,11 +553,11 @@ msgstr ""
"°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÎÄɲä¬É¬ÍפǤ¹:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -533,21 +565,21 @@ msgstr ""
"¤¹¤ß¤Þ¤»¤ó¡¢°Ê²¼¤Î¥Ñ¥Ã¥±¡¼¥¸¤ÏÁªÂò¤Ç¤­¤Þ¤»¤ó:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "¤¤¤¯¤Ä¤«¤Î¥Ñ¥Ã¥±¡¼¥¸¤òºï½ü¤·¤Þ¤¹"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "ÁªÂò¡§%d MB / ¥Ç¥£¥¹¥¯¶õ¤­ÍÆÎÌ: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "ÁªÂò¥µ¥¤¥º: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -557,12 +589,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "¥½¡¼¥¹"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -583,7 +615,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -602,68 +634,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "¥Ð¥°½¤Àµ¤Î¹¹¿·"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Ä̾ï¤Î¹¹¿·"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake¤ÎÁªÂò"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸¡¢ABC½ç"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Á´¥Ñ¥Ã¥±¡¼¥¸"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "¥°¥ë¡¼¥×ÊÌ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "¥µ¥¤¥º½ç"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "ÁªÂò¾õÂÖ½ç"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "¥½¡¼¥¹repository½ç"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "¹¹¿·¤Î̵ͭ½ç"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "ÀâÌÀ¤ÎÃæ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "̾¾Î¤ÎÃæ"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "¥Õ¥¡¥¤¥ë¤ÎÃæ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Ä̾ï¤Î¹¹¿·"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -678,37 +710,37 @@ msgstr ""
"\n"
"³¤±¤Æ¤¤¤¤¤Ç¤¹¤«?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "°Ê²¼¤òõ¤¹¡§"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "¸¡º÷"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
"-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*,-misc-fixed-medium-r-normal--"
"12-*-75-75-c-*-jisx0208.1983-0,*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake¥¢¥Ã¥×¥Ç¡¼¥È"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "¥½¥Õ¥È¥¦¥§¥¢¥Ñ¥Ã¥±¡¼¥¸ºï½ü"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "¥½¥Õ¥È¥Ñ¥Ã¥±¡¼¥¸¤Î¥¤¥ó¥¹¥È¡¼¥ë"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -720,23 +752,23 @@ msgstr ""
"\n"
"³¤±¤Þ¤¹¤«?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "¾¯¡¹¤ªÂÔ¤Á¤ò¡¢¥ß¥é¡¼¤Ë¤Ä¤Ê¤¤¤Ç¥Ñ¥Ã¥±¡¼¥¸¾ðÊ󹹿·Ãæ¡£"
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "¥á¥Ç¥£¥¢¹¹¿·¤Ç¥¨¥é¡¼"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "¥Ñ¥Ã¥±¡¼¥¸¾ðÊ󹹿·Ãæ¤Ë²óÉüÉÔǽ¥¨¥é¡¼È¯À¸¡£"
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "¥ß¥é¡¼¤ò¥Þ¥Ë¥å¥¢¥ë¤ÇÁª¤Ö¤Ë¤Ï"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -750,15 +782,15 @@ msgstr ""
"\n"
"¤½¤ì¤«¤éMandrakeUpdate¤òºÆµ¯Æ°¤·¤Þ¤¹¡£"
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "¥ß¥é¡¼¤Ë¤Ä¤Ê¤¤¤Ç¹¹¿·¥Ñ¥Ã¥±¡¼¥¸¤ò½é´ü²½¤·¤Þ¤¹¡£¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "¹¹¿·¥á¥Ç¥£¥¢Äɲäǥ¨¥é¡¼"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -778,50 +810,54 @@ msgstr ""
"\n"
"Ê̤Υߥ顼¤ò»î¤·¤Æ¤ß¤Þ¤¹¤«?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Ä󶡥ѥ屡¼¥¸¤òõ¤·¤Æ¤¤¤Þ¤¹¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¼ºÇÔ"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "¼è¤ê½ü¤¯"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
"-adobe-helvetica-bold-r-*-*-*-120-*-*-*-*-*-*,-misc-fixed-medium-r-normal--"
"12-*-75-75-c-*-jisx0208.1983-0,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -830,44 +866,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¤Ç¤­¤Ê¤¤¥Ñ¥Ã¥±¡¼¥¸¤¬¤¢¤ê¤Þ¤¹"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¡£"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "¥½¡¼¥¹¥Ñ¥Ã¥±¡¼¥¸¤¬ÆÀ¤é¤ì¤Þ¤»¤ó¡¢¤´¤á¤ó¤Ê¤µ¤¤¡£"
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "¥á¥Ç¥£¥¢Êѹ¹"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "%s¤È¤¤¤¦¥á¥Ç¥£¥¢¤ò¥Ç¥Ð¥¤¥¹[%s]¤ËÁÞÆþ¤·¤Æ¤¯¤À¤µ¤¤"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "¥¤¥ó¥¹¥È¡¼¥ë¼ºÇÔ"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -875,35 +907,35 @@ msgstr ""
"¥¤¥ó¥¹¥È¡¼¥ë¼ºÇÔ¡¢°ìÉô¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó¡£\n"
"¥½¡¼¥¹¥Ç¡¼¥¿¥Ù¡¼¥¹¤ò¹¹¿·¤·¤Æ¤ß¤Æ¤Ï¤¤¤«¤¬¤Ç¤·¤ç¤¦¡£"
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "¾¤Î¹¹¿·¤¬¤Ç¤­¤ë¤è¤¦¤Ë¥Ñ¥Ã¥±¡¼¥¸ºï½üÃæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "¥×¥í¥°¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "ɬÍ×¥×¥í¥°¥é¥à¤¬¤¢¤ê¤Þ¤»¤ó (grpmi)¡£¥¤¥ó¥¹¥È¡¼¥ë¤ò³Îǧ¤·¤Þ¤·¤ç¤¦¡£"
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¡£"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "¤¹¤Ù¤Æ¥¤¥ó¥¹¥È¡¼¥ëºÑ¤ß¡Ê¤³¤ó¤Ê¤³¤È¤¬¤¢¤Ã¤Æ¤¤¤¤¤Î¤«¡©¡Ë"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "¥Ñ¥Ã¥±¡¼¥¸¥Ç¡¼¥¿¥Ù¡¼¥¹Æɤ߹þ¤ßÃæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "¥Ñ¥Ã¥±¡¼¥¸ºï½üÃæ¡¢¾¯¡¹¤ªÂÔ¤Á¤ò"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -914,7 +946,7 @@ msgstr ""
"\n"
"¤³¤Î¥Ä¡¼¥ë¤Ï¡¢ºï½ü¤·¤¿¤¤¥½¥Õ¥È¥¦¥§¥¢¤òÁª¤Ö»Ù±ç¤ò¤·¤Þ¤¹¡£"
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -925,7 +957,7 @@ msgstr ""
"\n"
"¤³¤Î¥Ä¡¼¥ë¤Ï¡¢¥¤¥ó¥¹¥È¡¼¥ë¤·¤¿¤¤¹¹¿·¤òÁª¤Ö¤ª¼êÅÁ¤¤¤ò¤·¤Þ¤¹¡£"
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1175,9 +1207,6 @@ msgstr "¥½¥Õ¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë"
#~ msgid "Force"
#~ msgstr "¶¯À©"
-#~ msgid "Error..."
-#~ msgstr "¥¨¥é¡¼..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "¥¤¥ó¥¹¥È¡¼¥ëÃæ¤ËÌäÂ꤬µ¯¤³¤ê¤Þ¤·¤¿"
@@ -1480,9 +1509,6 @@ msgstr "¥½¥Õ¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp ¥×¥í¥­¥·:"
-#~ msgid "Proxy username:"
-#~ msgstr "¥×¥í¥­¥·¤Î¥æ¡¼¥¶Ì¾¡§"
-
#~ msgid "Proxy password:"
#~ msgstr "¥×¥í¥­¥·¤Î¥Ñ¥¹¥ï¡¼¥É:"
@@ -1522,9 +1548,6 @@ msgstr "¥½¥Õ¥È¤ò¥¤¥ó¥¹¥È¡¼¥ë"
#~ msgid "Choose Packages"
#~ msgstr "¥Ñ¥Ã¥±¡¼¥¸¤òÁª¤Ö"
-#~ msgid "Username:"
-#~ msgstr "¥æ¡¼¥¶Ì¾¡§"
-
#~ msgid "Security"
#~ msgstr "¥»¥­¥å¥ê¥Æ¥£"
diff --git a/po/ko.po b/po/ko.po
index 966b5bde..dafb63c8 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-25 14:47+0900\n"
"Last-Translator: Jaegeum Cze <baedaron@hanafos.com>\n"
"Language-Team: Korean <baedaron@hananet.net>\n"
@@ -56,7 +56,7 @@ msgstr "°æ·Î ¶Ç´Â ¸¶¿îÆ® À§Ä¡:"
msgid "Removable device"
msgstr "Å»Âø½Ä ÀåÄ¡"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "º¸¾È ¾÷µ¥ÀÌÆ®"
@@ -72,7 +72,7 @@ msgstr "¹Ì·¯ ¼±ÅÃ..."
msgid "Login:"
msgstr "¾ÆÀ̵ð:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "¾ÏÈ£:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "¼Ò½º À¯Çü:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "È®ÀÎ"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Ãë¼Ò"
@@ -162,43 +164,70 @@ msgstr "¾÷µ¥ÀÌÆ® ¹öÀü"
msgid "Please wait, updating media..."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¸Åü ¾÷µ¥ÀÌÆ® Áß..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "¼Ò½º ¼³Á¤"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "¼Ò½º ¼³Á¤"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "»ç¿ë°¡?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "¼Ò½º"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Á¦°Å"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "ÆíÁý"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Ãß°¡..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "¾÷µ¥ÀÌÆ®..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "ÀúÀå ÈÄ Á¾·á"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Á¾·á"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +238,7 @@ msgstr ""
"\n"
"°è¼ÓÇÒ±î¿ä?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -340,11 +369,11 @@ msgid "China"
msgstr "Áß±¹"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "¹Ì±¹"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -356,16 +385,16 @@ msgstr ""
"\n"
"°è¼ÓÇÒ±î¿ä?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"±â´Ù·Á ÁÖ¼¼¿ä. ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®¿¡¼­ ¹Ì·¯ ¸ñ·ÏÀ» ³»·Á¹Þ°í ÀÖ½À´Ï´Ù."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "³»·Á¹Þ±â Áß ¿À·ù"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -380,11 +409,11 @@ msgstr ""
"³×Æ®¿÷ ¶Ç´Â ¸Çµå·¹ÀÌÅ©¼ÒÇÁÆ® À¥»çÀÌÆ®°¡ ÇöÀç À¯È¿ÇÏÁö ¾ÊÀº µí ÇÕ´Ï´Ù.\n"
"³ªÁß¿¡ ´Ù½Ã ½ÃµµÇØ º¸¼¼¿ä."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "¹Ì·¯ ¾øÀ½"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -398,7 +427,7 @@ msgstr ""
"ÀÌ ÄÄÇ»ÅÍÀÇ ÇÁ·Î¼¼¼­¸¦ ¸Çµå·¹ÀÌÅ© ¸®´ª½º °ø½Ä ¾÷µ¥ÀÌÆ®°¡\n"
"Áö¿øÇÏÁö ¾Ê´Â °æ¿ìÀÔ´Ï´Ù."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Èñ¸ÁÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇϼ¼¿ä."
@@ -406,71 +435,71 @@ msgstr "Èñ¸ÁÇÏ´Â ¹Ì·¯¸¦ ¼±ÅÃÇϼ¼¿ä."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(À¯È¿ÇÏÁö ¾ÊÀ½)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "°Ë»ö °á°ú"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "°Ë»ö °á°ú(¾øÀ½)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. °Ë»ö Áß..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "ÁßÁö"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Ãß°¡ °¡´É"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "¾÷±×·¹ÀÌµå °¡´É"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "´ÙÀ½ ÆÑÅ°Áöµé Áß Çϳª°¡ ÇÊ¿äÇÕ´Ï´Ù:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "¼±ÅÃÇϼ¼¿ä"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "¾Ë ¼ö ¾ø´Â ÆÑÅ°Áö"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö ¸ñ·Ï Á¤·Ä Áß..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(¾øÀ½)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "¾÷µ¥ÀÌÆ® ¾øÀ½"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -480,11 +509,11 @@ msgstr ""
"ÆÑÅ°Áö¿¡ ´ëÇÑ ¾÷µ¥ÀÌÆ®°¡ ¾ø°Å³ª,\n"
"ÀÌ¹Ì ´Ù ¼³Ä¡µÈ °æ¿ìÀÔ´Ï´Ù."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "ÀϺΠÆÑÅ°Áö°¡ ´õ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù."
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -494,11 +523,11 @@ msgstr ""
"´ÙÀ½ ÆÑÅ°Áöµéµµ Á¦°Å µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "ÀϺΠÆÑÅ°Áö´Â Á¦°ÅµÉ ¼ö ¾ø½À´Ï´Ù."
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -508,11 +537,11 @@ msgstr ""
"Áö±Ý ¼±Åà ÇØÁ¦µÇ¾î¾ß ÇÕ´Ï´Ù:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Ãß°¡ ÆÑÅ°Áö°¡ ÇÊ¿äÇÕ´Ï´Ù."
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -522,11 +551,11 @@ msgstr ""
"¼³Ä¡µÇ¾î¾ß ÇÕ´Ï´Ù.\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "ÀϺΠÆÑÅ°Áö´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù."
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -534,21 +563,21 @@ msgstr ""
"´ÙÀ½ ÆÑÅ°ÁöµéÀº ¼±ÅÃµÉ ¼ö ¾ø½À´Ï´Ù:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "ÀϺΠÆÑÅ°Áö´Â Á¦°ÅµÇ¾î¾ß ÇÕ´Ï´Ù."
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "¼±ÅÃµÈ ¿ë·®: %d MB / ¿©À¯ °ø°£: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "¼±ÅÃµÈ Å©±â: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -558,12 +587,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "¼Ò½º"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -584,7 +613,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -603,68 +632,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "¹ö±×¼öÁ¤ ¾÷µ¥ÀÌÆ®"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "ÀÏ¹Ý ¾÷µ¥ÀÌÆ®"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "¸Çµå·¹ÀÌÅ© ¼±ÅÃ"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "¸ðµç ÆÑÅ°Áö, °¡³ª´Ù¼ø"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "¸ðµç ÆÑÅ°Áö"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "±×·ìº°"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "Å©±âº°"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "¼±Åà »óź°"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "¼Ò½º µî·Ïº°"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "¾÷µ¥ÀÌÆ® °¡´É¼ºº°"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "¼³¸íº°"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "À̸§º°"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "ÆÄÀϺ°"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "ÀÏ¹Ý ¾÷µ¥ÀÌÆ®"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -679,37 +708,37 @@ msgstr ""
"\n"
"°è¼ÓÇÒ±î¿ä?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "ã±â"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "°Ë»ö"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "¼³Ä¡"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
"-adobe-times-medium-r-normal--18-*-75-75-p-*-iso8859-1,-*-batang-medium-r-"
"normal--18-*-75-75-*-*-ksc5601.1987-0,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö Á¦°Å"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "¼ÒÇÁÆ®¿þ¾î ÆÑÅ°Áö ¼³Ä¡"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -721,23 +750,23 @@ msgstr ""
"\n"
"°è¼ÓÇÒ±î¿ä?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¤º¸¸¦ ¾÷µ¥ÀÌÆ®Çϱâ À§ÇØ ¹Ì·¯¿¡ Á¢¼Ó Áß..."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "¸Åü ¾÷µ¥ÀÌÆ® Áß ¿À·ù"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "ÆÑÅ°Áö Á¤º¸ ¾÷µ¥ÀÌÆ® µµÁß¿¡ º¹±¸ ºÒ°¡´ÉÇÑ ¿À·ù°¡ ÀÖ¾ú½À´Ï´Ù."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "¼öµ¿À¸·Î ¹Ì·¯¸¦ ¼±ÅÃÇÏ´Â ¹æ¹ý"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -751,15 +780,15 @@ msgstr ""
"\n"
"±×·± ÈÄ, ¸Çµå·¹ÀÌÅ© ¾÷µ¥ÀÌÆ®¸¦ ´Ù½Ã ½ÇÇàÇϼ¼¿ä."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ¾÷µ¥ÀÌÆ® ÆÑÅ°Áö¸¦ ÃʱâÈ­Çϱâ À§ÇØ ¹Ì·¯¿¡ Á¢¼Ó Áß..."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "¾÷µ¥ÀÌÆ® ¸Åü Ãß°¡ Áß ¿À·ù"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -779,50 +808,54 @@ msgstr ""
"\n"
"´Ù¸¥ ¹Ì·¯¸¦ »ç¿ëÇØ º¸½Ã°Ú½À´Ï±î?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. À¯È¿ÇÑ ÆÑÅ°Áö °Ë»ö Áß..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "¿äûµÈ ¸ðµç ÆÑÅ°ÁöÀÇ ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "¼³Ä¡ ½ÇÆÐ"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Á¦°Å"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
"-adobe-times-medium-r-normal--18-*-75-75-p-*-iso8859-1,-*-batang-medium-r-"
"normal--18-*-75-75-*-*-ksc5601.1987-0,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -831,44 +864,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "ÀϺΠÆÑÅ°Áö´Â ¼³Ä¡µÉ ¼ö ¾ø½À´Ï´Ù."
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "¸ðµç ¼³Ä¡¸¦ ¸¶ÃƽÀ´Ï´Ù."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "¼Ò½º ÆÑÅ°Áö¸¦ °¡Á®¿Ã ¼ö ¾ø½À´Ï´Ù."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "¸Åü ±³È¯"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "[%s] ¸Åü¸¦ [%s]ÀåÄ¡¿¡ ³Ö¾î ÁÖ¼¼¿ä."
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "¼³Ä¡ ½ÇÆÐ"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -876,36 +905,36 @@ msgstr ""
"¼³Ä¡ ½ÇÆÐ. ÀϺΠÆÄÀÏÀÌ ¾ø½À´Ï´Ù.\n"
"¼Ò½º µ¥ÀÌÅͺ£À̽º¸¦ ¾÷µ¥ÀÌÆ®ÇØ º¸¼¼¿ä."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"±â´Ù·Á ÁÖ¼¼¿ä. ´Ù¸¥ ÆÑÅ°Áö¸¦ ¾÷±×·¹À̵åÇϱâ À§ÇØ ÀϺΠÆÑÅ°Áö¸¦ Á¦°Å Áß..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "ÇÁ·Î±×·¥ Á¸ÀçÇÏÁö ¾ÊÀ½"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "¿äûÇÑ ÇÁ·Î±×·¥ÀÌ Á¸ÀçÇÏÁö ¾Ê½À´Ï´Ù(grpmi). ¼³Ä¡¸¦ È®ÀÎÇϼ¼¿ä."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "ÀÌ¹Ì ¼³Ä¡µÇ¾î ÀÖ½À´Ï´Ù.(°ú¿¬ ÀÌ·± ÀÏÀÌ ÀÖÀ» ¼ö ÀÖ³ª¿ä?)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö µ¥ÀÌÅͺ£À̽º Àд Áß..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "±â´Ù·Á ÁÖ¼¼¿ä. ÆÑÅ°Áö Á¦°Å Áß..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -917,7 +946,7 @@ msgstr ""
"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡¼­ Á¦°ÅÇÒ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
"µµ¿Í ÁÝ´Ï´Ù."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -929,7 +958,7 @@ msgstr ""
"ÀÌ µµ±¸´Â ÄÄÇ»ÅÍ¿¡ ¼³Ä¡ÇÒ ¾÷µ¥ÀÌÆ®µÈ ¼ÒÇÁÆ®¿þ¾î¸¦ ¼±ÅÃÇÒ ¼ö ÀÖµµ·Ï\n"
"µµ¿Í ÁÝ´Ï´Ù."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/lt.po b/po/lt.po
index c90b0597..d9d9b565 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-03-04 15:30+0200\n"
"Last-Translator: Mykolas Norvaiðas <Myka@centras.lt>\n"
"Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -63,7 +63,7 @@ msgstr "prijungimo vieta:"
msgid "Removable device"
msgstr "Iðmesti laikmenà"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Saugumo atnaujinimai"
@@ -81,7 +81,7 @@ msgstr "Pasirinkite veidrodá:"
msgid "Login:"
msgstr "login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Slaptaþodis:"
@@ -115,14 +115,16 @@ msgid "Type of source:"
msgstr "Laikmenos tipas:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Gerai"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Nutraukti"
@@ -186,47 +188,79 @@ msgstr ""
"Praðom palaukti\n"
"Iðmetama laikmena"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr ""
+"Atnaujinti\n"
+"laikmenà"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Vartotojo vardas (username):"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr ""
"Atnaujinti\n"
"laikmenà"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Ðaltinis"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Iðimama"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Redaguoti"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Klaida..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Iðeiti"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -234,7 +268,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -364,11 +398,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -376,15 +410,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -394,12 +428,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Lemtinga klaida"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -408,7 +442,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -419,96 +453,96 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Paieðkos rezultatai"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Paieðkos rezultatai"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Praðom palaukti.Paðalinami paketai"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Galimi"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Nesirinkti\n"
"nieko"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Pasirinkti visus"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Praðom patvirtinti"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Neþinomas"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Praðom palaukti.Paðalinami paketai"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr ""
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "Saugumo atnaujinimai"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr ""
"Ðis papildomas paketas turi bûti ádiegtas kad viskas dirbtø gerai gerai:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -518,53 +552,53 @@ msgstr ""
"Kad bûtø patenkintos visos priklausomybës,\n"
"ðie paketai bus paðalinti:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr ""
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "%d paþymëti paketai: %.1f MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, fuzzy, c-format
msgid "Selected size: %d MB"
msgstr "%d paþymëti paketai: %.1f MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -574,12 +608,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Ðaltinis"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +626,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -604,73 +638,73 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Saugumo atnaujinimai"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "Saugumo atnaujinimai"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr ""
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 paketø, 0 baitø"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Apraðymai"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "%d bylos"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Saugumo atnaujinimai"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -680,38 +714,38 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Surasti:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Ieðkoti"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Ádiegti"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
#, fuzzy
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
"-filija-arija-bold-r-*-*-*-100-*-*-*-*-*-*,-*-helvetica-bold-r-*-*-*-100-*-*-"
"*-*-*-*,*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr ""
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr ""
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -719,23 +753,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -744,15 +778,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -765,51 +799,55 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "Praðom palaukti.Paðalinami paketai"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Ádiegiama "
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Iðimama"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
"-filija-arija-bold-r-*-*-*-100-*-*-*-*-*-*,-*-helvetica-bold-r-*-*-*-100-*-*-"
"*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -818,80 +856,76 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr ""
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Ádiegiama "
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Praðom palaukti.Paðalinami paketai"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
#, fuzzy
msgid "Please wait, reading packages database..."
msgstr "Praðom palaukti.Paðalinami paketai"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Praðom palaukti.Paðalinami paketai"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -899,7 +933,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -907,7 +941,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1127,9 +1161,6 @@ msgstr "Ádiegti visus"
#~ msgid "Force"
#~ msgstr "Priverstinai"
-#~ msgid "Error..."
-#~ msgstr "Klaida..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Ádiegimo metu ávyko klaida"
@@ -1412,9 +1443,6 @@ msgstr "Ádiegti visus"
#~ msgid "Ftp Proxy:"
#~ msgstr "FTP tarpinë stotis (proxy):"
-#~ msgid "Proxy username:"
-#~ msgstr "Tarpinës stoties (proxy) vartotojo vardas:"
-
#~ msgid "Proxy password:"
#~ msgstr "Tarpinës stoties (proxy) slaptaþodis:"
@@ -1454,9 +1482,6 @@ msgstr "Ádiegti visus"
#~ msgid "Choose Packages"
#~ msgstr "Pasirinkite paketus"
-#~ msgid "Username:"
-#~ msgstr "Vartotojo vardas (username):"
-
#~ msgid "Security"
#~ msgstr "Saugumas"
diff --git a/po/lv.po b/po/lv.po
index d07b32e6..8bd8d722 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-09-22 07:30+0200\n"
"Last-Translator: Juris Kudiòð <cooker@inbox.lv>\n"
"Language-Team: Latvian\n"
@@ -62,7 +62,7 @@ msgstr "montçðanas punkts:"
msgid "Removable device"
msgstr "Noòemt datu nesçju"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Droðîbas atjauninâjumi"
@@ -80,7 +80,7 @@ msgstr "Izvçlieties spoguïserveri"
msgid "Login:"
msgstr "lietotâjs:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Parole:"
@@ -113,14 +113,16 @@ msgid "Type of source:"
msgstr "Avota tips:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Atsaukt"
@@ -187,45 +189,75 @@ msgstr ""
"Lûdzu gaidiet\n"
"Noòemu datu nesçju"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfigurçt avotu?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Proxy lietotâjs:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Lietotâjs:"
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Konfigurçt avotu?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Avots"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Noòemams"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Labot"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Kïûda..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Iziet"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -233,7 +265,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -364,11 +396,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -376,15 +408,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -394,12 +426,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Nav kïûdas"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -408,7 +440,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -419,95 +451,95 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Meklçjumu rezultâts"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Meklçjumu rezultâts"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Lûdzu gaidiet, noòemu pakotnes"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
#, fuzzy
msgid "Addable"
msgstr "Pieejams"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Atcelt visu\n"
"izvçli"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Izvçlçties visu"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
#, fuzzy
msgid "Please choose"
msgstr "Lûdzu apstipriniet"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Nezinâma lapa"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Lûdzu gaidiet, noòemu pakotnes"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(neviens)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "vienkârði jauninâjumi"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr "Lai viss strâdâtu pareizi, bûs jâuzstâda arî ðîs pakotnes: "
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -517,54 +549,54 @@ msgstr ""
"Lai apmierinâtu visas atkarîbas,\n"
"tiks noòemtas ðîs pakotnes:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Pakotnes jau ir uzstâdîtas"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "%d izvçlçtas pakotnes: %.1f MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, fuzzy, c-format
msgid "Selected size: %d MB"
msgstr "%d izvçlçtas pakotnes: %.1f MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -574,12 +606,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Avots"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +624,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -604,75 +636,75 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Droðîbas atjauninâjumi"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "vienkârði jauninâjumi"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeUpdate"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 pakotnes, 0 baiti"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Dziïð izmçrs"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Apraksti"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Lokâls"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "vienkârði jauninâjumi"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -682,41 +714,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Meklçt:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Meklçt"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalçt"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
#, fuzzy
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Atjauninâtâjs"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Programmatûras vadîtâjs"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Pakotòu uzstâdîðana"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -724,23 +756,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -749,15 +781,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -770,49 +802,53 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "Lûdzu gaidiet, noòemu pakotnes"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Uzstâdu "
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Noòemams"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-helvetica-bold-r-*-*-*-100-*-*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -821,84 +857,80 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Pakotnes jau ir uzstâdîtas"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Pakotne jau uzstâdîta"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Nepareizas, nesalasâmas vai neesoðas pakotnes"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Uzstâdu "
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Lûdzu gaidiet, noòemu pakotnes"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Pakotne jau uzstâdîta"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
#, fuzzy
msgid "Please wait, reading packages database..."
msgstr "Lûdzu gaidiet, noòemu pakotnes"
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Lûdzu gaidiet, noòemu pakotnes"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -906,7 +938,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -914,7 +946,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1138,9 +1170,6 @@ msgstr "Instalçt visu"
#~ msgid "Force"
#~ msgstr "Piespiest"
-#~ msgid "Error..."
-#~ msgstr "Kïûda..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Instalçðanas laikâ radâs problçmas"
@@ -1424,9 +1453,6 @@ msgstr "Instalçt visu"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp proxy:"
-#~ msgid "Proxy username:"
-#~ msgstr "Proxy lietotâjs:"
-
#~ msgid "Proxy password:"
#~ msgstr "Proxy parole:"
@@ -1466,9 +1492,6 @@ msgstr "Instalçt visu"
#~ msgid "Choose Packages"
#~ msgstr "Izvçlieties pakotnes"
-#~ msgid "Username:"
-#~ msgstr "Lietotâjs:"
-
#~ msgid "Security"
#~ msgstr "Droðîba"
diff --git a/po/ms.po b/po/ms.po
index e77852f3..955021a8 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-03-12 11:29+0800\n"
"Last-Translator: Yuzz <yuzz@emasonline.com>\n"
"Language-Team: Malaysia <yuzz@emasonline.com>\n"
@@ -61,7 +61,7 @@ msgstr "path atau titik mount:"
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Kemaskini sekuriti"
@@ -79,7 +79,7 @@ msgstr "Sila pilih mirror:"
msgid "Login:"
msgstr "login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
#, fuzzy
msgid "Password:"
msgstr "katalaluan:"
@@ -116,14 +116,16 @@ msgid "Type of source:"
msgstr "Jenis sumber:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Batal"
@@ -181,45 +183,73 @@ msgstr "Kemaskini saja"
msgid "Please wait, updating media..."
msgstr "Penmeriksaan kebergantungan..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfigurasikan sumber?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Konfigurasikan sumber?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sumber"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Boleh dihapus"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Ubah"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Ralat..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Keluar"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -227,7 +257,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -358,11 +388,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -370,15 +400,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -388,12 +418,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Tiada ralat"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -402,7 +432,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -413,89 +443,89 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Hasil Pencarian"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Hasil Pencarian"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Tunggu, pakej berikut sedang dihapus:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Mukasurat tiada"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Tunggu, pakej berikut sedang dihapus:"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(tiada)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "kemaskini normal"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr "Pakej-pakej ini perlu diinstal dulu agar semuanya dapat berjalan baik."
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -505,54 +535,54 @@ msgstr ""
"Untuk memenuhi kebergantungan,\n"
"Pakej-pakej berikut akan dihapus:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "Pakej ini sudah diinstal sebelumnya"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -562,12 +592,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Sumber"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -580,7 +610,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -592,74 +622,74 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Kemaskini sekuriti"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "kemaskini normal"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "MandrakeUpdate"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 pakej, 0 bait"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Kedalaman"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Setempat"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "kemaskini normal"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -669,41 +699,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Cari:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
#, fuzzy
msgid "Search"
msgstr "Carian"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Install"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " Pengurus Perisian "
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Instalasi paket"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -711,23 +741,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -736,15 +766,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -757,48 +787,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "muat ulang senarai pakej yg tersedia"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "dapat diinstal"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Boleh dihapus"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -807,83 +841,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Pakej ini sudah diinstal sebelumnya"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Pakej sudah diinstal sebelumnya"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Pakej rosak, tidak boleh dibaca/dicari"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "dapat diinstal"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Pilih pakej yg ingin dikemaskini"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Pakej sudah diinstal sebelumnya"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Tunggu, pakej berikut sedang dihapus:"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -891,7 +921,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -899,7 +929,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1123,9 +1153,6 @@ msgstr "Install semua"
#~ msgid "Force"
#~ msgstr "Paksa"
-#~ msgid "Error..."
-#~ msgstr "Ralat..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Ada masalah semasa instalasi"
diff --git a/po/mt.po b/po/mt.po
index 6f4baca0..16c5d0ac 100644
--- a/po/mt.po
+++ b/po/mt.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-20 05:18+0200\n"
"Last-Translator: Ramon Casha <ramon.casha@linux.org.mt>\n"
"Language-Team: Maltese <mt@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "Direttorju jew punt ta' mmuntar:"
msgid "Removable device"
msgstr "Apparat jinħareġ"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Aġġornamenti ta' sigurtà"
@@ -71,7 +71,7 @@ msgstr "Agħżel mera..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Password:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr "Tip ta' sors:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Ikkanċella"
@@ -161,43 +163,71 @@ msgstr "AÄ¡Ä¡orna"
msgid "Please wait, updating media..."
msgstr "Stenna ftit, qed jiġu aġġornati l-medji..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Ikkonfigura sorsi"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Ikkonfigura sorsi"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Mixgħul?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sors"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Neħħi"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Editja"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Żid..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "AÄ¡Ä¡orna..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Problema..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Ikteb u oħroġ"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Oħroġ"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -208,7 +238,7 @@ msgstr ""
"\n"
"Trid li nkomplu?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -341,11 +371,11 @@ msgid "China"
msgstr "ÄŠina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Stati Uniti"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,16 +387,16 @@ msgstr ""
"\n"
"Nista' nkompli?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Stenna ftit, qed jitniżżlu indirizzi ta' mirja mill-website ta' MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Problema waqt it-tniżżil"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -381,11 +411,11 @@ msgstr ""
"In-network, jew il-website ta' MandrakeSoft, tista' ma tkunx \n"
"disponibbli. Erġa' pprova iżjed tard."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Ebda mera"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -399,7 +429,7 @@ msgstr ""
"komuni huwa meta l-arkitettura tas-CPU tiegħek mhux sapportit\n"
"mill-aġġornamenti uffiċjali tal-Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Jekk jogħġbok agħżel mera li tixtieq."
@@ -407,72 +437,72 @@ msgstr "Jekk jogħġbok agħżel mera li tixtieq."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Mhux disponibbli)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Riżultat tat-tfittxija"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Riżultat tat-tfittxija (ebda)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Stenna ftit, qed infittex fil-fajls..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Jistgħu jiġu miżjuda"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Jistgħu jiġu aġġornati"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Wieħed minn dawn il-pakketti huwa meħtieġ:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Jekk jogħġbok agħżel wieħed"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pakkett mhux magħruf "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Stenna ftit, qed jiġu llistjati l-pakketti..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ebda)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Ebda aġġornament"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -482,11 +512,11 @@ msgstr ""
"aġġornamenti x'isiru għall-pakketti installati fuq il-kompjuter, jew diġà "
"nstallajthom kollha."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Xi pakketti oħra jridu jitneħħew"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -495,11 +525,11 @@ msgstr ""
"Minħabba d-dipendenzi tagħhom, dawn il-pakketti wkoll iridu jitneħħew:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Xi pakketti ma jistgħux jitneħħew"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -509,11 +539,11 @@ msgstr ""
"mill-għażla issa:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Pakketti oħra meħtieġa"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -523,11 +553,11 @@ msgstr ""
"jiġu nstallati:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Xi pakketti ma jistgħux jiġu nstallati"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -535,21 +565,21 @@ msgstr ""
"Jiddispjaċini, dawn il-pakketti ma jistgħux jiġu magħżula:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Xi pakketti jridu jitneħħew"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Magħżula: %d MB / Disponibbli: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Daqs magħżula: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -559,12 +589,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Sors"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -585,7 +615,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -604,69 +634,69 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Tiswijiet ta' bugs"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "AÄ¡Ä¡ornamenti normali"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Għażliet ta' Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Pakketti kollha, alfabetiċi"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Pakketti kollha"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "skond il-grupp"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "skond id-daqs"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "skond l-istat tal-għażla"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "skond is-sors"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "skond id-disponibbiltà ta' aġġornament"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Fajls lokali"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "AÄ¡Ä¡ornamenti normali"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -681,35 +711,35 @@ msgstr ""
"\n"
"Trid tkompli?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Sib:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Fittex"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installa"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "AÄ¡Ä¡ornament Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Tneħħija ta' pakketti ta' softwer"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Installazzjoni ta' pakketti ta' softwer"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -721,25 +751,25 @@ msgstr ""
"\n"
"Trid tkompli?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Stenna ftit, qed nikkuntattja l-mera biex naġġorna l-informazzjoni tal-"
"pakketti"
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Problema fl-aġġornament tas-sors"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Kien hemm problema waqt l-aġġornament tal-informazzjoni tal-pakketti"
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -748,16 +778,16 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Stenna ftit, qed nikkuntattja l-mera biex nibda' l-aġġornament ta' pakketti."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Problema fiż-żieda ta' sors ta' aġġornamenti"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -777,48 +807,52 @@ msgstr ""
"\n"
"Trid tipprova mera oħra?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Stenna ftit, qed insib pakketti disponibbli..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Installazzjoni falliet"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Neħħi"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -827,44 +861,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Xi pakketti ma jistgħux jiġu nstallati"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Kollox diġà nstallat"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ma nistax nikseb pakketti sors."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Ma nistax nikseb pakketti sors, jiddispjaċini."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Ibdel sors"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Jekk jogħġbok daħħal is-sors imsejjaħ \"%s\" fl-apparat [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Installazzjoni falliet"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -872,37 +902,37 @@ msgstr ""
"Installazzjoni falliet, xi fajls huma neqsin.\n"
"Jista' jkollok bżonn taġġorna d-database tas-sorsi."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Stenna ftit, qed jitneħħew pakketti biex ikunu jistgħu jiġu aġġornati "
"oħrajn..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Kollox diġà nstallat"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Kollox diġà nstallat"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Stenna ftit, qed jinqara d-database tal-pakketti..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Stenna ftit, qed jitneħħew il-pakketti..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -914,7 +944,7 @@ msgstr ""
"Din l-għodda tgħinek tagħżel liema softwer trid tneħħi mill-kompjuter\n"
"tiegħek."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -926,7 +956,7 @@ msgstr ""
"Din l-għodda tgħinek tagħżel aġġornamenti li trid tinstalla fuq il-\n"
"kompjuter tiegħek."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1179,9 +1209,6 @@ msgstr "Installa kollox"
#~ msgid "Force"
#~ msgstr "Ġiegħel"
-#~ msgid "Error..."
-#~ msgstr "Problema..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Inqalgħu problemi waqt l-installazzjoni"
diff --git a/po/nl.po b/po/nl.po
index 6c997337..de64c3ee 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-30 15:40+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-30 13:26+0100\n"
"Last-Translator: Reinout van Schouwen <reinout@cs.vu.nl>\n"
"Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -73,7 +73,7 @@ msgstr "Kies uw mirror..."
msgid "Login:"
msgstr "Aanmeldnaam:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Wachtwoord:"
@@ -107,14 +107,16 @@ msgid "Type of source:"
msgstr "Brontype:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:318 ../rpmdrake_.c:777 ../rpmdrake_.c:803
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:318 ../rpmdrake_.c:803
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Annuleren"
@@ -166,44 +168,71 @@ msgstr "Verversen"
msgid "Please wait, updating media..."
msgstr "Even geduld, bezig met verversen van media..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Bronnen configureren"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Bronnen configureren"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Ingeschakeld?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Bron"
# Removable media
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:598
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Verwisselen"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Bewerken"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Toevoegen..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Verversen..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Opslaan en afsluiten"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Afsluiten"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:902
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -214,7 +243,7 @@ msgstr ""
"\n"
"Is het goed om door te gaan?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -349,11 +378,11 @@ msgid "China"
msgstr "China"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Verenigde Staten"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -365,17 +394,17 @@ msgstr ""
"\n"
"Is het goed om door te gaan?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Even geduld, bezig met downloaden van mirror-adressen van de MandrakeSoft "
"website."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Er is een fout opgetreden tijdens het downloaden"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -390,11 +419,11 @@ msgstr ""
"Het netwerk, of de MandrakeSoft-website, zijn wellicht onbereikbaar.\n"
"Probeert u het later opnieuw."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Geen mirror"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -408,7 +437,7 @@ msgstr ""
"is het geval waarin de architectuur van uw centrale verwerkingseenheid\n"
"niet ondersteund wordt door de officiële Mandrake Linux vernieuwingen."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Kies de gewenste mirror."
diff --git a/po/nl.pom b/po/nl.pom
index 79009f62..253c3183 100644
--- a/po/nl.pom
+++ b/po/nl.pom
@@ -302,4 +302,3 @@ msgstr "Multimedia - CD branden"
#: ../../share/compssUsers:999
msgid "Scientific Workstation"
msgstr "Wetenschappelijk werkstation"
-
diff --git a/po/no.po b/po/no.po
index cb76c13f..335018de 100644
--- a/po/no.po
+++ b/po/no.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-02-03 14:16CET\n"
"Last-Translator: Terje Bjerrkelia <terje@bjerkelia.com>\n"
"Language-Team: Norsk\n"
@@ -57,7 +57,7 @@ msgstr "Sti eller monteringspunkt:"
msgid "Removable device"
msgstr "Fjernbare enheter"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Sikkerhetsoppdateringer"
@@ -73,7 +73,7 @@ msgstr "Velg et speil..."
msgid "Login:"
msgstr "Logg inn:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Passord:"
@@ -106,14 +106,16 @@ msgid "Type of source:"
msgstr "Type kilde:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Avbryt"
@@ -163,43 +165,73 @@ msgstr "Oppdater"
msgid "Please wait, updating media..."
msgstr "Vennligst vent, oppdaterer media..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfigurer kilder"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Proxy brukernavn:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Brukernavn:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Konfigurer kilder"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Slått på?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Kilde"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Fjern"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Rediger"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Legg til..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Oppdater..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Feil..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Lagre og avslutt"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Avslutt"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -210,7 +242,7 @@ msgstr ""
"\n"
"Er det ok å fortsette?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +375,11 @@ msgid "China"
msgstr "Kina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "USA"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -359,16 +391,16 @@ msgstr ""
"\n"
"Er det ok å fortsette?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Vennligst vent, laster ned adresser over speil fra MandrakeSoft website."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Feil oppsto under nedlasting"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -383,11 +415,11 @@ msgstr ""
"Nettverket, eller MandrakeSoft website, er kanskje ikke tilgjengelig.\n"
"Vennligst prøv igjen senere."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Ingen speil"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +433,7 @@ msgstr ""
"når arkitekturen til prosessoren din ikke er støttet\n"
"av Mandrake Linux offisielle oppdateringer."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Vennligst velg ønsket speil."
@@ -409,76 +441,76 @@ msgstr "Vennligst velg ønsket speil."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Ingen tilgjengelig)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Søkeresultater"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Søkeresultater (ingen)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Vennligst vent, søker i filer..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Kan legge til"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Kan oppgraderes"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Fjern\n"
"alle"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Velg alle"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "En av følgende pakker behøves:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Vennligst velg"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Ukjent pakke "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Vennligst vent, lister pakker..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ingen)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Ingen oppdatering"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -488,11 +520,11 @@ msgstr ""
"noen tilgjengelige oppdateringer for pakkene som er installert på\n"
"din maskin, eller at du allerede har installert alle sammen."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Noen ytterligere pakker renger å fjernes"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -502,11 +534,11 @@ msgstr ""
"å bli fjernet:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Noen pakker kan ikke fjernes"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -516,11 +548,11 @@ msgstr ""
"vekk nå:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Ytterligere pakker trengs"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -530,11 +562,11 @@ msgstr ""
"installeres:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Noen pakker kan ikke installeres"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -542,21 +574,21 @@ msgstr ""
"Beklager, følgende pakke(r) kan ikke velges:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Noen pakker må fjernes"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Valgte: %d MB / Tilgjengelig: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Størrelse valgte: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -566,12 +598,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Kilde"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +624,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -611,70 +643,70 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Bugfix-oppdateringer"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normale oppdateringer"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake valg"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Alle pakker, alfabetisk"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Alle pakker,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "ved gruppe"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "ved størrelse"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "ved utvelgelsestilstand"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "ved kildelager"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "ved oppdateringstilgjengelighet"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Beskrivelser"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Lokale filer"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normale oppdateringer"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -689,35 +721,35 @@ msgstr ""
"\n"
"ER det ok å fortsette?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Finn:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "søk"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installer"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Fjerning av programvarepakker"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Installasjon av programvarepakker"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -729,23 +761,23 @@ msgstr ""
"\n"
"Er det ok å fortsette?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Vennligst vent, kontakter speil for å oppdatere pakkeinformasjon."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Feil ved oppdatering av media"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Det oppsto en uidentifistert feil ved oppdatering av pakkeinformasjon."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -754,15 +786,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Vennligst vent, kontakter speil for å initialisere oppdateringspakker."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Kunne ikke legge til oppdateringsmedia"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -784,48 +816,52 @@ msgstr ""
"\n"
"Vil du prøve et annet speil?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Vennligst vent, finner tilgjengelige pakker..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Installasjon mislykket"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Fjern"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -834,44 +870,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Noen pakker kan ikke installeres"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Alt er allerede installert."
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ikke i stand til å få tak i kildepakker."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Ikke i stand til å få tak i kildepakker, beklager."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Endre media"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vennligst sett inn media kalt \"%s\" på enhet [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Installasjon mislykket"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -879,36 +911,36 @@ msgstr ""
"Installasjon mislykket, noen filer mangler.\n"
"Du vil kanskje oppdatere din kildedatabase."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Vennligst vent, fjerner pakker for at andre skal kunne bli oppgradert..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Alt er allerede installert."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Alt er allerede installert (skal dette skje i det hele tatt?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Vennligst vent, leser pakkedatabase..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Vennligst vent, fjerner pakker..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -920,7 +952,7 @@ msgstr ""
"Dette verktøyet vil hjelpe deg å velge vilken programvare du skal fjerne\n"
"fra maskinen din."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -932,7 +964,7 @@ msgstr ""
"Dette verktøyet vil hjelpe deg å velge oppdateringene du skal installere\n"
"på maskinen din."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1174,9 +1206,6 @@ msgstr "Installer alle"
#~ msgid "Force"
#~ msgstr "Tving"
-#~ msgid "Error..."
-#~ msgstr "Feil..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Det oppsto problemer under installasjonen"
@@ -1477,9 +1506,6 @@ msgstr "Installer alle"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp proxy:"
-#~ msgid "Proxy username:"
-#~ msgstr "Proxy brukernavn:"
-
#~ msgid "Proxy password:"
#~ msgstr "Proxy passord:"
@@ -1519,9 +1545,6 @@ msgstr "Installer alle"
#~ msgid "Choose Packages"
#~ msgstr "Velg pakker"
-#~ msgid "Username:"
-#~ msgstr "Brukernavn:"
-
#~ msgid "Security"
#~ msgstr "Sikkerhet"
diff --git a/po/pl.po b/po/pl.po
index 63b53450..b9ee4b6e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-22 23:46+0100\n"
"Last-Translator: Arkadiusz Lipiec <alipiec@elka.pw.edu.pl>\n"
"Language-Team: Polish <pl@li.org>\n"
@@ -54,7 +54,7 @@ msgstr "¦cie¿ka lub punkt montowania:"
msgid "Removable device"
msgstr "Napêd wymienny"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Aktualizacje z dziedziny bezpieczeñstwa"
@@ -70,7 +70,7 @@ msgstr "Wybierz serwer zwierciadlany..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Has³o:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "Rodzaj ¼ród³a:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Anuluj"
@@ -160,43 +162,70 @@ msgstr "Aktualizuj"
msgid "Please wait, updating media..."
msgstr "Proszê czekaæ, aktualizacja no¶nika..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Konfiguracja ¼róde³"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Konfiguracja ¼róde³"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "W³±czone?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "¬ród³o"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Usuñ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Modyfikuj"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Dodaj..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Aktualizuj..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Zapisz i zakoñcz"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Zakoñcz"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +236,7 @@ msgstr ""
"\n"
"Czy chcesz kontynuowaæ?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -338,11 +367,11 @@ msgid "China"
msgstr "Chiny"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Stany Zjednoczone"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +384,15 @@ msgstr ""
"\n"
"Czy chcesz kontynuowaæ?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Proszê czekaæ, pobieranie adresów serwerów zwierciadlanych."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "B³±d podczas pobierania"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -378,11 +407,11 @@ msgstr ""
"Sieæ lub strona MandrakeSoft mog± byæ niedostêpne.\n"
"Spróbuj pó¼niej jeszcze raz."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Brak serwerów zwierciadlanych"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -396,7 +425,7 @@ msgstr ""
"gdy architektura procesora nie jest obs³ugiwana przez\n"
"oficjalne aktualizacje Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Wybierz serwer zwierciadlany."
@@ -404,71 +433,71 @@ msgstr "Wybierz serwer zwierciadlany."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Niedostêpne)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Wyniki wyszukiwania"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Wyniki wyszukiwania (brak)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Proszê czekaæ, wyszukiwanie..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Zatrzymaj"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Dodawalne"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Aktualizowalne"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Wymagany jest jeden z poni¿szych pakietów:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Proszê wybraæ"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "nieznany pakiet "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Proszê czekaæ, wypisywanie pakietów..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(brak)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Brak aktualizacji"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -478,11 +507,11 @@ msgstr ""
"dostêpnych aktualizacji dla zainstalowanych na komputerze pakietów\n"
"albo zosta³y ju¿ zainstalowane wszystkie aktualizacje."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Zostanie usuniêtych kilka dodatkowych pakietów"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -492,11 +521,11 @@ msgstr ""
"usuniête:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Niektóre pakiety nie mog± zostaæ usuniête"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -506,11 +535,11 @@ msgstr ""
"teraz odznaczone:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Wymagane s± dodatkowe pakiety"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -520,11 +549,11 @@ msgstr ""
"zostaæ zainstalowane:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Niektóre pakiety nie mog± zostaæ zainstalowane"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -532,21 +561,21 @@ msgstr ""
"Niestety, poni¿sze pakiety nie mog± zostaæ zaznaczone:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Niektóre pakiety musz± zostaæ usuniête"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Wybranych: %d MB / Miejsce na dysku: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Wybrany rozmiar: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -556,12 +585,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "¬ród³o"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -582,7 +611,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -601,68 +630,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Aktualizacje poprawiaj±ce b³êdy"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Zwyk³e aktualizacje"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Lista wyboru Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Wszystkie pakiety, alfabetycznie"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Wszystkie pakiety,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "wed³ug grupy"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "wed³ug rozmiaru"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "wed³ug stanu zaznaczenia"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "wed³ug repozytorium ¼ród³owego"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "wed³ug dostêpno¶ci aktualizacji"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "w opisach"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "w nazwach"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "w plikach"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Zwyk³e aktualizacje"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -677,35 +706,35 @@ msgstr ""
"\n"
"Czy chcesz kontynuowaæ?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Znajd¼:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Wyszukaj"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Zainstaluj"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Aktualizacja Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Usuwanie pakietów oprogramowania"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Intalacja pakietów oprogramowania"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -718,26 +747,26 @@ msgstr ""
"\n"
"Czy chcesz kontynuowaæ?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Proszê czekaæ, nawi±zywanie po³±czenia z serwerem zwierciadlanym\n"
"w celu pobrania informacji o nowych pakietach."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "B³±d podczas aktualizacji no¶nika"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Wyst±pi³ nieodwracalny b³±d podczas aktualizacji informacji o pakietach."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Sposób rêcznego wyboru serwera zwierciadlanego"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -751,17 +780,17 @@ msgstr ""
"\n"
"Nastêpnie nale¿y ponownie uruchomiæ MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Proszê czekaæ, nawi±zywanie po³±czenia z serwerem zwierciadlanym\n"
"w celu inicjacji pakietów aktualizacyjnych."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "B³±d podczas dodawania no¶nika aktualizacyjnego"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -782,48 +811,52 @@ msgstr ""
"\n"
"Czy chcesz spróbowaæ innego serwera zwierciadlanego?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Proszê czekaæ, wyszukiwanie dostêpnych pakietów..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Wszystkie ¿±dane pakiety zosta³y pomy¶lnie zainstalowane."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Wszystko zosta³o pomy¶lnie zainstalowane"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalacja zakoñczona niepowodzeniem"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Usuñ"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -832,44 +865,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Niektóre pakiety nie mog± zostaæ zainstalowane"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Wszystko zosta³o pomy¶lnie zainstalowane"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Nie mo¿na pobraæ pakietów ¼ród³owych."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Niestety, nie mo¿na pobraæ pakietów ¼ród³owych."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Zmieñ no¶nik"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Wsuñ no¶nik oznaczony \"%s\" do urz±dzenia [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalacja zakoñczona niepowodzeniem"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -877,37 +906,37 @@ msgstr ""
"Instalacja nie powiod³a siê, brak niektórych plików.\n"
"Mo¿e zachdziæ potrzeba aktualizacji bazy danych ¼róde³."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Proszê czekaæ, usuwanie pakietów w celu umo¿liwienia aktualizacji..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Brak programu"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Brak wymaganego programu (grpmi). Sprawd¼ swoj± instalacjê."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Wszystko zosta³o ju¿ zainstalowane."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
"Wszystko zosta³o ju¿ zainstalowane (czy rzeczywi¶cie taki by³\n"
"zamierzony efekt?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Proszê czekaæ, odczytywanie bazy danych pakietów..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Proszê czekaæ, usuwanie pakietów..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -919,7 +948,7 @@ msgstr ""
"To narzêdzie pomo¿e ci wybraæ programy, które mog± zostaæ usuniête\n"
"z komputera."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -931,7 +960,7 @@ msgstr ""
"To narzêdzie pomo¿e ci wybraæ aktualizacje, które mo¿esz chcieæ\n"
"zainstalowaæ na tym komputerze."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/pt.po b/po/pt.po
index 29064441..bca3b8d9 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-29 14:34+0200\n"
"Last-Translator: José JORGE <jose.jorge@oreka.com>\n"
"Language-Team: Português\n"
@@ -59,7 +59,7 @@ msgstr "Caminho ou ponto de montagem:"
msgid "Removable device"
msgstr "Dispositivo amovível"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Actualizações de segurança"
@@ -75,7 +75,7 @@ msgstr "Escolha um espelho..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Senha:"
@@ -108,14 +108,16 @@ msgid "Type of source:"
msgstr "Tipo de fonte:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Cancelar"
@@ -165,43 +167,71 @@ msgstr "Actualizar"
msgid "Please wait, updating media..."
msgstr "Por favor aguarde, a actualizar o média..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Configurar as fontes"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Configurar as fontes"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Activado?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Fonte"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Apagar"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Editar"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Adicionar..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Actualizar..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Erro..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Gravar e sair"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Sair"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -212,7 +242,7 @@ msgstr ""
"\n"
"Posso continuar?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +373,11 @@ msgid "China"
msgstr "China"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Estados Unidos"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -359,17 +389,17 @@ msgstr ""
"\n"
"Posso continuar?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Por favor aguarde, estou a descarregar os endereços dos espelhos a partir da "
"MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Erro durante o descarregamento"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -384,11 +414,11 @@ msgstr ""
"A rede, ou o servidor da MandrakeSoft, podem estar desligados.\n"
"Por favor tente outra vez mais tarde."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nenhum espelho"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -402,7 +432,7 @@ msgstr ""
"em que a arquitectura do seu processador não é suportada pelas\n"
"Actualizações Oficiais da Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Por favor escolha o servidor espelho desejado."
@@ -410,71 +440,71 @@ msgstr "Por favor escolha o servidor espelho desejado."
msgid "Other"
msgstr "Outro"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Não disponível)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Resultados da Pesquisa"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Resultados da Pesquisa (nenhum)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Por favor aguarde, a procurar..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Parar"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Instalável"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Actualizável"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Mais informação sobre o pacote..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Um dos pacotes seguintes é preciso :"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Faça favor de escolher"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pacote desconhecido "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Por favor aguarde, a fazer a lista dos pacotes..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nenhum)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Nenhuma actualização"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -484,11 +514,11 @@ msgstr ""
"não há actualizações para os pacotes instalados no seu\n"
"computador, ou você já as instalou todas."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Alguns pacotes adicionais precisam ser apagados"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -498,11 +528,11 @@ msgstr ""
"precisam de ser apagados:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Alguns pacotes não podem ser apagados"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -512,11 +542,11 @@ msgstr ""
"deseleccionados agora :\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Pacotes adicionais necessários"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -526,11 +556,11 @@ msgstr ""
"instalados :\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Alguns pacotes não podem ser instalados"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -538,21 +568,21 @@ msgstr ""
"Desculpa, os pacotes seguintes não podem ser seleccionados:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Alguns pacotes precisam de ser apagados"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Selecção : %d MB / Espaço disponível no disco : %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Tamanho da selecção : %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -567,12 +597,12 @@ msgstr ""
"O que mudou :\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Fonte : %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -593,7 +623,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -612,67 +642,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Actualizações de Correcção de Erros"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Actualizações normais"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Selecção da Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Todos os pacotes, alfabéticamente"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Todos os pacotes,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "por grupo"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "por tamanho"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "por estado de selecção"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "por fonte"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "por disponibilidade de actualização"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "nas descrições"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "nos nomes"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "nos ficheiros"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Informações máximas"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Informações normais"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -688,35 +718,35 @@ msgstr ""
"\n"
"Posso continuar?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Procurar:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Procurar"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalar"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Actualizações Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Apagar Pacotes de Programas"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalar Pacotes de Programas"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -728,25 +758,25 @@ msgstr ""
"\n"
"Posso continuar?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Por favor aguarde, estou a contactar o espelho para actualizar as "
"informações dos pacotes."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Erro ao actualizar o média"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Houve um erro irrecuperável ao actualizar as informações dos pacotes."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Como escolher manualmente o seu servidor espelho"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -760,17 +790,17 @@ msgstr ""
"\n"
"Depois, relance MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Por favor aguarde, estou a contactar o espelho para inicializar as "
"actualizações de pacotes."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Erro ao adicionar o média de actualização"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -791,46 +821,50 @@ msgstr ""
"\n"
"Deseja tentar com outro espelho?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Por favor aguarde, a procurar os pacotes disponíveis..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Todos os pacotes pedidos foram instalados com sucesso."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Tudo se instalou com sucesso"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "A instalação acabou"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "A inspectar %s"
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Apagar .%s"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Utilizar .%s como ficheiro principal"
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Não fazer nada"
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Inspectar..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -843,7 +877,7 @@ msgstr ""
"Alguns ficheiros de configuraçao foram criados como `.rpmnew' ou\n"
"`.rpmsave', pode agora inspectar-los para agir :"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -851,36 +885,32 @@ msgstr ""
"alguns pacotes não puderam ser\n"
"instalados correctamente"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "Tudo se instalou com sucesso"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr "Inspectar..."
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Impossível de descarregar os pacotes da fonte"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Impossível de descarregar os pacotes da fonte, peço desculpa."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Mudar o média"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favor meta o média chamado \"%s\" no dispositivo [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "A instalação falhou"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -888,37 +918,37 @@ msgstr ""
"A instalação falhou, falta alguns ficheiros.\n"
"Você pode querer actualizar os dados das suas fontes."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Por favor aguarde, a apagar os pacotes que permitem de fazer a actualização "
"dos outros..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Falta um programa"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Um programa necessário falta (grpmi). Verifique a sua instalação."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Já está tudo instalado."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Já está tudo instalado (será que isto pode acontecer?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Por favor aguarde, a ler a base de dados dos pacotes..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Por favor aguarde, a apagar os pacotes..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -930,7 +960,7 @@ msgstr ""
"Esta ferramenta vai ajudar-lo a escolher quais programas deseja apagar\n"
"do seu computador."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -942,7 +972,7 @@ msgstr ""
"Esta ferramenta vai ajudar-lo a escolher quais actualizações deseja\n"
"instalar no seu computador."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1192,9 +1222,6 @@ msgstr "Instalar Programas"
#~ msgid "Force"
#~ msgstr "Forçar"
-#~ msgid "Error..."
-#~ msgstr "Erro..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Encontrados problemas durante a instalação"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 08647316..9b08f0f8 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-13 10:15GMT -3\n"
"Last-Translator: Marcio Jose Conceicao <marciojc@yahoo.com>\n"
"Language-Team: Brazilian Portuguese\n"
@@ -57,7 +57,7 @@ msgstr "Caminho ou ponto de montagem:"
msgid "Removable device"
msgstr "Dispositivo removível"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Atualizações de segurança"
@@ -73,7 +73,7 @@ msgstr "Escolhendo um servidor..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Senha:"
@@ -107,14 +107,16 @@ msgid "Type of source:"
msgstr "Tipo de fonte:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Cancelar"
@@ -164,43 +166,70 @@ msgstr "Atualizar"
msgid "Please wait, updating media..."
msgstr "Aguarde, atualizando mídia"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Configurar fontes"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Configurar fontes"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Habilitar?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Fonte"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Remover"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Editar"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Adicionar"
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Atualizar"
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Salvar e sair"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Sair"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -211,7 +240,7 @@ msgstr ""
"\n"
"Está pronto para continuar?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -344,11 +373,11 @@ msgid "China"
msgstr "China"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Estados Unidos"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -361,16 +390,16 @@ msgstr ""
"\n"
"Deseja continuar?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Aguarde, fazendo download da lista de servidores do site da MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Erro durante download"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -386,11 +415,11 @@ msgstr ""
"indisponíveis no momento.\n"
"Por favor tente mais tarde."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nenhum servidor"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -404,7 +433,7 @@ msgstr ""
"que a arquitetura do processador do seu computador não é suportada\n"
"pelas Atualizações Oficiais do Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Escolha o servidor desejado."
@@ -412,72 +441,72 @@ msgstr "Escolha o servidor desejado."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Indisponível)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Resultados da busca"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Resultados da busca (nenhum)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Aguarde, procurando nos arquivos:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "instalável"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Atualizável"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Um dos seguintes pacotes é necessário"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Por favor escolha"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Pacote desconhecido"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Aguarde, listando pacotes..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nenhum)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Sem atualização"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -487,11 +516,11 @@ msgstr ""
"atualização disponível para os pacotes instaldos em seu computador,\n"
"ou você já atualizou todos."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Alguns pacotes adicionais precisam ser removidos"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -501,11 +530,11 @@ msgstr ""
"precisam ser removidos:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Alguns pacotes não podem ser removidos"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -515,11 +544,11 @@ msgstr ""
"ser desselecionados:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Pacotes adicionais são necessários"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -529,11 +558,11 @@ msgstr ""
"ser instalados:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Alguns pacotes não podem ser instaldos"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -541,21 +570,21 @@ msgstr ""
"Desculpe, o(s) seguinte(s) pacote(s) não podem ser selecionados:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Alguns pacotes precisam ser removidos"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Selecionado: %d MB / Disponível: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Tamanho selecionado: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -565,12 +594,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Fonte"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -591,7 +620,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -610,69 +639,69 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Atualizações de segurança"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Atualizações normais"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Recomendação do Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Todos os pacotes, alfabeticamente"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Todos os pacotes,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "por grupo"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "por tamanho"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "por estado de seleção"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "por servidor"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "por disponibilidade de atualização"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Arquivos locais"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Atualizações normais"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -687,35 +716,35 @@ msgstr ""
"\n"
"Deseja continuar?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Localizar:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Procurar"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instalar"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Gerenciador de Softwares"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalador de pacotes"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -727,24 +756,24 @@ msgstr ""
"\n"
"Deseja continuar?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Aguarde, conectando ao servidor para atualizar a informação dos pacotes"
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Erro ao atualizar mídia"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Ocorreu um erro irrecuperável ao atualizar as informações dos pacotes."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -753,16 +782,16 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Aguarde, conectando ao servidor para iniciar a atualização dos pacotes."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Erro ao adicionar mídia de atualização"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -783,48 +812,52 @@ msgstr ""
"\n"
"Você deseja tentar outro servidor?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Aguarde, procurando pacotes disponíveis..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalação falhou"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Remover"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -833,44 +866,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Alguns pacotes não podem ser instaldos"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Tudo já foi instalado."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Não foi possível obter fontes de pocotes."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Não foi possível obter fontes de pacotes."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Alterando mídia"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Por favaor insira a mídia com nome \"%s\" no drive [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalação falhou"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -878,35 +907,35 @@ msgstr ""
"Instalação falhou, alguns arquivos estão faltando.\n"
"Você pode atualizar a sua lista de fontes."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Aguarde, removendo pacotes para permitir outras atualizações..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Tudo já foi instalado."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Tudo já foi instaldo. (supõe-se que seja válido para todos?)"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Aguarde, lendo banco de dados de pacotes..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Aguarde, removendo pacotes..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -918,7 +947,7 @@ msgstr ""
"Esta ferramenta irá ajudar você quando precisar remover softwares\n"
"do seu computador."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -929,7 +958,7 @@ msgstr ""
"\n"
"Esta ferramenta irá ajudar na atualização do seu sistema."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/ro.po b/po/ro.po
index 097e36da..d5109342 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-28 11:25GMT+2\n"
"Last-Translator: Harald Ersch <hersch@romatsa.ro>\n"
"Language-Team: romanian <ro@li.org>\n"
@@ -57,7 +57,7 @@ msgstr "Calea sau punctul de montare: "
msgid "Removable device"
msgstr "Dispozitiv detaºabil"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Actualizãri ale sistemului de securitate"
@@ -73,7 +73,7 @@ msgstr "Selectare server oglindã..."
msgid "Login:"
msgstr "Logare:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Parola:"
@@ -106,14 +106,16 @@ msgid "Type of source:"
msgstr "Tipul sursei:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Renunþã"
@@ -163,43 +165,70 @@ msgstr "Actualizeazã"
msgid "Please wait, updating media..."
msgstr "Vã rog sã aºteptaþi, actualizez mediul..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Configurare surse"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Configurare surse"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Activat?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sursã"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "ªterge"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Editeazã"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Adaugã..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Actualizeazã..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Salvare ºi ieºire"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Ieºire"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -210,7 +239,7 @@ msgstr ""
"\n"
"Pot continua?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -342,11 +371,11 @@ msgid "China"
msgstr "China"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Statele Unite"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -359,17 +388,17 @@ msgstr ""
"\n"
"Pot sã continui?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Vã rog sã aºteptaþi, descarc adresele serverelor oglindã de pe situl "
"MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Eroare în timpul descãrcãrii"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -384,11 +413,11 @@ msgstr ""
"Probabil reþeaua sau situl Web al MandrakeSoft nu sunt disponibile.\n"
"Vã rog sã încercaþi din nou mai târziu."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nu existã servere oglindã"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -402,7 +431,7 @@ msgstr ""
"cazul când arhitectura procesorului dvs. nu este suportatã\n"
"de actualizãrile oficiale Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Vã rog sã selectaþi serverul oglindã dorit."
@@ -410,71 +439,71 @@ msgstr "Vã rog sã selectaþi serverul oglindã dorit."
msgid "Other"
msgstr "Diverse"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Indisponibil)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Rezultatele cãutãrii"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Rezultatele cãutãrii (nimic)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Vã rog sã aºteptaþi, caut..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Opreºte"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Disponibile pt. adãugare"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Actualizabile"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Mai multe informaþii despre pachet..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Unul din urmãtoarele pachete e necesar:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Vã rog sã alegeþi"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pachet necunoscut"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Vã rog sã aºteptaþi, listez pachetele..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nimic)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Nu sunt actualizãri"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -484,11 +513,11 @@ msgstr ""
"actualizãri disponibile pentru pachetele instalate pe calculatorul dvs.,\n"
"sau cã le-aþi instalat deja pe toate."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Trebuie ºterse unele pachete adiþionale"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -498,11 +527,11 @@ msgstr ""
"urmãtoarele pachete trebuie de asemenea ºterse:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Unele pachetele nu pot fi ºterse"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -512,11 +541,11 @@ msgstr ""
"deselectate acum:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Pachete adiþionale necesare"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -526,11 +555,11 @@ msgstr ""
"trebuie de asemenea instalate\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Unele pachetele nu pot fi instalate"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -538,21 +567,21 @@ msgstr ""
"Regret, urmãtoarele pachete nu pot fi selectate:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Unele pachete trebuie ºterse"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Selectat: %d MB / Spaþiu liber pe disc: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Mãrime selecþie: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -562,12 +591,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Sursã"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -588,7 +617,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -607,68 +636,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Actualizãri pentru corectarea erorilor"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Actualizãri normale"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Opþiuni Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Toate pachetele, alfabetic"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Toate pachetele,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "dupã grup"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "dupã mãrime"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "dupã stare selecþie"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "dupã sursã"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "dupã disponibilitatea actualizãrii"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "în descrieri"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "în nume"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "în fiºiere "
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Actualizãri normale"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -683,35 +712,35 @@ msgstr ""
"\n"
"Doriþi sã continuaþi?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Cautã:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Cãutare"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instaleazã"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Actualizare Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "ªtergere pachete Software"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalare pachete Software"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -724,27 +753,27 @@ msgstr ""
"\n"
"Doriþi sã continuaþi?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Vã rog sã aºteptaþi, contactez serverul oglindã pentru actualizarea "
"informaþiei pachetelor."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Eroare la actualizarea mediului"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"A fost detectatã o eroare majorã în timpul actualizãrii informaþiei "
"pachetelor."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Cum sã selectaþi manual serverul oglindã"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -758,17 +787,17 @@ msgstr ""
"\n"
"Apoi reporniþi MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Vã rog sã aºteptaþi, contactez serverul oglindã pentru iniþializarea "
"actualizãrii pachetelor."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Eroare la adãugarea mediului de actualizare"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -790,48 +819,52 @@ msgstr ""
"\n"
"Doriþi sã încercaþi alt server oglindã?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Vã rog sã aºteptaþi, caut pachetele disponibile..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Toate pachetele cerute au fost instalate cu succes."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Totul a fost instalat cu succes"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalare eºuatã"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "ªterge"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -840,44 +873,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Unele pachetele nu pot fi instalate"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Totul a fost instalat cu succes"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Nu pot prelua pachetele sursã."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Regret, nu pot prelua pachetele sursã."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Schimbã mediul"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Vã rog sã introduceþi mediul numit \"%s\" în dispozitivul [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalare eºuatã"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -885,38 +914,38 @@ msgstr ""
"Instalare nereuºitã, unele fiºiere lipsesc.\n"
"Probabil ar trebui sã actualizaþi baza de date a surselor."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Vã rog sã aºteptaþi, ºterg pachetele pentru a permite altora sã fie "
"actualizate..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Program lipsã"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Un program absolut necesar lipseºte (grpmi). Verificaþi instalarea."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Toate pachetele sunt deja instalate."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
"Toate pachetele sunt deja instalate (ar trebui sã se întâmple vreodatã?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Vã rog sã aºteptaþi, citesc baza de date a pachetelelor..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Vã rog sã aºteptaþi, ºterg pachetele..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -928,7 +957,7 @@ msgstr ""
"Acest utilitar vã va ajuta sã alegeþi programele pe care doriþi \n"
"sã le ºtergeþi de pe calculatorul dvs."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -941,7 +970,7 @@ msgstr ""
"care doriþi \n"
"sã le actualizaþi ."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/ru.po b/po/ru.po
index aa3bb9a1..765eb681 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2000-11-27 16:24+0200\n"
"Last-Translator: Pavel Maryanov <acid_jack@ukr.net>\n"
"Language-Team: Russian\n"
@@ -57,7 +57,7 @@ msgstr "ðÕÔØ ÉÌÉ ÔÏÞËÁ ÍÏÎÔÉÒÏ×ÁÎÉÑ:"
msgid "Removable device"
msgstr "óßÅÍÎÏÅ ÕÓÔÒÏÊÓÔ×Ï"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "ïÂÎÏ×ÌÅÎÉÑ ÐÏ ÂÅÚÏÐÁÓÎÏÓÔÉ"
@@ -73,7 +73,7 @@ msgstr "÷ÙÂÅÒÉÔÅ ÚÅÒËÁÌÏ..."
msgid "Login:"
msgstr "ìÏÇÉÎ:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "ðÁÒÏÌØ:"
@@ -106,14 +106,16 @@ msgid "Type of source:"
msgstr "ôÉÐ ÎÁËÏÐÉÔÅÌÑ:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "ïë"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "ïÔÍÅÎÁ"
@@ -164,43 +166,73 @@ msgstr "ïÂÎÏ×ÉÔØ"
msgid "Please wait, updating media..."
msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÏÂÎÏ×ÌÑÅÔÓÑ ÎÁËÏÐÉÔÅÌØ..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "îÁÓÔÒÏÉÔØ ÎÁËÏÐÉÔÅÌÉ"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÏËÓÉ:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "éÍÑ:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "îÁÓÔÒÏÉÔØ ÎÁËÏÐÉÔÅÌÉ"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "÷ËÌÀÞÅÎ?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "îÁËÏÐÉÔÅÌØ"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "õÄÁÌÉÔØ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "òÅÄÁËÔÉÒÏ×ÁÔØ"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "äÏÂÁ×ÉÔØ..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "ïÂÎÏ×ÉÔØ..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "ïÛÉÂËÁ..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "óÏÈÒÁÎÉÔØ É ×ÙÊÔÉ"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "÷ÙÊÔÉ"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -211,7 +243,7 @@ msgstr ""
"\n"
"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -342,11 +374,11 @@ msgid "China"
msgstr "ëÉÔÁÊ"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "óÏÅÄÉÎÅÎÎÙÅ ûÔÁÔÙ"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -358,17 +390,17 @@ msgstr ""
"ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÓËÁÞÉ×ÁÀÔÓÑ ÁÄÒÅÓÁ ÚÅÒËÁÌ Ó ×ÅÂ-ÓÁÊÔÁ\n"
"MandrakeSoft"
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "ïÛÉÂËÁ ×Ï ×ÒÅÍÑ ÓËÁÞÉ×ÁÎÉÑ"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -383,11 +415,11 @@ msgstr ""
"÷ÏÚÍÏÖÎÏ ÓÅÔØ ÉÌÉ ×ÅÂ-ÓÁÊÔ MandrakeSoft ÎÅÄÏÓÔÕÐÎÙ.\n"
"ðÏÖÁÌÕÊÓÔÁ, ÐÏÐÙÔÁÊÔÅÓØ ÓÎÏ×Á ÞÕÔØ ÐÏÚÖÅ."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "îÅÔ ÚÅÒËÁÌÁ"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +433,7 @@ msgstr ""
"ÞÁÓÔÙÍ Ñ×ÌÑÅÔÓÑ ÓÌÕÞÁÊ, ËÏÇÄÁ ÁÒÈÉÔÅËÔÕÒÁ ×ÁÛÅÇÏ ÐÏÒÃÅÓÓÏÒÁ ÎÅ\n"
"ÐÏÄÄÅÒÖÉ×ÁÅÔÓÑ ïÆÉÃÉÁÌØÎÙÍÉ ïÂÎÏ×ÌÅÎÉÑÍÉ Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÏÅ ÚÅÒËÁÌÏ."
@@ -409,71 +441,71 @@ msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ ÖÅÌÁÅÍÏÅ ÚÅÒËÁÌÏ."
msgid "Other"
msgstr "äÒÕÇÏÅ"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(îÅÄÏÓÔÕÐÅÎ)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "òÅÚÕÌØÔÁÔÙ ÐÏÉÓËÁ (ÎÅÔ)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "ïÓÔÁÎÏ×ÉÔØ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "íÏÖÎÏ ÄÏÂÁ×ÉÔØ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "íÏÖÎÏ ÏÂÎÏ×ÉÔØ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr "îÅ ×ÙÂÒÁÎÎÙÅ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr "÷ÙÂÒÁÎÎÙÅ"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "äÏÐÏÌÎÉÔÅÌØÎÁÑ ÉÎÆÏÒÍÁÃÉÑ Ï ÐÁËÅÔÅ..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "îÕÖÅÎ ÏÄÉÎ ÉÚ ÓÌÅÄÕÀÝÉÈ ÐÁËÅÔÏ×"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÙÂÅÒÉÔÅ"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "ÎÅÉÚ×ÅÓÔÎÙÊ ÐÁËÅÔ"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÓÏÓÔÁ×ÌÑÅÔÓÑ ÓÐÉÓÏË ÐÁËÅÔÏ×..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ÎÅÔ)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "ïÂÎÏ×ÌÅÎÉÊ ÎÅÔ"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -483,11 +515,11 @@ msgstr ""
"ÐÁËÅÔÏ×, ÕÓÔÁÎÏ×ÌÅÎÎÙÈ ÎÁ ×ÁÛÅÍ ËÏÍÐØÀÔÅÒÅ, ÌÉÂÏ ÏÎÉ ÕÖÅ ×ÓÅ\n"
"ÕÓÔÁÎÏ×ÌÅÎÙ."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "îÅËÏÔÏÒÙÅ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -497,11 +529,11 @@ msgstr ""
"ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÕÄÁÌÅÎÙ"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -511,11 +543,11 @@ msgstr ""
"ÄÌÑ ÕÄÏ×ÌÅÔ×ÏÒÅÎÉÑ ÉÈ ÚÁ×ÉÓÉÍÏÓÔÅÊ:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "ôÒÅÂÕÀÔÓÑ ÄÏÐÏÌÎÉÔÅÌØÎÙÅ ÐÁËÅÔÙ"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -525,11 +557,11 @@ msgstr ""
"ÔÁËÖÅ ÄÏÌÖÎÙ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÙ:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ÕÓÔÁÎÏ×ÌÅÎÙ"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -537,21 +569,21 @@ msgstr ""
"éÚ×ÉÎÉÔÅ, ÎÏ ÓÌÅÄÕÀÝÉÅ ÐÁËÅÔÙ ÎÅ ÍÏÇÕÔ ÂÙÔØ ×ÙÂÒÁÎÙ:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "îÅËÏÔÏÒÙÅ ÐÁËÅÔÙ ÄÏÌÖÎÙ ÂÙÔØ ÕÄÁÌÅÎÙ"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "÷ÙÂÒÁÎÏ: %d íâ / ó×ÏÂÏÄÎÏ ÎÁ ÄÉÓËÅ: %d íâ"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "÷ÙÂÒÁÎÎÙÊ ÒÁÚÍÅÒ: %d íâ"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -566,12 +598,12 @@ msgstr ""
"Changelog:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "éÓÔÏÞÎÉË: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +624,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -611,67 +643,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "ïÂÎÏ×ÌÅÎÉÑ ÂÁÇÆÉËÓÏ×"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "îÏÒÍÁÌØÎÙÅ ÏÂÎÏ×ÌÅÎÉÑ"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "÷ÙÂÏÒ Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "÷ÓÅ ÐÁËÅÔÙ, ÐÏ ÁÌÆÁ×ÉÔÕ"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "÷ÓÅ ÐÁËÅÔÙ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "ÐÏ ÇÒÕÐÐÁÍ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "ÐÏ ÒÁÚÍÅÒÕ"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "ÐÏ ÓÏÓÔÏÑÎÉÀ ×ÙÂÏÒÁ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "ÐÏ ÉÓÔÏÞÎÉËÕ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "ÐÏ ÄÏÓÔÕÐÎÏÓÔÉ ÏÂÎÏ×ÌÅÎÉÊ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "ÐÏ ÏÐÉÓÁÎÉÑÍ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "ÐÏ ÉÍÅÎÁÍ"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "ÐÏ ÆÁÊÌÁÍ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "íÁËÓÉÍÕÍ ÉÎÆÏÒÍÁÃÉÉ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "óÔÁÎÄÁÒÔÎÁÑ ÉÎÆÏÒÍÁÃÉÑ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -686,35 +718,35 @@ msgstr ""
"\n"
"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "îÁÊÔÉ:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "ðÏÉÓË"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "õÓÔÁÎÏ×ÉÔØ"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-cronyx-helvetica-bold-normal--25-*-100-100-p-*-koi8-r,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "ïÂÎÏ×ÌÅÎÉÅ Mandrake"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "õÄÁÌÅÎÉÅ ÐÁËÅÔÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "õÓÔÁÎÏ×ËÁ ÐÁËÅÔÏ× ÐÒÏÇÒÁÍÍÎÏÇÏ ÏÂÅÓÐÅÞÅÎÉÑ"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -726,25 +758,25 @@ msgstr ""
"ÞÔÏ ×ÁÛÁ ÓÅÔØ × ÄÁÎÎÙÊ ÍÏÍÅÎÔ ÒÁÂÏÔÁÅÔ.\n"
"÷ÓÅ × ÐÏÒÑÄËÅ? íÏÖÎÏ ÐÒÏÄÏÌÖÁÔØ?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó ÚÅÒËÁÌÏÍ, ÞÔÏÂÙ ÏÂÎÏ×ÉÔØ "
"ÉÎÆÏÒÍÁÃÉÀ Ï ÐÁËÅÔÁÈ."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "ïÛÉÂËÁ ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÎÁËÏÐÉÔÅÌÑ"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "ðÒÏÉÚÏÛÌÁ ÎÅÕÓÔÒÁÎÉÍÁÑ ÏÛÉÂËÁ ÐÒÉ ÏÂÎÏ×ÌÅÎÉÉ ÉÎÆÏÒÍÁÃÉÉ Ï ÐÁËÅÔÁÈ."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "ëÁË ×ÒÕÞÎÕÀ ×ÙÂÒÁÔØ Ó×ÏÅ ÚÅÒËÁÌÏ"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -758,17 +790,17 @@ msgstr ""
"\n"
"úÁÔÅÍ, ÐÅÒÅÚÁÐÕÓÔÉÔÅ MandrakeUpdate."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"ðÏÖÁÌÕÊÓÔÁ, ÐÏÄÏÖÄÉÔÅ, ÕÓÔÁÎÁ×ÌÉ×ÁÅÔÓÑ ÓÏÅÄÉÎÅÎÉÅ Ó ÚÅÒËÁÌÏÍ, ÞÔÏÂÙ "
"ÉÎÉÃÉÁÌÉÚÉÒÏ×ÁÔØ ÐÁËÅÔÙ Ó ÏÂÎÏ×ÌÅÎÉÑÍÉ."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "ïÛÉÂËÁ ÐÒÉ ÄÏÂÁ×ÌÅÎÉÉ ÎÁËÏÐÉÔÅÌÑ Ó ÏÂÎÏ×ÌÅÎÉÑÍÉ"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -788,46 +820,50 @@ msgstr ""
"\n"
"öÅÌÁÅÔÅ ÐÏÐÒÏÂÏ×ÁÔØ ÄÒÕÇÏÅ ÚÅÒËÁÌÏ?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ×ÙÐÏÌÎÑÅÔÓÑ ÐÏÉÓË ÄÏÓÔÕÐÎÙÈ ÐÁËÅÔÏ×..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "÷ÓÅ ÚÁÐÒÏÛÅÎÎÙÅ ÐÁËÅÔÙ ÂÙÌÉ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÙ."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "÷ÓÅ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÏ."
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "õÓÔÁÎÏ×ËÁ ÚÁ×ÅÒÛÅÎÁ"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "éÚÕÞÁÅÔÓÑ %s"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "õÄÁÌÉÔØ .%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "éÓÐÏÌØÚÏ×ÁÔØ .%s × ËÁÞÅÓÔ×Å ÇÌÁ×ÎÏÇÏ ÆÁÊÌÁ"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "îÉÞÅÇÅ ÎÅ ÄÅÌÁÔØ"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-cronyx-fixed-medium-r-normal--12-*-*-100--*-*-*-koi8-r,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "éÚÕÞÅÎÉÅ..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -840,7 +876,7 @@ msgstr ""
"îÅËÏÔÏÒÙÅ ÆÁÊÌÙ ÎÁÓÔÒÏÊËÉ ÂÙÌÉ ÓÏÚÄÁÎÙ ËÁË `.rpmnew' ÉÌÉ `.rpmsave',\n"
"ÔÅÐÅÒØ ×Ù ÍÏÖÅÔÅ ÐÏÄÒÏÂÎÏ ÉÚÕÞÉÔØ ÎÅËÔÏÒÙÅ ÄÅÊÓÔ×ÉÑ:"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -848,36 +884,32 @@ msgstr ""
"ÕÓÔÁÎÏ×ËÁ ÎÅËÏÔÏÒÙÈ ÐÁËÅÔÏ×\n"
"ÚÁ×ÅÒÛÉÌÁÓØ ÎÅÕÄÁÞÅÊ"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "×ÓÅ ÂÙÌÏ ÕÓÐÅÛÎÏ ÕÓÔÁÎÏ×ÌÅÎÏ"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "éÚÕÞÅÎÉÅ..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "îÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÎÁËÏÐÉÔÅÌØ Ó ÐÁËÅÔÁÍÉ."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "éÚ×ÉÎÉÔÅ, ÎÅ×ÏÚÍÏÖÎÏ ÐÏÌÕÞÉÔØ ÎÁËÏÐÉÔÅÌØ Ó ÐÁËÅÔÁÍÉ."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "éÚÍÅÎÉÔØ ÎÁËÏÐÉÔÅÌØ"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "ðÏÖÁÌÕÊÓÔÁ, ×ÓÔÁ×ØÔÅ ÎÁËÏÐÉÔÅÌØ Ó ÉÍÅÎÅÍ \"%s\" × ÕÓÔÒÏÊÓÔ×Ï [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "õÓÔÁÎÏ×ËÁ ÂÙÌÁ ÐÒÅÒ×ÁÎÁ"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -885,36 +917,36 @@ msgstr ""
"õÓÔÁÎÏ×ËÁ ÂÙÌÁ ÐÒÅÒ×ÁÎÁ, ÏÔÓÕÔÓÔ×ÕÀÔ ÎÅËÏÔÏÒÙÅ ÆÁÊÌÙ.\n"
"÷ÁÍ ÍÏÖÅÔ ÐÏÎÁÄÏÂÉÔØÓÑ ÏÂÎÏ×ÉÔØ Ó×ÏÀ ÂÁÚÕ ÄÁÎÎÙÈ ÎÁËÏÐÉÔÅÌÅÊ."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÑÀÔÓÑ ÐÁËÅÔÙ, ÞÔÏÂÙ ÄÒÕÇÉÅ ÍÏÇÌÉ ÂÙÔØ ÏÂÎÏ×ÌÅÎÙ..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "ðÒÏÇÒÁÍÍÁ ÏÔÓÕÔÓÔ×ÕÅÔ"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "ïÔÓÕÔÓÔ×ÕÅÔ ÔÒÅÂÕÅÍÁÑ ÐÒÏÇÒÁÍÍÁ (grpmi). ðÒÏ×ÅÒØÔÅ Ó×ÏÀ ÕÓÔÁÎÏ×ËÕ."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "÷ÓÅ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÏ."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "÷ÓÅ ÕÖÅ ÕÓÔÁÎÏ×ÌÅÎÏ (ÜÔÏ ×ÏÏÂÝÅ ÓÌÕÞÁÅÔÓÑ?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÐÒÏÉÚ×ÏÄÉÔÓÑ ÞÔÅÎÉÅ ÉÚ ÂÁÚÙ ÄÁÎÎÙÈ..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "ðÏÄÏÖÄÉÔÅ, ÐÏÖÁÌÕÊÓÔÁ, ÕÄÁÌÑÀÔÓÑ ÐÁËÅÔÙ..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -926,7 +958,7 @@ msgstr ""
"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÐÁËÅÔÙ ÄÌÑ ÕÄÁÌÅÎÉÑ Ó ×ÁÛÅÇÏ\n"
"ËÏÍÐØÀÔÅÒÁ."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -938,7 +970,7 @@ msgstr ""
"üÔÏÔ ÉÎÓÔÒÕÍÅÎÔ ÐÏÍÏÖÅÔ ×ÁÍ ×ÙÂÒÁÔØ ÏÂÎÏ×ÌÅÎÉÑ ÄÌÑ ÕÓÔÁÎÏ×ËÉ ÎÁ ×Á\n"
"ËÏÍÐØÀÔÅÒ."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1185,9 +1217,6 @@ msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ"
#~ msgid "Force"
#~ msgstr "îÁÓÉÌØÎÏ"
-#~ msgid "Error..."
-#~ msgstr "ïÛÉÂËÁ..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "÷ ÐÒÏÃÅÓÓÅ ÕÓÔÁÎÏ×ËÉ ×ÏÚÎÉËÌÉ ÐÒÏÂÌÅÍÙ"
@@ -1484,9 +1513,6 @@ msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp ÐÒÏËÓÉ:"
-#~ msgid "Proxy username:"
-#~ msgstr "éÍÑ ÐÏÌØÚÏ×ÁÔÅÌÑ ÐÒÏËÓÉ:"
-
#~ msgid "Proxy password:"
#~ msgstr "ðÁÒÏÌØ ÐÒÏËÓÉ:"
@@ -1526,9 +1552,6 @@ msgstr "õÓÔÁÎÏ×ÉÔØ ÐÒÏÇÒÁÍÍÎÏÅ ÏÂÅÓÐÅÞÅÎÉÅ"
#~ msgid "Choose Packages"
#~ msgstr "÷ÙÂÒÁÔØ ÐÁËÅÔÙ"
-#~ msgid "Username:"
-#~ msgstr "éÍÑ:"
-
#~ msgid "Security"
#~ msgstr "âÅÚÏÐÁÓÎÏÓÔØ"
diff --git a/po/sk.po b/po/sk.po
index 24feaf01..ff872453 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-26 11:18+0100\n"
"Last-Translator: Pavol Cvengros <orpheus@hq.alert.sk>\n"
"Language-Team: Sk <i18n@hq.alert.sk>\n"
@@ -57,7 +57,7 @@ msgstr "Cesta alebo bod pripojenia:"
msgid "Removable device"
msgstr "Vymeniteµné zariadenie"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Bezpeènostné aktualizácie"
@@ -73,7 +73,7 @@ msgstr "Zvoµte si miror..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Heslo:"
@@ -106,14 +106,16 @@ msgid "Type of source:"
msgstr "Typ zdroja:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Ok"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Zru¹i»"
@@ -163,43 +165,70 @@ msgstr "Aktualizácia"
msgid "Please wait, updating media..."
msgstr "Prosím èakajte, aktualizujem média..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Nastavi» zdroje"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Nastavi» zdroje"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Povolené?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Zdroj"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Odstráni»"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Zmeò"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Prida»..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Aktualizácia..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Ulo¾i» a ukonèi»"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Ukonèi»"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -210,7 +239,7 @@ msgstr ""
"\n"
"Mô¾eme pokraèova»?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +372,11 @@ msgid "China"
msgstr "Èína"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Spojené ©táty"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -360,15 +389,15 @@ msgstr ""
"\n"
"Je mo¾né pokraèova»?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Prosím èakajte, s»ahujem adresy mirorov z web stránky MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Chyba poèas s»ahovania"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -383,11 +412,11 @@ msgstr ""
"Sie», alebo web stránka MandrakeSoft-u nie je pravdepodobne dostupná.\n"
"Prosím skúste to neskôr."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "®iaden miror"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +430,7 @@ msgstr ""
"¾e architektúra Vá¹ho procesora nie je podporovaná\n"
"v Mandrake Linux Official Updates."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Prosím zvoµte si jeden z mirorov."
@@ -409,71 +438,71 @@ msgstr "Prosím zvoµte si jeden z mirorov."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Nedostupné)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Výsledky vyhµadávania"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Výsledky vyhµadávania (¾iadne)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Prosím èakajte, vyhµadávam..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Stop"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Pridateµné"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Aktualizovateµné"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Jeden z nasledujúcich balíèkov je potrebný:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Prosím zvoµte"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "neznámy balíèek"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Prosím èakajte, vypisujem balíèky..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(¾iaden)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "®iadna aktualizácia"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -483,11 +512,11 @@ msgstr ""
"momentálne nie sú dostupné ¾iadne aktualizácie pre balíèky nain¹talované\n"
"na Va¹om poèítaèi, alebo ich u¾ máte v¹etky nain¹talované."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Je potrebné odstráni» niektoré balíèky"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -496,11 +525,11 @@ msgstr ""
"Kvôli závislostiam budú tieto balíèky odstránené:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Niektoré balíèky nie je mo¾né odstráni»"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -509,11 +538,11 @@ msgstr ""
"Kvôli závislostiam musia by» nasledujúce balíèky teraz odznaèené:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Sú potrebné ïal¹ie balíèky"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -522,11 +551,11 @@ msgstr ""
"Pre vyrie¹enie závislosti, sú potrebné nain¹talova» tieto balíèky:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Niektoré balíèky nie je mo¾né nain¹talova»"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -534,21 +563,21 @@ msgstr ""
"Prepáète, tieto balíèky nie je mo¾né vybra»:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Je potrebné odstráni» niektoré balíèky"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Vybrané: %d MB / Dostupné: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Vybraná veµkos»: %d Mb"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -558,12 +587,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Zdroj"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -584,7 +613,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -603,68 +632,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Aktualizácie opravujúce chyby"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normálne aktualizácie"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Voµby Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "V¹etky balíèky, abecedne"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "V¹etky balíèky,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "podµa skupiny"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "podµa veµkosti"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "podµa stavu výberu"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "podµa zdroja"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "podµa dostupnosti zdroja"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "v popisoch"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "v menách"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "v súboroch"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normálne aktualizácie"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -680,35 +709,35 @@ msgstr ""
"\n"
"Mô¾eme pokraèova»?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Hµadaj:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Hµada»"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "In¹taluj"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Odstránenie softvérových balíèkov"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "In¹talácia softvérových balíèkov"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -721,24 +750,24 @@ msgstr ""
"\n"
"Mô¾eme pokraèova»?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Prosím èakajte, kontaktujem miror pre aktualizáciu informácii o balíèkoch."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Chyba pri aktualizácii média"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "Nastala neopraviteµná chyba poèas aktualizácie informácii o balíèkoch."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Ako si zvoli» mirror manuálne"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -752,16 +781,16 @@ msgstr ""
"\n"
"Potom re¹tartujte MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Prosím èakajte, kontaktujem miror pre inicializáciu aktualizácie balíèkov."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Chyba pri pridávaní média"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -781,48 +810,52 @@ msgstr ""
"\n"
"Chcete pou¾i» iný miror?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Prosím èakajte, hµadám dostupné balíèky..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "V¹etky po¾adované balíèky boli úspe¹ne nain¹talované."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "V¹etko bolo úspe¹ne nain¹talované"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "In¹talácia neúspe¹ná"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Odstráni»"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -831,44 +864,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Niektoré balíèky nie je mo¾né nain¹talova»"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "V¹etko bolo úspe¹ne nain¹talované"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Nie je mo¾né prebra» zdrojové balíèky."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Nemô¾em prevzia» zdrojové balíèky, prepáète."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Vymeni» médium"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Prosím vlo¾te médium s názvom \"%s\" do zariadenia [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "In¹talácia neúspe¹ná"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -876,35 +905,35 @@ msgstr ""
"In¹talácia neúspe¹ná, niektoré súbory chýbajú.\n"
"Mo¾no bude potrebné aktualizova» databázu zdrojov."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Prosím èakajte, odstraòujem balíèky aby bolo mo¾né iné aktualizova»..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Chýba program"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Po¾adovaný program chýba (grpmi). Prosím overte si in¹taláciu."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "V¹etko je u¾ nain¹talované."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "V¹etko je u¾ nain¹talované (malo sa to vôbec sta»?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Prosím èakajte, naèítavam databázu balíèkov..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Prosím èakajte, odstraòujú balíèky..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -916,7 +945,7 @@ msgstr ""
"Tento nástroj Vám pomô¾e si zvoli» softvér ktorý chcete odstráni»\n"
"z Vá¹ho poèítaèa."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -929,7 +958,7 @@ msgstr ""
"Vá¹ho\n"
"poèítaèa."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/sl.po b/po/sl.po
index 0f3efa66..64ce77a6 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.4\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-03-04 00:55GMT\n"
"Last-Translator: Gregor Pirnaver <gregor.pirnaver@email.si>\n"
"Language-Team: Sloven¹èina <lugos-slo@lugos.si>\n"
@@ -64,7 +64,7 @@ msgstr "pota oz. toèka priklopa"
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Varnostna nadgradnje"
@@ -82,7 +82,7 @@ msgstr "Izberi stre¾nik:"
msgid "Login:"
msgstr "uporabni¹ko ime:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
#, fuzzy
msgid "Password:"
msgstr "geslo:"
@@ -119,14 +119,16 @@ msgid "Type of source:"
msgstr "Vrsta vira:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "V redu"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Preklièi"
@@ -186,45 +188,73 @@ msgstr "Samo nadgradnje"
msgid "Please wait, updating media..."
msgstr "Preverjam odvisnosti..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Nastavim vir?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "Nastavim vir?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Vir"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "Zamenjljiv"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Uredi"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Napaka..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Konèaj"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -232,7 +262,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -363,11 +393,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -375,15 +405,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -393,12 +423,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "Brez napake"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -407,7 +437,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -418,89 +448,89 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "Rezultati iskanja"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "Rezultati iskanja"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Prosim poèakaj dokler rpm odranjuje sledeèe pakete:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "Neznana stran"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "Prosim poèakaj dokler rpm odranjuje sledeèe pakete:"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(noben)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "normalne nadgradnje"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr "Ti dodatni paketi morajo biti name¹èeni, da bo vse delalo dobro:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -510,54 +540,54 @@ msgstr ""
"Da bi zadovoljili vse odvisnosti,\n"
"bodo odstranjeni sledeèi paketi:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "®e name¹èeni paketi"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -567,12 +597,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Vir"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -585,7 +615,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -597,74 +627,74 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "Varnostna nadgradnje"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "normalne nadgradnje"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "Nadgradnja Mandraka"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 paketov, 0 bajtov"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
#, fuzzy
msgid "by size"
msgstr "Velikost vsebine (\"deep\")"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Lokalno"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "normalne nadgradnje"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -674,41 +704,41 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Najdi:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
#, fuzzy
msgid "Search"
msgstr "i¹èi"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Namesti"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"Mandrake\n"
"nadgradnja"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr "Upravitelj paketov"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "Name¹èeni paketi"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -716,23 +746,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -741,15 +771,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -762,48 +792,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "osveèi spisek paketov, ki so na voljo"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Na voljo"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Zamenjljiv"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -812,83 +846,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "®e name¹èeni paketi"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Paket je ¾e name¹èen"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "Paket je slab, neberljiv ali pa ga ni mogoèe najti"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "Na voljo"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Prosim izberi pakete, ki jih ¾eli¹ nadgraditi"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "Paket je ¾e name¹èen"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "Prosim poèakaj dokler rpm odranjuje sledeèe pakete:"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -896,7 +926,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -904,7 +934,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1128,9 +1158,6 @@ msgstr "namesti vse"
#~ msgid "Force"
#~ msgstr "Prisili"
-#~ msgid "Error..."
-#~ msgstr "Napaka..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Problem se je pojavil med namestitvijo"
diff --git a/po/sp.po b/po/sp.po
index 2e5ce597..7180a448 100644
--- a/po/sp.po
+++ b/po/sp.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-23 19:11GMT+1\n"
"Last-Translator: Toma Jankovic <tomaja@net.yu>\n"
"Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -56,7 +56,7 @@ msgstr "¿ãâÐúÐ ØÛØ âaçÚÕ ÜÞÝâØàaúÐ:"
msgid "Removable device"
msgstr "¿àÕÝÞáÝØ ãàÕóÐø"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "±Õ×ÑÕÔÝÞáÝØ ßÐÚÕâØ ×Ð ÐÖãàØàaúe"
@@ -72,7 +72,7 @@ msgstr "¸×ÐÑÕàØâÕ áÒÞj ÜØàÞà áÐjâ..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "»Þ×ØÝÚÐ:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "ÂØß Ø×ÒÞàa:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "¾K"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "¿ÞÝØèâØ"
@@ -162,43 +164,70 @@ msgstr "AÖãàØàaúe"
msgid "Please wait, updating media..."
msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ÐÖãàØàÐÜ ÜÕÔØø..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "¿ÞÔÕèÐÒÐúÕ Ø×ÒÞàÐ"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "¿ÞÔÕèÐÒÐúÕ Ø×ÒÞàÐ"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "¾ÜÞÓãüØ?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "¸×ÒÞà"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "ÃÚÛÞÝØ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "¸×ÜÕÝØ"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "´ÞÔÐø..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "°ÖãàØàÐø..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "ÁÐçãÒÐø Ø ¸×ÐóØ"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "ºàÐj"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +238,7 @@ msgstr ""
"\n"
"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -341,11 +370,11 @@ msgid "China"
msgstr "ºØÝÐ"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "ÁøÕÔØúÕÝÕ °ÜÕàØçÚÕ ´àÖÐÒÕ"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,16 +386,16 @@ msgstr ""
"\n"
"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, áÚØÔÐÜ ÛØáâã ÜØàÞà ÐÔàÕáÐ áÐ MandrakeSoft ÒÕÑ áÐøâÐe."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "³àÕèÚÐ âÞÚÞÜ download-Ð"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -381,11 +410,11 @@ msgstr ""
"¸ÝâÕàÝÕâ, ØÛØ MandrakeSoft-ÞÒ ÒÕÑ áÐøâ ÜÞÖÔÐ ÝØáã âàÕÝãâÝÞ ÔÞáâãßÝØ.\n"
"¿ÞÚãèÐøâÕ ÚÐáÝØøÕ ßÞÝÞÒÞ."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "½ÕÜÐ ÜØàÞàÐ"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -399,7 +428,7 @@ msgstr ""
"áÛãçÐø ÔÐ ÐàåØâÕÚâãàÐ ÒÐèÕÓ ßàÞæÕáÞàÐ ÝØøÕ ßÞÔàÖÐÝÐ\n"
"ÞÔ áâàÐÝÕ Mandrake Linux Official Updates."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "¸×ÐÑÕàØâÕ ÜØàÞà áÐøâ ßÞ ÖÕùØ."
@@ -407,71 +436,71 @@ msgstr "¸×ÐÑÕàØâÕ ÜØàÞà áÐøâ ßÞ ÖÕùØ."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(½ØøÕ ÔÞáâãßÝÞ)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "ÀÕ×ãÛâÐâØ ßàÕâàÐÓe"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "ÀÕ×ãÛâÐâ ßàÕâàÐÓe (ÝÕÜÐ)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ,âàÐÖØÜ..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "ÁâÞß"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "¼ÞÓã áÕ ÔÞÔÐâØ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "¼ÞÓã áÕ ÐÖãàØàÐâØ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "¨ÕÔÐÝ ÞÔ áÛÕÔÕüØå ßÐÚÕâÐ øÕ ÝÕÞßåÞÔÐÝ:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "¸×ÐÑÕàØâÕ"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "ÝÕßÞ×ÝÐâØ ßÐÚÕâ "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "¼ÞÛØÜ ²Ðá áaçÕÚÐjâÕ, ßàØÚÐ×ãøÕÜ ßÐÚÕâÕ..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ÝØjÕÔÐÝ)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "±Õ× ÐÖãàØàaúÐ"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -482,11 +511,11 @@ msgstr ""
"ßÐÚÕâÐ ×Ð ÐÖãàØàÐúÕ ×Ð ÒÐè àÐçãÝÐà,\n"
"ØÛØ áã ÞÝØ ÒÕü ØÝáâÐÛØàÐÝØ."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "¨Þè ÝÕÚØ ßÐÚÕâØ ÜÞàÐøã ÑØâØ ãÚÛÞúÕÝØ"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -496,11 +525,11 @@ msgstr ""
"âàÕÑÐ ÔÐ ÑãÔã ãÚÛÞúÕÝØ:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "½ÕÚØ ßÐÚÕâØ áÕ ÝÕ ÜÞÓã ãÚÛÞÝØâØ"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -510,11 +539,11 @@ msgstr ""
"áÐÔÐ ÔÐ áÕ ÔÕáÕÛÕÚâãøã:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "¿ÞâàÕÑÝØ áã ÔÞÔÐâÝØ ßÐÚÕâØ"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -524,11 +553,11 @@ msgstr ""
"ÔÐ ÑãÔã ØÝáâÐÛØàÐÝØ:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "½ÕÚØ ßÐÚÕâØ ÝÕ ÜÞÓã ÑØâØ ØÝáâÐÛØàÐÝØ"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -536,21 +565,21 @@ msgstr ""
"¶ÐÛØÜ, ÐÛØ áÛÕÔÕüØ ßÐÚÕâ(Ø) ÝÕ ÜÞÓã ÔÐ ÑãÔã áÕÛÕÚâÞÒÐÝØ:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "½ÕÚØ ßÐÚÕâØ ÜÞàÐøã ÔÐ ÑãÔã ãÚÛÞúÕÝØ"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "ÁÕÛÕÚâÞÒÐÝÞ: %d MB / ÁÛÞÑÞÔÝØ ßàÞáâÞà ÝÐ ÔØáÚã: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "²ÕÛØçØÝÐ áÕÛÕÚâÞÒÐÝÞÓ: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -560,12 +589,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "¸×ÒÞà"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -586,7 +615,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -605,68 +634,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "¿ÐÚÕâØ áÐ ØáßàÐÒúÕÝØÜ ÓàÕèÚÐÜÐ ×Ð ÐÖãàØàaúe"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "½ÞàÜÐÛÝÞ ÐÖãàØàÐúÕ"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake ¸×ÑÞà"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "ÁÒØ ßÐÚÕâØ, ßÞ ÐÑÕæÕÔØ"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "ÁÒØ ßÐÚÕâØ,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "ßÞ ÓàãßØ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "ßÞ ÒÕÛØçØÝØ"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "ßÞ áâÐúã áÕÛÕÚæØøÕ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "ßÞ áâÐúã Ø×ÒÞàÝÞÓ ÚÞÔÐ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "ßÞ ÔÞáâãßÝÞáâØ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "ã ÞßØáØÜÐ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "ã ØÜÕÝØÜÐ"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "ã äÐøÛÞÒØÜÐ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "½ÞàÜÐÛÝÞ ÐÖãàØàÐúÕ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -681,35 +710,35 @@ msgstr ""
"\n"
"ÔÐ ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "¿àÞÝaòØ: "
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "ÂàÐÖØ"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "¸ÝáâÐÛØàÐj"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "ÃÚÛÐúÐúÕ ÁÞäâÒÕàáÚØå ¿ÐÚÕâÐ"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "¸ÝáâÐÛÐæØøÐ ÁÞäâÒÕàáÚØå ¿ÐÚÕâÐ"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -721,26 +750,26 @@ msgstr ""
"\n"
"´Ð ÛØ øÕ Ã àÕÔã ÔÐ ÝÐáâÐÒØÜ?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãáßÞáâÐÒùÐÜ ÒÕ×ã áÐ ÜØàÞà áÐøâÞÜ àÐÔØ ØÝäÞàÜÐæØøÕ Þ "
"ÐÖãàØàÐÝØÜ ßÐÚÕâØÜÐ."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "³àÕèÚÐ ßàØ ÐÖãàØàÐúã ÜÕÔØøÐ"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"¿ÞøÐÒØÛÐ áÐ ÝÕßÞßàÐÒùØÒÐ ÓàÕèÚÐ âÞÚÞÜ ÐÖãàØàÐúÐ ØÝäÞàÜÐæØøÐ Þ ßÐÚÕâØÜÐ."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "ºÐÚÞ àãçÝÞ Ø×ÐÑàÐâØ áÒÞø ÜØàÞà áÐøâ"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -754,16 +783,16 @@ msgstr ""
"\n"
"·ÐâØÜ, àÕáâÐàãøâÕ MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"¼ØÛÜ ²Ðá áÐçÕÚÐøâÕ, ÚÞÜâÐÚâØàÐÜ ÜØàÞà áÐøâ àÐÔØ ØÝØæØàÐúÐ ÐÖãàØàÐúÐ ßÐÚÕâÐ."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "³àÕèÚÐ ßàØÛØÚÞÜ ÔÞÔÐÒÐúÐ ßÐÚÕâÐ"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -785,48 +814,52 @@ msgstr ""
"\n"
"´Ð ÛØ ÖÕÛØâÕ ÔÐ ßàÞÑÐâÕ áÐ ÔàãÓØÜ ÜØàÞàÞÜ?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "¼ØÛØÜ ²Ðá áÐçÕÚÐøâÕ, ßàÞÝÐÛÐ×ØÜ ÔÞáâãßÝÕ ßÐÚÕâÕ..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "¸ÝáâÐÛÐæØøÐ ÝÕãáßÕÛÐ"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "ÃÚÛÞÝØ"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -835,44 +868,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "½ÕÚØ ßÐÚÕâØ ÝÕ ÜÞÓã ÑØâØ ØÝáâÐÛØàÐÝØ"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "ÁÒÕ øÕ ÒÕü ØÝáâÐÛØàÐÝÞ."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "½Õ ÜÞÓã ÔÐ ÔÞÑÐÒØÜ Ø×ÒÞàÝÕ ßÐÚÕâÕ, ÖÐÞ ÜØ øÕ."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "¿àÞÜÕÝØ ÜÕÔØø"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "ÃÑÐæØâÕ ÜÕÔØø áÐ ØÜÕÝÞÜ \"%s\" ã ãàÕóÐø [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "¸ÝáâÐÛÐæØøÐ ÝÕãáßÕÛÐ"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -880,36 +909,36 @@ msgstr ""
"¸ÝáâÐÛÐæØøÐ ÝÕãáßÕÛÐ, ÝÕÚØ äÐøÛÞÒØ ÝÕÔÞáâÐøã.\n"
"¼ÞÖÔÐ ÑØ âàÕÑÐÛÞ ÔÐ ÐÖãàØàÐâÕ ÒÐèã ÑÐ×ã ßÐÚÕâÐ."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ ÔÐ ÑØ ÞÜÞÓãüØÞ ÐÖãàØàÐúÕ ÞáâÐÛØå..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "¿àÞÓàÐÜ ÝÕÔÞáâÐøÕ"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "½ÕÔÞáâÐøÕ ßÞâàÕÑÝØ ßàÞÓàÐÜ (grpmi). ¿àÞÒÕàØâÕ áÒÞøã ØÝáâÐÛÐæØøã."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "ÁÒÕ øÕ ÒÕü ØÝáâÐÛØàÐÝÞ."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "ÁÒÕ øÕ ÒÕü ØÝáâÐÛØàÐÝÞ (ÔÐ ÛØ øÕ ÞÒÞ ãÞßèâÕ âàÕÑÐÛÞ ÔÐ áÕ ÔÞÓÞÔØ?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "¼ÞÛØÜ ÒÐá áÐçÕÚÐøâÕ, ãçØâÐÒÐÜ ÑÐ×ã ßÞÔÐâÐÚÐ Þ ßÐÚÕâØÜÐ..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "¼ÞÛØÜ ²Ðá áÐçÕÚÐøâÕ, ãÚÛÐúÐÜ ßÐÚÕâÕ..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -921,7 +950,7 @@ msgstr ""
"¾ÒÐø ÐÛÐâ ÒÐÜ ÜÞÖÕ ßÞÜÞüØ ÔÐ Ø×ÐÑÕàÕâÕ ÚÞøØ áÞäâÒÕà ÖÕÛØâÕ ÔÐ ãÚÛÞÝØâÕ áÐ\n"
"ÒÐèÕÓ àÐçãÝÐàÐ."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -934,7 +963,7 @@ msgstr ""
"ØÝáâÐÛØàÐâÕ ÝÐ\n"
"ÒÐè àÐçãÝÐà."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/sr.po b/po/sr.po
index edf724c1..232e5745 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-15 13:55GMT+1\n"
"Last-Translator: Toma Jankovic_<tomaja@net.yu>\n"
"Language-Team: Serbian <i18n@mandrake.co.yu>\n"
@@ -56,7 +56,7 @@ msgstr "Putanja ili taèke montiranja:"
msgid "Removable device"
msgstr "Prenosni uregjaj"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Bezbednosni paketi za a¾uriranje"
@@ -72,7 +72,7 @@ msgstr "Izaberite svoj miror sajt..."
msgid "Login:"
msgstr "Login:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Lozinka:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "Tip izvora:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Poni¹ti"
@@ -162,43 +164,70 @@ msgstr "A¾uriranje"
msgid "Please wait, updating media..."
msgstr "Molim Vas saèekajte, a¾uriram medij..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Pode¹avanje izvora"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Pode¹avanje izvora"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "OmoguKji?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Izvor"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Ukloni"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Izmeni"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Dodaj..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "A¾uriraj..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Saèuvaj i Izagji"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Kraj"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +238,7 @@ msgstr ""
"\n"
"Da li je U redu da nastavim?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +372,11 @@ msgid "China"
msgstr "Kina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Sjedinjene Amerièke Dr¾ave"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -359,16 +388,16 @@ msgstr ""
"\n"
"Da li je U redu da nastavim?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Molim Vas saèekajte, skidam listu miror adresa sa MandrakeSoft veb sajtae."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Gre¹ka tokom download-a"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -383,11 +412,11 @@ msgstr ""
"Internet, ili MandrakeSoft-ov veb sajt mo¾da nisu trenutno dostupni.\n"
"Poku¹ajte kasnije ponovo."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nema mirora"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +430,7 @@ msgstr ""
"sluèaj da arhitektura va¹eg procesora nije podr¾ana\n"
"od strane Mandrake Linux Official Updates."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Izaberite miror sajt po ¾elji."
@@ -409,72 +438,72 @@ msgstr "Izaberite miror sajt po ¾elji."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Nije dostupno)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Rezultati pretrage"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Rezultat pretrage (nema)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Molim Vas saèekajte,tra¾im u fajlovima..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Mogu se dodati"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Mogu se a¾urirati"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Jedan od sledeKjih paketa je neophodan:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Izaberite"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "nepoznati paket "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Molim Vas saèekajte, prikazujem pakete..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nijedan)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Bez a¾uriranja"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -485,11 +514,11 @@ msgstr ""
"paketa za a¾uriranje za va¹ raèunar,\n"
"ili su oni veKj instalirani."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Jo¹ neki paketi moraju biti uklonjeni"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -499,11 +528,11 @@ msgstr ""
"treba da budu uklonjeni:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Neki paketi se ne mogu ukloniti"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -513,11 +542,11 @@ msgstr ""
"sada da se deselektuju:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Potrebni su dodatni paketi"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -527,11 +556,11 @@ msgstr ""
"da budu instalirani:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Neki paketi ne mogu biti instalirani"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -539,21 +568,21 @@ msgstr ""
"®alim, ali sledeKji paket(i) ne mogu da budu selektovani:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Neki paketi moraju da budu uklonjeni"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Selektovano: %d MB / Dostupno: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Velièina selektovanog: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -563,12 +592,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Izvor"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -589,7 +618,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -608,69 +637,69 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Paketi sa ispravnjenim gre¹kama za a¾uriranje"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normalno a¾uriranje"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake Izbor"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Svi paketi, po abecedi"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Svi paketi,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "po grupi"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "po velièini"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "po stanju selekcije"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "po stanju izvornog koda"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "po dostupnosti"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Lokalni fajlovi"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normalno a¾uriranje"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -685,35 +714,35 @@ msgstr ""
"\n"
"da li je U redu da nastavim?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Pronaði: "
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Tra¾i"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Instaliraj"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Update"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Uklanjanje Softverskih Paketa"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Instalacija Softverskih Paketa"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -725,26 +754,26 @@ msgstr ""
"\n"
"Da li je U redu da nastavim?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Molim Vas saèekajte, uspostavljam vezu sa miror sajtom radi informacije o "
"a¾uriranim paketima."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Gre¹ka pri a¾uriranju medija"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Pojavila sa nepopravljiva gre¹ka tokom a¾uriranja informacija o paketima."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -753,16 +782,16 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Milm Vas saèekajte, komtaktiram miror sajt radi iniciranja a¾uriranja paketa."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Gre¹ka prilikom dodavanja paketa"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -784,48 +813,52 @@ msgstr ""
"\n"
"Da li ¾elite da probate sa drugim mirorom?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Milim Vas saèekajte, pronalazim dostupne pakete..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Instalacija neuspela"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Ukloni"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -834,44 +867,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Neki paketi ne mogu biti instalirani"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Sve je veKj instalirano."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ne mogu da dobavim izvorne pakete."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Ne mogu da dobavim izvorne pakete, ¾ao mi je."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Promeni medij"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Ubacite medij sa imenom \"%s\" u uregjaj [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Instalacija neuspela"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -879,36 +908,36 @@ msgstr ""
"Instalacija neuspela, neki fajlovi nedostaju.\n"
"Mo¾da bi trebalo da a¾urirate va¹u bazu paketa."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Molim Vas saèekajte, uklanjam pakete da bi omoguKjio a¾uriranje ostalih..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Sve je veKj instalirano."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Sve je veKj instalirano (da li je ovo uop¹te trebalo da se dogodi?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Molim vas saèekajte, uèitavam bazu podataka o paketima..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Molim Vas saèekajte, uklanjam pakete..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -920,7 +949,7 @@ msgstr ""
"Ovaj alat vam mo¾e pomoKji da izaberete koji softver ¾elite da uklonite sa\n"
"va¹eg raèunara."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -933,7 +962,7 @@ msgstr ""
"instalirate na\n"
"va¹ raèunar."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/sv.po b/po/sv.po
index 682867ce..3eb09ad5 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake-sv\n"
-"POT-Creation-Date: 2002-08-30 10:17+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-29 18:28+0200\n"
"Last-Translator: Mattias Newzella <newzella@linux.nu>\n"
"Language-Team: <sv@li.org>\n"
@@ -58,7 +58,7 @@ msgstr "Sökväg eller monteringspunkt:"
msgid "Removable device"
msgstr "Flyttbar enhet"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Säkerhetsuppdateringar"
@@ -74,7 +74,7 @@ msgstr "Välj en spegel..."
msgid "Login:"
msgstr "Användarnamn:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Lösenord:"
@@ -107,14 +107,16 @@ msgid "Type of source:"
msgstr "Typ av källa:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Avbryt"
@@ -164,43 +166,70 @@ msgstr "Uppdatera"
msgid "Please wait, updating media..."
msgstr "Vänta, uppdaterar media..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Anpassa källor"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Anpassa källor"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Aktiverad?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Källa"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Ta bort"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Redigera"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Lägg till..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Uppdatera..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Spara och avsluta"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Avsluta"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -211,7 +240,7 @@ msgstr ""
"\n"
"Är det OK att fortsätta?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -343,11 +372,11 @@ msgid "China"
msgstr "Kina"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Amerikas förenta stater"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -359,15 +388,15 @@ msgstr ""
"\n"
"Är det OK att fortsätta?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "Vänta, laddar ner spegeladresser från MandrakeSofts webbplats."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Fel under nerladdning"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -382,11 +411,11 @@ msgstr ""
"Nätverket eller MandrakeSofts webbplats kan vara otillgängliga.\n"
"Försök igen senare."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Ingen spegel"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -400,7 +429,7 @@ msgstr ""
"när arkitekturen på din processor inte stöds av\n"
"Mandrake Linux officiella uppdateringar."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Välj önskad spegel."
@@ -408,71 +437,71 @@ msgstr "Välj önskad spegel."
msgid "Other"
msgstr "Annan"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Ingen tillgänglig)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Sökresultat"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Sökresultat (inget)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Vänta, söker..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Stoppa"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Kan läggas till"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Kan uppdateras"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Mer information om paket..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Ett av följande paket krävs:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Välj"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "okänt paket "
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Vänta, listar paket..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(inget)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Ingen uppdatering"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -482,11 +511,11 @@ msgstr ""
"finns några tillgängliga uppdateringar för programmen installerade\n"
"på datorn eller att du redan har installerat alla."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Några ytterligare paket måste tas bort"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -495,11 +524,11 @@ msgstr ""
"På grund av deras beroenden måste följande paket också tas bort:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Vissa paket kan inte tas bort"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -509,11 +538,11 @@ msgstr ""
"avmarkeras:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Ytterligare paket krävs"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -522,11 +551,11 @@ msgstr ""
"För att uppfylla beroenden måste följande paket också installeras:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Vissa paket kan inte installeras"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -534,21 +563,21 @@ msgstr ""
"Tyvärr, följande paket kan inte väljas:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Vissa paket måste tas bort"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Valda: %d MB / ledigt diskutrymme: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Vald storlek: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -563,12 +592,12 @@ msgstr ""
"Ändringslogg:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Källa: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -589,7 +618,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -608,67 +637,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Felrättningsuppdateringar"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normala uppdateringar"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake-val"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Alla paket, alfabetiskt"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Alla paket,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "efter grupp"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "efter storlek"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "efter valstatus"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "efter källagringsplats"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "efter uppdateringstillgänglighet"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "i beskrivningar"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "i namn"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "i filer"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Maximal information"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Normal information"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -683,35 +712,35 @@ msgstr ""
"\n"
"Är det OK att fortsätta?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Hitta:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Sök"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Installera"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Uppdatera Mandrake"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Paketborttag"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Paketinstallation"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -723,24 +752,24 @@ msgstr ""
"\n"
"Är det OK att fortsätta?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "Vänta, kontaktar spegel för att uppdatera paketinformation."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Fel vid uppdatering av media"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Ett fel som ej kan återställas uppstod under uppdatering av paketinformation."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Hur du manuellt väljer en spegel"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -754,15 +783,15 @@ msgstr ""
"\n"
"Starta sedan om MandrakeUpdate."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Vänta, kontaktar spegel för att initiera uppdateringspaket."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Fel vid tillägg av uppdateringsmedia"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -784,46 +813,50 @@ msgstr ""
"\n"
"Vill du försöka med en annan spegel?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Vänta, hittar tillgängliga paket..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Alla begärda paket installerades utan problem."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Allt installerades utan problem"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Installation slutförd"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Undersöker %s"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Ta bort .%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Använd .%s som huvudfil"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Gör ingenting"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Undersök..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -836,7 +869,7 @@ msgstr ""
"Några konfigurationsfiler skapades som \".rpmnew\" eller \".rpmsave\",\n"
"du kan nu undersöka några för att vidta åtgärder:"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -844,36 +877,32 @@ msgstr ""
"vissa paket kan inte installeras\n"
"korrekt"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "allt installerades utan problem"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "Undersök..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Kunde inte hämta källpaket."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Tyvärr, kunde inte hämta källpaket."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Byt media"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Lägg i media med namn \"%s\" i enhet [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Installationen misslyckades"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -881,35 +910,35 @@ msgstr ""
"Installationen misslyckades, vissa filer saknas.\n"
"Du kanske ska uppdatera din källdatabas."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Vänta , tar bort paket för att andra ska kunna uppdateras..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Program saknas"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Ett program (grpmi) som krävs saknas. Kontrollera installationen."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Allt är redan installerat."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Allt är redan installerat (ska detta hända över huvud taget?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Vänta, läser paketdatabas..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Vänta, tar bort paket..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -921,7 +950,7 @@ msgstr ""
"Det här verktyget hjälper dig att välja vilka program du vill ta bort från\n"
"datorn."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -933,7 +962,7 @@ msgstr ""
"Det här verktyget hjälper dig att välja uppdateringarna du vill\n"
"installera på datorn."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/ta.po b/po/ta.po
index f8a90bea..bf9d4870 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.0\n"
-"POT-Creation-Date: 2002-08-29 20:55+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-30 00:00-0400\n"
"Last-Translator: prabu <prabu_anand2000@yahoo.com>\n"
"Language-Team: <en@li.org>\n"
@@ -55,7 +55,7 @@ msgstr "À¡¨¾ «øÄÐ ²üÈôÒûÇ¢"
msgid "Removable device"
msgstr "¸ÆüÚ °¼¸í¸û"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "À¡Ð¸¡ôÒ Ì¨ÈÀ¡ÎûÇ ¦À¡¾¢¸¨Ç ¿¢¸ú¿¢¨ÄôÀÎòÐ"
@@ -71,7 +71,7 @@ msgstr "«Õ¸¢ø ¯ûÇ þ¨½ô À¾¢ô¨À §¾÷×î ¦ºö..."
msgid "Login:"
msgstr "ÀÂÉ÷¸½ìÌ"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "¸¼×ø:"
@@ -104,14 +104,16 @@ msgid "Type of source:"
msgstr "ãÄò¾¢ý Ũ¸"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "ºÃ¢"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "¿£ìÌ"
@@ -161,43 +163,70 @@ msgstr "¿¢¸ú¿¢¨Äô ÀÎòÐ"
msgid "Please wait, updating media..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ.... °¼¸õ ¿¢¸ú¿¢¨Äô ÀÎò¾ôÀθ¢ÈÐ"
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "ãÄí¸¨Ç ÅÊŨÁ"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "ãÄí¸¨Ç ÅÊŨÁ"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "§¾÷Å¡¸¢ÔûǾ¡?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "ãÄõ"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "¿£ìÌ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "¦¾¡Ì"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "§º÷..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "¿¢¸ú¿¢¨Äô ÀÎòÐ..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "§ºÁ¢òÐÅ¢ðÎ §ÅǢø"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "§ÅǢø"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -208,7 +237,7 @@ msgstr ""
"\n"
"þôÀʧ ¦¾¡¼ÃÄ¡Á¡?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -339,11 +368,11 @@ msgid "China"
msgstr "º£É¡"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "«¦Á⸸¡"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +384,15 @@ msgstr ""
"\n"
"¦¾¡¼÷óÐ ¦ºøÄ ºõÁ¾Á¡?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ... þ¨½ô À¾¢ôÒ Å¢ÅÃí¸û þÈì¸ôÀθ¢ÈÐ"
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "þÈìÌž¢ø À¢¨Æ §¿÷óÐûÇÐ"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -378,11 +407,11 @@ msgstr ""
"¿£í¸û þ¨½Âò¾¢ø þøÄ¡¾¢Õì¸Ä¡õ;þø¨Ä Á¡ñʧÃì þ¨½Â¾Çò¾¢ø.\n"
"À¢Ã¨É¢Õì¸Ä¡õ.¾ÂצºöÐ À¢ÈÌ ÓÂüº¢ ¦ºöÂ×õ"
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "þ¨½ô À¾¢ôÒ ²ÐÁ¢ø¨Ä"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -396,7 +425,7 @@ msgstr ""
"þ¨½Âò¾¢ø www.google.com ¦ºýÚ §¾Ê\n"
"À¡Õí¸û"
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "¾ÂצºöÐ ¯í¸ÙìÌ ¦¿Õí¸¢Â þ¨½ô À¾¢ô¨À §¾÷ó¦¾Îí¸û"
@@ -404,71 +433,71 @@ msgstr "¾ÂצºöÐ ¯í¸ÙìÌ ¦¿Õí¸¢Â þ¨½ô À¾¢ô¨À §¾÷ó¦¾Îí¸û"
msgid "Other"
msgstr "ÁüÈ"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(´ýÚÁ¢ø¨Ä)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "§¾¼Ä¢ý ÓÊ׸û"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "§¾¼Ä¢ý ÓÊ׸û(´ýÚÁ¢ø¨Ä)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ..§¾¼ôÀθ¢ÈÐ"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "¿¢ÚòÐ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "§º÷ì¸ôÀ¼ìÜÊÂ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "¿¢¸ú¿¢¨ÄôÀÎò¾ìÜÊÂ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "¦À¡¾¢¸¨Çô ÀüȢ §ÁÖõ Å¢ÅÃí¸û"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "¸£ØûÇ ¦À¡¾¢¸Ç¢ø ´ýÚ §¾¨Å"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "¾ÂצºöÐ §¾÷ó¦¾Îì¸×õ"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "¦¾Ã¢Â¡¾ ¦À¡¾¢"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ, ¦À¡¾¢¸û ÀðÊÂÄ¢¼ôÀθ¢ÈÐ"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(´ýÚÁ¢ø¨Ä)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "¿¢¸ú¿¢¨ÄôÀÎò¾ ´ýÚÁ¢ø¨Ä"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -478,11 +507,11 @@ msgstr ""
"«ôÀʦÂýÈ¡ø ¿¢¸ú¿¢¨ÄôÀÎò¾ Ò¾¢Â ¦À¡¾¢¸û ²ÐÁ¢ø¨Ä,\n"
"«øÄÐ «¨ÉòÐõ ¿¢ÚÅôÀðÎÅ¢ð¼É."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "§ÁÖõ º¢Ä ¦À¡¾¢¸û ¿£ì¸ôÀ¼ §ÅñÎõ"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -492,11 +521,11 @@ msgstr ""
"§ÅñÎõ\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "º¢Ä ¦À¡¾¢¸¨Ç ¿£ì¸ ÓÊÂÅ¢ø¨Ä"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -506,11 +535,11 @@ msgstr ""
"¿¢ÚÅôÀ¼ìܼ¡Ð\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "§ÁÖõ º¢Ä ¦À¡¾¢¸û §¾¨Å"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -520,11 +549,11 @@ msgstr ""
"§ÅñÎõ\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "º¢Ä ¦À¡¾¢¸¨Ç ¿¢ÚÅ ÓÊÂÅ¢ø¨Ä"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -532,21 +561,21 @@ msgstr ""
"ÁýÉ¢ì¸×õ, þó¾ ¦À¡¾¢¸¨Ç §¾÷×î ¦ºö ÓÊÂÅ¢ø¨Ä:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "º¢Ä ¦À¡¾¢¸û ¿£ì¸ôÀ¼§ÅñÎõ"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "§¾÷ó¦¾ÎòÐûÇÅüÈ¢ý «Ç×: %d MB / ¾ü§À¡ÐûÇ þ¼õ: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "§¾÷ó¦¾ÎòÐûÇ «Ç×: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -561,12 +590,12 @@ msgstr ""
"Á¡üÈôÀðÊÂø:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "ãÄõ %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -587,7 +616,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -606,67 +635,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "À¢¨Æ¿£ì¸¦À¡¾¢¸û ¿¢¸ú¿¢¨ÄôÀÎò¾"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "º¡¾ÃÉ ¿¢¸ú¿¢¨ÄôÀÎòоø"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Á¡ñʧÃì §¾÷׸û"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "«¨ÉòÐ ¦À¡¾¢¸Ùõ,«¸Ã Å⨺ôÀÊ"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "«¨ÉòÐ ¦À¡¾¢¸Ùõ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "ÌØôÀÊ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "«Ç×ôÀÊ"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "§¾÷Å¡¸¢ÔûÇÀÊ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "ãÄí¸Ç¢ý þÕôÒôÀÊ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "¿¢¸ú¿¢¨Äô ÀÎò¾ôÀ¼ §ÅñʨŢýÀÊ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "Å¢Çì¸í¸Ç¢ø "
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "¦ÀÂ÷¸Ç¢ø"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "§¸¡ôҸǢø"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "«¾¢¸Àðº Å¢ÅÃõ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "º¡¾ÃÉ Å¢ÅÃõ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -681,35 +710,35 @@ msgstr ""
"\n"
"¦¾¡¼÷óÐ ¦ºøÄ ºõÁ¾Á¡?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "¸ñÎÀ¢Ê:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "§¾Î"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "¿¢Ú×"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-*-TSC_Avarangal-bold-r-normal--25-*-100-100-p-*-tscii-0,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Á¡ñʧÃì ¿¢¸ú¿¢¨ÄôÀÎò¾¢"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "¦À¡¾¢ ¿£ì¸ôÀξø"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "¦À¡¾¢ ¿¢ÚÅôÀξø"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -721,23 +750,23 @@ msgstr ""
"\n"
"¦¾¡¼÷óÐ ¦ºøÄ ºõÁ¾Á¡?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ...þ¨½ô À¾¢ô§À¡Î ¦¾¡¼÷Ò ¦¸¡ýÎûÇÐ"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "°¼¸ ¿¢¸ú¿¢¨ÄôÀÎò¾Ä¢ø À¢¨Æ §¿÷óÐûÇÐ ÁýÉ¢ì¸×õ"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "°¼¸ Å¢Åà ¿¢¸ú¿¢¨ÄôÀÎò¾Ä¢ø ºÃ¢ ¦ºö ÓÊ¡¾ À¢¨Æ §¿÷óÐûÇÐ"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "¯í¸û þ¨½ À¾¢ô¨À ±ôÀÊò §¾÷×î ¦ºöÅÐ"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -746,15 +775,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr "¯í¸û þ¨½ À¾¢ô¨À ±ôÀÊò §¾÷×î ¦ºöÅÐ"
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ...þ¨½ô À¾¢ô§À¡Î ¦¾¡¼÷Ò ¦¸¡ýÎ ¦¾¡¼ì¸ Á¾¢ôÀÇ¢ôÀθ¢ÈÐ"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "¿¢¸ú¿¢¨ÄôÀÎò¾ø °¼¸ò¾¢ø À¢¨Æ §¿÷óÐûÇÐ ÁýÉ¢ì¸×õ"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -775,46 +804,50 @@ msgstr ""
"\n"
"ÁüÈ þ¨½ô À¾¢ôÀ¢ø ÓÂüº¢ ¦ºöÐ À¡Õí¸û"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ..þÕìÌõ ¦À¡¾¢¸¨Ç ¸ñÎÀ¢Êì¸ô Àθ¢ÈÐ"
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "¿£í¸û §¸ð¼ «¨ÉòÐ ¦À¡¾¢¸Ùõ ¦ÅüÈ¢¸ÃÁ¡¸ ¿¢ÚÅôÀð¼Ð"
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "«¨ÉòÐõ ¦ÅüÈ¢¸ÃÁ¡¸ ¿¢ÚÅôÀð¼Ð"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "¿¢Ú׾Ģø ÓÊó¾Ð"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "§º¡¾¢ì¸ôÀθ¢ÈÐ %s"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "¿£ìÌ .%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ".%s ±ýÀ¨¾ Ó츢 §¸¡ôÀ¡¸ ÀÂýÀÎòÐ"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "´ýÚõ ¦ºö¡§¾"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-*-TSC_Avarangal-bold-r-normal--25-*-100-100-p-*-tscii-0,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "§º¡¾¢ì¸ôÀθ¢ÈÐ..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -827,7 +860,7 @@ msgstr ""
"º¢Ä ÅÊŨÁôÒì §¸¡ôÒ¸û `.rpmnew «øÄÐ rpmsave',\n"
"±ýÈ ¦ÀÂ÷¸Ç¢ø ¯ÕÅ¡ì¸ôÀð¼Ð. «Åü¨Èô À¡÷òÐ §¾¨ÅÂ¡É ¿¼ÅÊ쨸 ±Îì¸×õ"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -835,36 +868,32 @@ msgstr ""
"º¢Ä ¦À¡¾¢¸¨Ç ºÃ¢Â¡¸ ¿¢ÚÅ \n"
"ÓÊÂÅ¢ø¨Ä"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "«¨ÉòÐõ ºÃ¢Â¡¸ ¿¢ÚÅôÀð¼Ð"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "§º¡¾¢ì¸ôÀθ¢ÈÐ..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "ãÄô ¦À¡¾¢¸û ¸¢¨¼ì¸Å¢ø¨Ä"
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "ãÄô ¦À¡¾¢¸û ¸¢¨¼ì¸Å¢ø¨Ä ÁýÉ¢ì¸×õ"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "°¼¸ò¨¾ Á¡üÈ×õ"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr " \"%s\" ±ýÈ °¼¸ò¨¾ [%s] ±ýÈ º¡¾Éò¾¢ø ¨Åì¸×õ."
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "¿¢Ú׾Ģø À¢¨Æ §¿÷óÐûÇÐ"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -872,35 +901,35 @@ msgstr ""
"¿¢Ú׾Ģø À¢¨Æ §¿÷óÐûÇÐ º¢Ä §¸¡ôÒ¸¼Ç ¸¡ÉôÀ¼Å¢ø¨Ä.\n"
"¯í¸û ãÄò¾Ã׸¨Ç ¿¢¸ú¿¢¨Äô ÀÎò¾¢ À¡Õí¸û"
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ..Ò¾¢Â ¦À¡¾¢ ¿¢ÚÅ, º¢Ä ¦À¡¾¢¸û ¿£ì¸ôÀθ¢ýÈÉ..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "¿¢Ãø þø¨Ä"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "§¾¨ÅÂ¡É ¿¢Ãø þø¨Ä.¯í¸û ¿¢ÚÅø ºÃ¡¸ ¯ûǾ¡ ±É À¡÷ì¸×õ"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "«¨ÉòÐõ ²ü¸É§Å ¿¢ÚÅôÀðÎÅ¢ð¼Ð"
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "«¨ÉòÐõ ²ü¸É§Å ¿¢ÚÅôÀðÎÅ¢ð¼Ð(þÐ þôÀÊò¾¡ý ¿¼ìÌÁ¡ ±ýÉ?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ...¦À¡¾¢ò ¾Ã× ÀÊì¸ôÀθ¢ÈÐ..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "¾ÂצºöÐ ¸¡ò¾¢Õì¸×õ...¦À¡¾¢¸û ¿£ì¸ôÀθ¢ýÈÉ..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -912,7 +941,7 @@ msgstr ""
"þì¸ÕÅ¢ ãÄõ §¾¨Å¢øÄ¡¾ ¦À¡¾¢¸¨Ç ¯í¸û ¸½¢½¢Â¢ø\n"
" ¿£ì¸ôÀ¼ ÓÊÔõ"
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -924,7 +953,7 @@ msgstr ""
"þì¸ÕÅ¢ ãÄõ ¯í¸û ¸½¢½¢Â¢ø ¯ûÇ ¦À¡¾¢¸¨Ç ¿£í¸û ¿¢¸ú¿¢¨ÄôÀÎò¾\n"
" ÓÊÔõ"
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/tr.po b/po/tr.po
index 5412b801..6003746e 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,7 +8,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-18 12:23+0300\n"
"Last-Translator: Tuncay Yeniay <tuncayyeniay@mynet.com>\n"
"Language-Team: Turkish <tr@li.org>\n"
@@ -58,7 +58,7 @@ msgstr "Yol veya baðlama noktasý:"
msgid "Removable device"
msgstr "Kaldýrýlabilinir aygýt"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Güvenlik güncellemeleri"
@@ -74,7 +74,7 @@ msgstr "Yansý Adresini seçin..."
msgid "Login:"
msgstr "Kullanýcý adý:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Parola:"
@@ -107,14 +107,16 @@ msgid "Type of source:"
msgstr "Kaynaðýn Türü"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "Tamam"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Vazgeç"
@@ -164,43 +166,73 @@ msgstr "Güncelle"
msgid "Please wait, updating media..."
msgstr "Lütfen bekleyin, medya güncelleniyor..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Kaynaklarý yapýlandýr"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Vekil için kullanýcý adý:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Kullanýcýadý:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Kaynaklarý yapýlandýr"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Aktif?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Kaynak"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Kaldýr"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Düzenle"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Ekle..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Güncelle..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Hata..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Kaydet ve çýk"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Çýk"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -211,7 +243,7 @@ msgstr ""
"\n"
"Devam etmek için herþey Tamam mý ?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -337,11 +369,11 @@ msgid "China"
msgstr "Çin"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Birleþmiþ Milletler"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -353,16 +385,16 @@ msgstr ""
"\n"
"Devam etmek için herþey tamam mý ?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Lütfen bekleyin, yansý adresleri MandrakeSoft'un web sitesinden indiriliyor."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Ýndirme sürecinde hata oluþtu"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -377,11 +409,11 @@ msgstr ""
"Að veya MandrakeSoft'un web sayfasýný eriþilemez durumda\n"
"olabilir. Lütfen daha sonra tekrar deneyin."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Yansý yok"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -390,7 +422,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr ""
@@ -398,140 +430,140 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Eriþilemez)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Arama sonuçlarý"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Arama sonuçlarý (hiçbiri)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "Lütfen bekleyin, dosyalar içinde aranýyor..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Eklenebilir"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Güncellenebilinir"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Tümünü\n"
"Býrak"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Tümünü Seç"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Sýradaki bir paket þunlara ihtiyaç duyuyor:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Lütfen seçiniz"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Bilinmeyen paket"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Lütfen bekleyin, paketler listeleniyor..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(hiçbiri)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Güncelleme yok"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Bazý ek paketlerin kaldýrýlmýþ olmasý gerekiyor"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Bazý paketler kaldýrýlamadý"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Ek paketlere ihtiyaç var"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Bazý paketler yüklenemedi"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Bazý paketlerin kaldýrýlmasý gerekiyor"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, fuzzy, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Seçili: %d MB / Eriþilebilinir: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Seçili boyut: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -541,12 +573,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "Kaynak"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -567,7 +599,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -586,70 +618,70 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "HataDüzeltme güncellemeleri"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Normal güncellemeler"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake seçimleri"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Tüm paketler, alfabetik"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Tüm paketler,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "gruplara göre"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "boyuta göre"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "güncelleme eriþilebilinirliðine göre"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "Tanýmlar"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "Yerel dosyalar"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Normal güncellemeler"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -659,35 +691,35 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Bul:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Ara"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Kur"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-9,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake Güncelleme"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Yazýlým Paketleri Kaldýrýcý"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Yazýlým Paketleri Kurulumu"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -695,23 +727,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Medya güncellenirken hata oluþtu"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -720,15 +752,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -741,48 +773,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Lütfen bekleyin, eriþilebilinir paketler aranýyor..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "Kurulum baþarýsýz"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "Kaldýr"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-9,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -791,78 +827,74 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Bazý paketler yüklenemedi"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "Herþey zaten kurulu."
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr ""
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Medya deðiþtir"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Kurulum baþarýsýz"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Herþey zaten kurulu."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Lütfen bekleyin, paketler kaldýrýlýyor..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -870,7 +902,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -878,7 +910,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1117,9 +1149,6 @@ msgstr "Tümünü kur"
#~ msgid "Force"
#~ msgstr "Zorla"
-#~ msgid "Error..."
-#~ msgstr "Hata..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Kurulum sýrasýnda sorunlar oluþtu"
@@ -1420,9 +1449,6 @@ msgstr "Tümünü kur"
#~ msgid "Ftp Proxy:"
#~ msgstr "Ftp Yetkili Sunucusu:"
-#~ msgid "Proxy username:"
-#~ msgstr "Vekil için kullanýcý adý:"
-
#~ msgid "Proxy password:"
#~ msgstr "Vekil için Parola:"
@@ -1462,9 +1488,6 @@ msgstr "Tümünü kur"
#~ msgid "Choose Packages"
#~ msgstr "Paketleri seçin"
-#~ msgid "Username:"
-#~ msgstr "Kullanýcýadý:"
-
#~ msgid "Security"
#~ msgstr "Güvenlik"
diff --git a/po/uk.po b/po/uk.po
index 02f6c001..13af8990 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2001-10-23 18:13+09:00\n"
"Last-Translator: Mykola Solotskyy <salo@tokyo.email.ne.jp> \n"
"Language-Team: Ukrainian <kov@tokyo.email.ne.jp>\n"
@@ -60,7 +60,7 @@ msgstr "ÔÏÞËÁ ÍÏÎÔÕ×ÁÎÎÑ:"
msgid "Removable device"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "âÅÓÐÅÞÎÅ ÏÎÏ×ÌÅÎÎÑ"
@@ -78,7 +78,7 @@ msgstr "÷ÉÂÒÁÎÅ ×ÁÍÉ ÄÚÅÒËÁÌÏ:"
msgid "Login:"
msgstr "¦Í'Ñ:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "ðÁÒÏÌØ:"
@@ -113,14 +113,16 @@ msgid "Type of source:"
msgstr "ôÉÐ ÄÖÅÒÅÌÁ"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "çÁÒÁÚÄ"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "÷¦ÄͦÎÉÔÉ"
@@ -179,45 +181,73 @@ msgstr "ðÏÎÏ×ÌÅÎÎÑ"
msgid "Please wait, updating media..."
msgstr "ðÅÒÅצÒÑÀÔØÓÑ ÚÁÌÅÖÎÏÓÔ¦..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "óËÏÎƦ­ÕÒÕ×ÁÔÉ ÄÖÅÒÅÌÏ"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
#, fuzzy
msgid "Configure sources"
msgstr "óËÏÎƦ­ÕÒÕ×ÁÔÉ ÄÖÅÒÅÌÏ"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "äÖÅÒÅÌÏ"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
#, fuzzy
msgid "Remove"
msgstr "úͦÎÎÉÊ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "òÅÄÁÇÕ×ÁÔÉ"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr ""
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "ðÏÍÉÌËÁ..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "÷ÉȦÄ"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -225,7 +255,7 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -356,11 +386,11 @@ msgid "China"
msgstr ""
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr ""
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -368,15 +398,15 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr ""
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -386,12 +416,12 @@ msgid ""
"Please try again later."
msgstr ""
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
#, fuzzy
msgid "No mirror"
msgstr "âÅÚ ÐÏÍÉÌÏË"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -400,7 +430,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr ""
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
#, fuzzy
msgid "Please choose the desired mirror."
msgstr ""
@@ -411,93 +441,93 @@ msgstr ""
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr ""
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
#, fuzzy
msgid "Search results"
msgstr "òÅÚÕÌØÔÁÔ ÐÏÛÕËÕ"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
#, fuzzy
msgid "Search results (none)"
msgstr "òÅÚÕÌØÔÁÔ ÐÏÛÕËÕ"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
#, fuzzy
msgid "Please wait, searching..."
msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÐÒÉÂÉÒÁ¤ æ ÐÁËÅÔÉ:"
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr ""
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"÷¦ÄͦÎÉÔÉ ×ÉÂ¦Ò \n"
"×ÓØÏÇÏ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "÷ÉÂÒÁÔÉ ×ÓÅ"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr ""
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
#, fuzzy
msgid "unknown package "
msgstr "îÅצÄÏÍÁ ÓÔÏÒ¦ÎËÁ"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
#, fuzzy
msgid "Please wait, listing packages..."
msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÐÒÉÂÉÒÁ¤ æ ÐÁËÅÔÉ:"
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ΦÞÏÇÏ)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
#, fuzzy
msgid "No update"
msgstr "Ú×ÉÞÁÊÎÅ ÐÏÎÏ×ÌÅÎÎÑ"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
"or you already installed all of them."
msgstr ""
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
#, fuzzy
msgid "Some additional packages need to be removed"
msgstr "㦠ÐÁËÅÔÉ ÍÁÀÔØ ÂÕÔÉ ×ÓÔÁÎÏ×ÌÅΦ ÝÏ ×ÓÅ ÐÒÁÃÀ×ÁÌÏ ×¦ÒÎÏ:"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
#, fuzzy
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
@@ -507,54 +537,54 @@ msgstr ""
"ýÏ ÚÁÄÏ×ÏÌØÎÉÔÉ ×Ó¦ ÚÁÌÅÖÎÏÓÔ¦,\n"
"æ ÐÁËÅÔÉ ÂÕÄÕÔØ ÐÒÉÂÒÁΦ:"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr ""
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr ""
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
#, fuzzy
msgid "Some packages can't be installed"
msgstr "ðÁËÅÔÉ ×ÖÅ ×ÓÔÁÎÏ×ÌÅΦ"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
msgstr ""
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr ""
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr ""
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr ""
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -564,12 +594,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "äÖÅÒÅÌÏ"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -582,7 +612,7 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -594,74 +624,74 @@ msgid ""
"%s\n"
msgstr ""
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Bugfixes updates"
msgstr "âÅÓÐÅÞÎÅ ÏÎÏ×ÌÅÎÎÑ"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
#, fuzzy
msgid "Normal updates"
msgstr "Ú×ÉÞÁÊÎÅ ÐÏÎÏ×ÌÅÎÎÑ"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
#, fuzzy
msgid "Mandrake choices"
msgstr "íÁÎÄÒÅÊËïÎÏ×ÌÅÎÎÑ"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr ""
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
#, fuzzy
msgid "All packages,"
msgstr "0 ÐÁËÅÔ¦×, 0 ÂÁÊÔ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr ""
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr ""
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr ""
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr ""
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
#, fuzzy
msgid "in descriptions"
msgstr "ïÐÉÓÉ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr ""
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
#, fuzzy
msgid "in files"
msgstr "ìÏËÁÌØÎÉÊ ÎÏÓ¦Ê"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Ú×ÉÞÁÊÎÅ ÐÏÎÏ×ÌÅÎÎÑ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -671,40 +701,40 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "ûÕËÁÔÉ"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "ðÏÛÕË"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "¶ÎÓÔÁÌÀ×ÁÔÉ"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr ""
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Mandrake Update"
msgstr ""
"íÁÎÄÒÅÊË\n"
"ïÎÏ×ÌÅÎÎÑ"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
#, fuzzy
msgid "Software Packages Removal"
msgstr " íÅÎÅÄÖÅÒ ðÒÏÇÒÁÍÎÏÇÏ úÁÂÅÓÐÅÞÅÎÎÑ "
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
#, fuzzy
msgid "Software Packages Installation"
msgstr "¶ÎÓÔÁÌÑÃ¦Ñ ÐÁËÅÔ¦×"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -712,23 +742,23 @@ msgid ""
"Is it ok to continue?"
msgstr ""
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr ""
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr ""
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -737,15 +767,15 @@ msgid ""
"Then, restart MandrakeUpdate."
msgstr ""
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr ""
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -758,48 +788,52 @@ msgid ""
"Do you want to try another mirror?"
msgstr ""
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
#, fuzzy
msgid "Please wait, finding available packages..."
msgstr "ÐÅÒÅÞÉÔÁÉ ÓÐÉÓËÉ ÄÏÓÔÕÐÎÉÈ ÐÁËÅÔ¦×"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr ""
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr ""
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "íÏÖÌÉ×Ï ×ÓÔÁÎÏ×ÉÔÉ"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "úͦÎÎÉÊ"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr ""
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -808,83 +842,79 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "ðÁËÅÔÉ ×ÖÅ ×ÓÔÁÎÏ×ÌÅΦ"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "ðÁËÅÔ ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÉÊ"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
#, fuzzy
msgid "Unable to get source packages."
msgstr "ðÏÇÁÎÏ, ÎÅ ÍÏÖÌÉ×Ï ÐÒÏÞÉÔÁÔÉ ÁÂÏ ÚÎÁÊÔÉ ÐÁËÅÔÉ "
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr ""
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr ""
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr ""
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
#, fuzzy
msgid "Installation failed"
msgstr "íÏÖÌÉ×Ï ×ÓÔÁÎÏ×ÉÔÉ"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
msgstr ""
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
#, fuzzy
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "÷ÉÂÅÒ¦ÔØ ÐÁËÅÔÉ Ñ˦ ×É ÚÂÉÒÁ¤ÔÅÓØ ÐÏÎÏ×ÉÔÉ"
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr ""
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
#, fuzzy
msgid "Everything already installed."
msgstr "ðÁËÅÔ ×ÖÅ ×ÓÔÁÎÏ×ÌÅÎÉÊ"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr ""
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr ""
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
#, fuzzy
msgid "Please wait, removing packages..."
msgstr "úÁÞÅËÁÊÔÅ, ÂÕÄØ ÌÁÓËÁ, ÐÏËÉ rpm ÐÒÉÂÉÒÁ¤ æ ÐÁËÅÔÉ:"
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -892,7 +922,7 @@ msgid ""
"your computer."
msgstr ""
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -900,7 +930,7 @@ msgid ""
"computer."
msgstr ""
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1001,9 +1031,6 @@ msgstr "÷ÓÔÁÎÏ×ÉÔÉ ×ÓÅ"
#~ msgid "Force"
#~ msgstr "ðÒÉÍÕÓÏ×Ï"
-#~ msgid "Error..."
-#~ msgstr "ðÏÍÉÌËÁ..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "ð¦Ä ÞÁÓ ÕÓÔÁÎÏ×ËÉ ÓÔÁÌÁÓÑ ÐÏÍÉÌËÁ"
diff --git a/po/vi.po b/po/vi.po
index 8c0283a4..208d57cb 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -5,7 +5,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-29 17:06+0700\n"
"Last-Translator: Trinh Minh Thanh <tmthanh@linuxmail.org>\n"
"Language-Team: Gnome-Vi Team <Gnomevi-list@lists.sourceforge.net>\n"
@@ -54,7 +54,7 @@ msgstr "ÄÆ°á»ng dẫn hoặc Ä‘iểm gắn kết:"
msgid "Removable device"
msgstr "Thiết bị có thể gỡ bá»"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Cập nhật bảo mật"
@@ -70,7 +70,7 @@ msgstr "Chá»n má»™t mirror..."
msgid "Login:"
msgstr "Äăng nhập:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Mật khẩu:"
@@ -103,14 +103,16 @@ msgid "Type of source:"
msgstr "Loại nguồn:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "OK"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Bá» qua"
@@ -160,43 +162,73 @@ msgstr "Cập nhật"
msgid "Please wait, updating media..."
msgstr "Hãy đợi, đang cập nhật phương tiện..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Cấu hình các nguồn"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "Tên ngÆ°á»i dùng ủy nhiệm:"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "Tên ngÆ°á»i dùng:"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Cấu hình các nguồn"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "Bật ?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Nguồn"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Gỡ Bá»"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Hiệu chỉnh"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Thêm..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Cập nhật..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "Lá»—i..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Lưu và Thoát"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Thoát"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -207,7 +239,7 @@ msgstr ""
"\n"
"Có đồng ý tiếp tục không?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -338,11 +370,11 @@ msgid "China"
msgstr "Trung Quốc"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Hoa Kỳ"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -354,16 +386,16 @@ msgstr ""
"\n"
"Nó có tốt để tiếp tục không?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Hãy đợi, đang tải xuống các địa chỉ mirror từ website của MandrakeSoft."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Lỗi khi đang tải xuống"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -378,11 +410,11 @@ msgstr ""
"Mạng hay website của MandrakeSoft hiện thá»i có thể không có.\n"
"Xin hãy thử lại sau."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Không có mirror"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -396,7 +428,7 @@ msgstr ""
"kiến trúc của bộ vi xử lý của bạn không được hỗ trợ bởi Cập Nhật\n"
"Chính Thức Của Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Hãy chá»n mirror mong muốn."
@@ -404,75 +436,75 @@ msgstr "Hãy chá»n mirror mong muốn."
msgid "Other"
msgstr "Khác"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Không có sẵn)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Kết quả tìm kiếm"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Kết quả tìm kiếm (không)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Hãy đợi, đang tìm kiếm..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Dừng"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Có thể thêm vào"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Có thể nâng cấp"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"Bá» chá»n\n"
"toàn bộ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "Chá»n toàn bá»™"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Thêm các thông tin vỠgói..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "Cần đến một trong các gói tin sau:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Hãy chá»n"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "Gói tin không xác định"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Hãy đợi, đang liệt kê các gói..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(không có)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Không có cập nhật"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -482,11 +514,11 @@ msgstr ""
"nào cho các gói tin đã được cài đặt hoặc là bạn đã cài đặt chúng\n"
"rồi."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Cần gỡ bỠmột số gói bổ sung"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -496,11 +528,11 @@ msgstr ""
"bá»:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Không thể gỡ bỠmột số gói"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -510,11 +542,11 @@ msgstr ""
"ngay bây giá»:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Cần thêm các gói bổ sung"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -524,11 +556,11 @@ msgstr ""
"cài đặt:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Một số gói không thể cài đặt"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -536,21 +568,21 @@ msgstr ""
"Xin lá»—i, không thể chá»n các gói sau:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Má»™t số gói cần được gỡ bá»"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Äã chá»n: %d MB / Không gian Ä‘Ä©a trống: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Kích thÆ°á»›c được chá»n: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -565,12 +597,12 @@ msgstr ""
"Bản ghi thay đổi (Changelog):\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Nguồn: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -591,7 +623,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -610,67 +642,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Cập nhật sửa lỗi"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Cập nhật thông thÆ°á»ng"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Các lá»±a chá»n của Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Má»i gói tin, theo bảng chữ cái"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Toàn bộ các gói,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "theo nhóm"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "Theo kích thước"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "theo tình trạng chá»n"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "theo nơi chứa nguồn"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "theo sự sẵn có để cập nhật"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "trong các mô tả"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "trong các tên"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "trong các tập tin"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Thông tin tối đa"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Thông tin thông thÆ°á»ng"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -685,35 +717,35 @@ msgstr ""
"\n"
"Äã sẵn sàng tiếp tục?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Tìm:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Tìm kiếm"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Cài đặt"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Cập Nhật Mandrake"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Gỡ Bá» Các Gói Phần Má»m"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Cài Äặt Các Gói Phần Má»m"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -725,26 +757,26 @@ msgstr ""
"\n"
"Tiếp tục được chưa?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Hãy đợi, đang liên lạc với mirror để cập nhật thông tin vỠcác gói cập nhật."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Lỗi khi cập nhật phương tiện"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"Xảy ra một lỗi không có khả năng phục hồi khi đang cập nhật thông tin vỠcác "
"gói cập nhật."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Cách chá»n thủ công mirror của bạn"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -758,15 +790,15 @@ msgstr ""
"\n"
"Sau đó khởi chạy lại MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "Hãy đợi, đang liên lạc với mirror để sơ khởi các gói cập nhật."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Lỗi khi thêm phương tiện cập nhật"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -787,46 +819,50 @@ msgstr ""
"\n"
"Bạn có muốn thử một mirror khác không?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Hãy đợi, đang tìm các gói sẵn có..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Má»i gói tin yêu cầu đã được cài đặt thành công."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Má»i thứ đã được cài đặt thành công"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "Kết thúc cài đặt"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Thẩm tra %s"
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Gỡ BỠ.%s"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Dùng .%s là tập tin chính"
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Không làm gì"
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Thẩm tra..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -839,7 +875,7 @@ msgstr ""
"Một số tập tin cấu hình được tạo là `.rpmnew' hay `.rpmsave',\n"
"Bây giỠbạn có thể kiểm tra một số tập tin đó để tạo các hoạt động:"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
@@ -847,36 +883,32 @@ msgstr ""
"Không cài đặt đúng được một số\n"
"gói tin"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "má»i thứ đã được cài đặt đúng"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr "Thẩm tra..."
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Không thể lấy các gói nguồn."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Xin lỗi, không thể lấy các gói nguồn."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Thay phương tiện"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Hãy nạp phương tiện có tên \"%s\" trên thiết bị [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "Không cài đặt được"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -884,35 +916,35 @@ msgstr ""
"Cài đặt không được, thiếu một số tập tin.\n"
"Có thể bạn muốn cập nhật cơ sở dữ liệu vỠcác nguồn của mình."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "Hãy đợi, gỡ bỠcác gói để cho phép nâng cấp các gói khác..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "Thiếu chương trình"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "Thiếu chương trình được yêu cầu (grpmi). Hãy kiểm tra cài đặt của bạn."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Má»i thứ đã được cài đặt."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Má»i thứ đã được cài đặt rồi "
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Hãy đợi, Ä‘ang Ä‘á»c cÆ¡ sở dữ liệu các gói..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Hãy đợi, đang gỡ bỠcác gói..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -924,7 +956,7 @@ msgstr ""
"Công cụ này giúp bạn chá»n phần má»m nào muốn gỡ bá» khá»i máy tính\n"
"của bạn."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -936,7 +968,7 @@ msgstr ""
"Công cụ này giúp bạn chá»n các cập nhật mà bạn muốn cài đặt lên\n"
"máy tính."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1183,9 +1215,6 @@ msgstr "Cài đặt Phần má»m"
#~ msgid "Force"
#~ msgstr "ép buộc"
-#~ msgid "Error..."
-#~ msgstr "Lá»—i..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "Có vấn đỠxảy ra trong khi cài đặt"
@@ -1486,9 +1515,6 @@ msgstr "Cài đặt Phần má»m"
#~ msgid "Ftp Proxy:"
#~ msgstr "Máy chủ ủy nhiệm FTP:"
-#~ msgid "Proxy username:"
-#~ msgstr "Tên ngÆ°á»i dùng ủy nhiệm:"
-
#~ msgid "Proxy password:"
#~ msgstr "Mật khẩu ủy nhiệm:"
@@ -1528,9 +1554,6 @@ msgstr "Cài đặt Phần má»m"
#~ msgid "Choose Packages"
#~ msgstr "Chá»n các gói"
-#~ msgid "Username:"
-#~ msgstr "Tên ngÆ°á»i dùng:"
-
#~ msgid "Security"
#~ msgstr "Bảo mật"
diff --git a/po/wa.po b/po/wa.po
index 45e5ed57..f878e215 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 20:55+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 1999-08-17 16:56+0200\n"
"Last-Translator: Lorint Hendschel <LorintHendschel@skynet.be>\n"
"Language-Team: Walon <linux-wa@chanae.alphanet.ch>\n"
@@ -56,7 +56,7 @@ msgstr "Tchimin ou pont di montaedje:"
msgid "Removable device"
msgstr "Bodjåve sopoirt"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "Metaedjes a djoû di såvrité"
@@ -72,7 +72,7 @@ msgstr "Tchoezixhoz on muroe..."
msgid "Login:"
msgstr "No d' elodjaedje:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "Sicret:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "Sôre di sourdant:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:780 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "'l est bon"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:806
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "Rinoncî"
@@ -162,43 +164,70 @@ msgstr "Mete a djoû"
msgid "Please wait, updating media..."
msgstr "Tårdjîz on pô s' i vs plait, metaedje a djoû do sopoirt..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "Apontyî les sourdants"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "Apontyî les sourdants"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "En alaedje?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "Sourdant"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:602
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "Oister"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "Candjî"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Radjouter..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "Mete a djoû..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+msgid "Proxy..."
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Schaper et cwiter"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:605
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Moussî foû"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:905
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +238,7 @@ msgstr ""
"\n"
"C' est bon di continuwer?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -340,11 +369,11 @@ msgid "China"
msgstr "Chine"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "Etats Unis"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -357,17 +386,17 @@ msgstr ""
"\n"
"C' est bon di continuwer?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr ""
"Tårdjîz on pô s' i vs plait, dj' aberweteye do waibe da MandrakeSoft les "
"adresses des muroes."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "Åk n' a nén stî tot-z aberwetant"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -383,11 +412,11 @@ msgstr ""
"disponibes pol moumint.\n"
"Risayîz ene miete pus tård."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "Nou muroe"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -401,7 +430,7 @@ msgstr ""
"l' årtchitecteure di vosse processeu n' est nén sopoirtêye påzès\n"
"metaedjes a djoû oficirs di Mandrake Linux."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "Tchoeziwxhoz les muroes ki vos vloz, s' i vs plait."
@@ -409,71 +438,71 @@ msgstr "Tchoeziwxhoz les muroes ki vos vloz, s' i vs plait."
msgid "Other"
msgstr "Ôte"
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(Nén disponibe)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "Rizultats do cweraedje"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "Rizultats do cweraedje (nouk)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "Tårdjîz on pô s' i vs plait, dji cwir..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Arester"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "Pout esse radjouté"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "Pout esse metou a djoû"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr "Nén tchoezi"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr "Tchoezi"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr "Pus d' informåcions sol pacaedje..."
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "I gn a mezåjhe d' onk des pacaedjes ki shuvèt:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "Tchoezixhoz s' i vs plait"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "pacaedje nén cnoxhou"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "Tårdjîz on pô s' i vs plait, dji fwait l' djivêye des pacaedjes..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(nole)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "Nou metaedjes a djoû"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -483,11 +512,11 @@ msgstr ""
"k' i gn a nén di metaedjes a djoû po les pacaedjes astalés\n"
"so vosse copiutrece, soeye-t i ki vos les avoz ddja astalés."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "Kékès ôtes pacaedjes divèt esse oistés"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -497,11 +526,11 @@ msgstr ""
"oistés eto:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "Des pacaedjes k' i gn a n' polèt nén esse oistés"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -511,11 +540,11 @@ msgstr ""
"dizastalés asteure:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "Ôtes pacaedjes k' end a mezåjhe"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -525,11 +554,11 @@ msgstr ""
"astalés eto:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "Des pacaedjes k' i gn a n' polèt nén esse astalés"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -537,21 +566,21 @@ msgstr ""
"Dji rgrete, les pacaedjes ki shuvèt n' polèt nén esse tchoezis:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "Des pacaedjes k' i gn a dvèt esse dizastalés"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Tchoezi: %d Mo / Plaece libe sol deure plake: %d Mo"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Grandeu tchoezeye: %d Mo"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -566,12 +595,12 @@ msgstr ""
"Djournå des candjmints:\n"
"%s"
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, c-format
msgid "Source: %s\n"
msgstr "Sourdant: %s\n"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -592,7 +621,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -611,67 +640,67 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "Metaedjes a djoû di coridjaedje"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Metaedjes a djoû normås"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Tchuzes di Mandrake"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "Tos les pacaedjes, relîs alfabeticmint"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "Tos les pacaedjes,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "pa groupe"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "pa grandeu"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "pa l' etat di tchoezixhadje"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "pa sourdant"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "pa disponibilité di metaedjes a djoû"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "ezès discrijhaedjes"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "ezès Nos"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "ezès fitchîs"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr "Li pus d' informåcions"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Normal information"
msgstr "Informåcions normåles"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -687,37 +716,37 @@ msgstr ""
"\n"
"C' est bon di continuwer?"
-#: ../rpmdrake_.c:586
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "Trover:"
-#: ../rpmdrake_.c:591
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "Cweri"
-#: ../rpmdrake_.c:603
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "Astaler"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr ""
"Metaedjes a djoû\n"
"di Mandrake"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "Oistaedje des pacaedjes di programes"
-#: ../rpmdrake_.c:616
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Astalaedje des pacaedjes di programes"
-#: ../rpmdrake_.c:648
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -730,27 +759,27 @@ msgstr ""
"\n"
"C' est bon di continuwer?"
-#: ../rpmdrake_.c:652
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr ""
"Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po mete a djoû "
"l' informåcion so les pacaedjes."
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "Åk n' a nén stî tot metant a djoû li sopoirt"
-#: ../rpmdrake_.c:655
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr ""
"I gn a-st avou ene aroke moirt tot metant a djoû l' informåcion so les "
"pacaedjes."
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "Kimint tchoezi manuwelmint vosse muroe"
-#: ../rpmdrake_.c:662
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -764,17 +793,17 @@ msgstr ""
"\n"
"Poy, renondez MandrakeUpdate."
-#: ../rpmdrake_.c:668
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr ""
"Tårdjîz on pô s' i vs plait, dji m' raloye å muroe po vey les pacaedjes di "
"metaedje a djoû k' i gn a..."
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Åk n' a nén stî tot radjoutant li sopoirt di metaedjes a djoû"
-#: ../rpmdrake_.c:673
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -794,46 +823,50 @@ msgstr ""
"\n"
"Voloz vs sayî avou èn ôte muroe?"
-#: ../rpmdrake_.c:702
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "Tårdjîz on pô s' i vs plait, dji cwir après les pacaedjes k' i gn a..."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "Totes les pacaedjes dimandés ont stî astalés comufåt."
-#: ../rpmdrake_.c:725
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "Totafwait a stî astalé comufåt"
-#: ../rpmdrake_.c:728
+#: ../rpmdrake_.c:724
msgid "Installation finished"
msgstr "L' astalaedje a fini"
-#: ../rpmdrake_.c:731
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr "Analijhant %s"
-#: ../rpmdrake_.c:747
+#: ../rpmdrake_.c:743
#, c-format
msgid "Remove .%s"
msgstr "Oister les *.%s"
-#: ../rpmdrake_.c:749
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr "Eployî les *.%s come mwaisses fitchîs"
-#: ../rpmdrake_.c:751
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr "Èn rén fé"
-#: ../rpmdrake_.c:754
+#: ../rpmdrake_.c:750
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr "Analijhant..."
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -847,42 +880,38 @@ msgstr ""
"avou «.rpmnew» ou «.rpmsave» come cawete, vos les dvrîz rloukî\n"
"po decider cwè fé avou zels:"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:773
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "Des pacaedjes k' i gn a n' ont nén polou esse astalés comufåt"
-#: ../rpmdrake_.c:763
+#: ../rpmdrake_.c:774
msgid "everything was installed correctly"
msgstr "totafwait a stî astalé comufåt"
-#: ../rpmdrake_.c:768
-msgid "Inspect..."
-msgstr "Analijhant..."
-
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Dji n' a nén savou prinde les pacaedjes sourdants."
-#: ../rpmdrake_.c:797
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "Dji n' a nén savou prinde les pacaedjes sourdants, dji rgrete."
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Candjî di sopoirt"
-#: ../rpmdrake_.c:805
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Metoz l' sopoirt lomé «%s» dins l' lijheu [%s]"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "L' astalaedje a fwait berwete"
-#: ../rpmdrake_.c:814
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -890,38 +919,38 @@ msgstr ""
"L' astalaedje a fwait berwete, sacwants fitchîs mankèt.\n"
"Vos dvoz motoit mete a djoû vosse båze di dnêye des sourdants."
-#: ../rpmdrake_.c:817
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr ""
"Tårdjîz on pô s' i vs plait, dji oisteye des pacaedjes po ds ôtes poleur "
"esse astalés..."
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "I manke on programe"
-#: ../rpmdrake_.c:827
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr ""
"I manke on programe k' end a mezåjhe (grpm). Verifyîz vosse astalåcion."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "Tot a ddja stî astalé."
-#: ../rpmdrake_.c:846
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "Tot a ddja stî astalé (est çki çoula n' divreut nén måy ariver?)."
-#: ../rpmdrake_.c:856
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "Tårdjîz on pô s' i vs plait, dji lé li båze di dnêye des pacaedjes..."
-#: ../rpmdrake_.c:894
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "Tårdjîz on pô s' i vs plait, rpm oisteye les pacaedjes..."
-#: ../rpmdrake_.c:909
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -933,7 +962,7 @@ msgstr ""
"Ciste usteye chal vos aidrè a tchoezi kés programes ki vos vloz dizastaler\n"
"di vosse copiutrece."
-#: ../rpmdrake_.c:914
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -945,7 +974,7 @@ msgstr ""
"Ciste usteye chal vos aidrè a tchoezi les metaedjes a djoû ki vos vloz\n"
"astaler sol copiutrece da vosse."
-#: ../rpmdrake_.c:919
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 946f9c8e..32377001 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-20 11:20+0800\n"
"Last-Translator: Danny Zeng <danny@zeng.com.cn>\n"
"Language-Team: Simplified Chinese <future-cjk@mandrakesoft.com>\n"
@@ -56,7 +56,7 @@ msgstr "·¾¶»ò×°Ôصã:"
msgid "Removable device"
msgstr "¿ÉÒƶ¯É豸"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "°²È«¸üÐÂ"
@@ -72,7 +72,7 @@ msgstr "Ñ¡Ôñ¾µÏñ..."
msgid "Login:"
msgstr "µÇ¼Ãû:"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "¿ÚÁî:"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "½éÖÊÀàÐÍ:"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "È·¶¨"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "È¡Ïû"
@@ -162,43 +164,71 @@ msgstr "¸üÐÂ"
msgid "Please wait, updating media..."
msgstr "¸üнéÖÊ, ÇëÉÔºò..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "ÅäÖÃÀ´Ô´?"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+msgid "Proxy hostname:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+msgid "User:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "ÅäÖÃÀ´Ô´?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "¼¤»î?"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "À´Ô´"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "¿Éжװ"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "±à¼­"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "Ìí¼Ó..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "¸üÐÂ..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "´íÎó..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "±£´æ²¢Í˳ö"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "À뿪"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +239,7 @@ msgstr ""
"\n"
"Òª¼ÌÐøÂð?"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -340,11 +370,11 @@ msgid "China"
msgstr "Öйú"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "ÃÀ¹ú"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -356,15 +386,15 @@ msgstr ""
"\n"
"¿ÉÒÔ¼ÌÐøÂð?"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "ÕýÔÚ´Ó MandrakeSoft ÍøÕ¾ÏÂÔؾµÏñÕ¾µãµÄµØÖ·, ÇëÉÔºò."
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "ÏÂÔسö´í"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -379,11 +409,11 @@ msgstr ""
"ÄúµÄÍøÂçÁ¬½Ó, »òÕß MandrakeSoft ÍøÕ¾, ÏÖÔÚÓÐЩÎÊÌâ.\n"
"Çë¹ýÒ»»á¶ùÔÙÊÔ."
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "ûÓоµÏñ"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -392,7 +422,7 @@ msgid ""
"by Mandrake Linux Official Updates."
msgstr "ûÓÐÕÒµ½ºÏÊʵľµÏñÕ¾µã.."
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "ÇëÑ¡Ôñϲ»¶µÄ¾µÏñÕ¾µã."
@@ -400,71 +430,71 @@ msgstr "ÇëÑ¡Ôñϲ»¶µÄ¾µÏñÕ¾µã."
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(²»¿ÉÓÃ)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "ËÑÑ°½á¹û"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "ËÑÑ°½á¹û (ÎÞ)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "ÕýÔÚËÑÑ°, ÇëÉÔºò..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "Í£Ö¹"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "¿ÉÌí¼ÓµÄ"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "¿ÉÉý¼¶µÄ"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Not selected"
msgstr ""
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
msgid "Selected"
msgstr ""
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "ÐèÒªÏÂÁÐÈí¼þÖ®Ò»:"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "ÇëÑ¡Ôñ"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "δ֪Èí¼þ°ü"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "ÕýÔÚÁгöÈí¼þ°ü£¬ÇëÉÔºò..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(ÎÞ)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "ûÓиüÐÂ"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -474,11 +504,11 @@ msgstr ""
"°²×°µÄÕâЩÈí¼þ°üûÓиüÐÂ,\n"
"»òÕßÄúÒѾ­°²×°¹ýËùÓеĸüÐÂ."
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "ÁíÍâһЩÈí¼þ°üÐèҪɾ³ý"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -488,11 +518,11 @@ msgstr ""
"ÐèҪɾ³ýÏÂÁÐÈí¼þ°ü:\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "ÓÐЩÈí¼þ°üÎÞ·¨É¾³ý"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -502,11 +532,11 @@ msgstr ""
"ÏÂÁÐÈí¼þ°ü:\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "ÐèÒªÁíÍâµÄÈí¼þ°ü"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -516,11 +546,11 @@ msgstr ""
"ÏÂÁÐÈí¼þ°ü:\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "ÓÐЩÈí¼þ°üÎÞ·¨°²×°"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -528,21 +558,21 @@ msgstr ""
"¶Ô²»Æ𣬲»ÄÜÑ¡ÔñÏÂÁÐÈí¼þ°ü:\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "ÐèҪɾ³ýһЩÈí¼þ°ü"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "Ñ¡ÖÐ: %d MB / ¿ÕÏдÅÅÌ¿Õ¼ä: %d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "Ñ¡ÖеÄ: %d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -552,12 +582,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "À´Ô´"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -578,7 +608,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -597,68 +627,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "ȱÏÝÐÞÕý¸üÐÂ"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "Õý³£¸üÐÂ"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake ¾«Ñ¡"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "È«²¿Èí¼þ°ü, ×Öĸ´ÎÐò"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "È«²¿Èí¼þ°ü,"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "°´ÕÕ·Ö×é"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "°´ÕÕ´óС"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "°´ÕÕÑ¡Ôñ״̬"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "°´ÕÕÀ´Ô´"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "°´ÕÕÊÇ·ñ¿É¸üÐÂ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "ÔÚÃèÊöÖÐ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "ÔÚÃû³ÆÖÐ"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "ÔÚÎļþÖÐ"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "Õý³£¸üÐÂ"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -673,35 +703,35 @@ msgstr ""
"\n"
"¿ÉÒÔ¼ÌÐøÂð?"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "ÕÒµ½:"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "ËÑÑ°"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "°²×°"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake ¸üÐÂ"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr " Èí¼þ°üɾ³ý"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "Èí¼þ°ü°²×°"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -713,23 +743,23 @@ msgstr ""
"\n"
"¿ÉÒÔ¼ÌÐøÂð?"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "ÕýÔÚÁ¬½Ó¾µÏñ·þÎñÆ÷ÒԵõ½×îеĸüÐÂÈí¼þ°ü, ÇëÉÔºò."
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "¸üнéÖʳö´í"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "¸üÐÂÈí¼þ°üÐÅϢʱ·¢Éú²»¿É»Ö¸´µÄ´íÎó."
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "ÈçºÎÊÖ¹¤ÌôÑ¡ÄúµÄ¾µÏñ"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -743,15 +773,15 @@ msgstr ""
"\n"
"È»ºó, ÖØÐÂÆô¶¯ MandrakeUpdate."
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "ÕýÔÚÁªÏµ·þÎñÆ÷À´³õʼ»¯¸üÐÂÈí¼þ°ü£¬ ÇëÉÔºò."
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "Ìí¼Ó¸üнéÖʳö´í"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -771,48 +801,52 @@ msgstr ""
"\n"
"Òª³¢ÊÔÁíÍâµÄ¾µÏñ·þÎñÆ÷Âð?"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "ÕýÔÚÑ°ÕÒ¿É°²×°µÄÈí¼þ°ü, ÇëÉÔºò..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "ËùÓÐÒªÇóµÄÈí¼þ°ü¶¼Òѳɹ¦°²×°."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "ËùÓж«Î÷Òѳɹ¦°²×°"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "°²×°Ê§°Ü"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "¿Éжװ"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -821,44 +855,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "ÓÐЩÈí¼þ°üÎÞ·¨°²×°"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "ËùÓж«Î÷Òѳɹ¦°²×°"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "Ô´Èí¼þ°üδÕÒµ½."
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "¶Ô²»Æð, ÎÞ·¨µÃµ½Ô´Èí¼þ°ü."
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "¸ü»»½éÖÊ"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "Çë°Ñ±ê¼ÇΪ \"%s\" µÄ½éÖʷŽøÉ豸 [%s]"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "°²×°Ê§°Ü"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -866,35 +896,35 @@ msgstr ""
"°²×°Ê§°Ü, ȱÉÙijЩÎļþ.\n"
"Äú¿ÉÄÜÐèÒª¸üÐÂÄúµÄÀ´Ô´Êý¾Ý¿â.."
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "ΪÁËÉý¼¶Èí¼þ°ü, ÕýÔÚɾ³ý¾ÉµÄÈí¼þ°ü, ÇëÉÔºò..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "ȱÉÙ³ÌÐò"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "ȱÉÙÒ»¸öÐèÒªµÄ³ÌÐò (grpmi). Çë¼ì²éÄúµÄ°²×°."
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "ËùÓÐÈí¼þ°üÒѾ­°²×°ÁË."
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "ËùÓÐÈí¼þ°üÒѾ­°²×°ÁË(ÕâÊÇÄúÏ£ÍûµÄÂð?)."
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "¶ÁÈ¡Èí¼þ°üÊý¾Ý¿â, ÇëÉÔºò..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "ÕýÔÚɾ³ýÈí¼þ°ü£¬ÇëÉÔºò..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -906,7 +936,7 @@ msgstr ""
"Õâ¸ö¹¤¾ß°ïÖúÄúÑ¡ÔñÏëÒª´ÓÄúµÄµçÄÔÖÐɾ³ý\n"
"µÄÈí¼þ°ü."
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -918,7 +948,7 @@ msgstr ""
"Õâ¸ö¹¤¾ß°ïÖúÄúΪÄúµÄµçÄÔÖа²×°\n"
"¸üеÄÈí¼þ°ü."
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1168,9 +1198,6 @@ msgstr "°²×°Èí¼þ"
#~ msgid "Force"
#~ msgstr "Ç¿ÆÈ"
-#~ msgid "Error..."
-#~ msgstr "´íÎó..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "ÔÚ°²×°¹ý³ÌÖз¢ÉúÎÊÌâ"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 58817f23..00439ca4 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: rpmdrake 1.3\n"
-"POT-Creation-Date: 2002-08-29 17:02+0200\n"
+"POT-Creation-Date: 2002-08-30 20:11+0200\n"
"PO-Revision-Date: 2002-08-24 04:20-+800\n"
"Last-Translator: Kenduest Lee <kenduest@i18n.linux.org.tw>\n"
"Language-Team: Chinese <zh-l10n@linux.org.tw>\n"
@@ -56,7 +56,7 @@ msgstr "¸ô®|©Î¬O±¾¸üÂI¡G"
msgid "Removable device"
msgstr "¥i²¾°£¸Ë¸m"
-#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:465
+#: ../edit-urpm-sources.pl_.c:59 ../rpmdrake_.c:461
msgid "Security updates"
msgstr "¦w¥þ§ó·s"
@@ -72,7 +72,7 @@ msgstr "¿ï¾Ü¬M®g¦a§}..."
msgid "Login:"
msgstr "µn¤J¡G"
-#: ../edit-urpm-sources.pl_.c:92
+#: ../edit-urpm-sources.pl_.c:92 ../edit-urpm-sources.pl_.c:228
msgid "Password:"
msgstr "±K½X¡G"
@@ -105,14 +105,16 @@ msgid "Type of source:"
msgstr "¨Ó·½Ãþ§O¡G"
#: ../edit-urpm-sources.pl_.c:124 ../edit-urpm-sources.pl_.c:183
-#: ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98 ../rpmdrake.pm_.c:272
-#: ../rpmdrake_.c:322 ../rpmdrake_.c:779 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:232 ../rpmdrake.pm_.c:78 ../rpmdrake.pm_.c:98
+#: ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318 ../rpmdrake_.c:777
+#: ../rpmdrake_.c:803
msgid "Ok"
msgstr "½T©w"
#: ../edit-urpm-sources.pl_.c:127 ../edit-urpm-sources.pl_.c:175
#: ../edit-urpm-sources.pl_.c:183 ../edit-urpm-sources.pl_.c:202
-#: ../rpmdrake.pm_.c:272 ../rpmdrake_.c:322 ../rpmdrake_.c:805
+#: ../edit-urpm-sources.pl_.c:233 ../rpmdrake.pm_.c:270 ../rpmdrake_.c:318
+#: ../rpmdrake_.c:803
msgid "Cancel"
msgstr "¨ú®ø"
@@ -162,43 +164,73 @@ msgstr "§ó·s"
msgid "Please wait, updating media..."
msgstr "½Ðµy«á¡A§ó·s´C¤¶¤¤..."
-#: ../edit-urpm-sources.pl_.c:216
+#: ../edit-urpm-sources.pl_.c:215
+#, fuzzy
+msgid "Configure proxies"
+msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
+
+#: ../edit-urpm-sources.pl_.c:220
+msgid ""
+"If you need a proxy, enter the hostname and an optional port (syntax: "
+"<proxyhost[:port]>):"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:222
+#, fuzzy
+msgid "Proxy hostname:"
+msgstr "¨Ï¥ÎªÌ¦WºÙ (¥N²z¦øªA¾¹)¡G"
+
+#: ../edit-urpm-sources.pl_.c:224
+msgid "You may specify a user/password for the proxy authentication:"
+msgstr ""
+
+#: ../edit-urpm-sources.pl_.c:226
+#, fuzzy
+msgid "User:"
+msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
+
+#: ../edit-urpm-sources.pl_.c:250
msgid "Configure sources"
msgstr "³]©w®M¥ó¨Ó·½¦ì¸m¡H"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Enabled?"
msgstr "¶}±Ò"
-#: ../edit-urpm-sources.pl_.c:217
+#: ../edit-urpm-sources.pl_.c:251
msgid "Source"
msgstr "¨Ó·½"
-#: ../edit-urpm-sources.pl_.c:245 ../rpmdrake_.c:601
+#: ../edit-urpm-sources.pl_.c:279 ../rpmdrake_.c:598
msgid "Remove"
msgstr "²¾°£"
-#: ../edit-urpm-sources.pl_.c:247
+#: ../edit-urpm-sources.pl_.c:281
msgid "Edit"
msgstr "½s¿è"
-#: ../edit-urpm-sources.pl_.c:249
+#: ../edit-urpm-sources.pl_.c:283
msgid "Add..."
msgstr "·s¼W..."
-#: ../edit-urpm-sources.pl_.c:251
+#: ../edit-urpm-sources.pl_.c:285
msgid "Update..."
msgstr "§ó·s..."
-#: ../edit-urpm-sources.pl_.c:254
+#: ../edit-urpm-sources.pl_.c:286
+#, fuzzy
+msgid "Proxy..."
+msgstr "¿ù»~..."
+
+#: ../edit-urpm-sources.pl_.c:289
msgid "Save and quit"
msgstr "Àx¦s¨ÃÂ÷¶}"
-#: ../edit-urpm-sources.pl_.c:255 ../rpmdrake_.c:604
+#: ../edit-urpm-sources.pl_.c:290 ../rpmdrake_.c:601
msgid "Quit"
msgstr "Â÷¶}"
-#: ../edit-urpm-sources.pl_.c:265 ../rpmdrake_.c:904
+#: ../edit-urpm-sources.pl_.c:300 ../rpmdrake_.c:902
#, c-format
msgid ""
"%s\n"
@@ -209,7 +241,7 @@ msgstr ""
"\n"
"±z­nÄ~Äò¶Ü¡H"
-#: ../edit-urpm-sources.pl_.c:268
+#: ../edit-urpm-sources.pl_.c:303
msgid ""
"Welcome to the packages source editor!\n"
"\n"
@@ -339,11 +371,11 @@ msgid "China"
msgstr "¤¤°ê¤j³°"
#: ../rpmdrake.pm_.c:167 ../rpmdrake.pm_.c:168 ../rpmdrake.pm_.c:169
-#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:222
+#: ../rpmdrake.pm_.c:170 ../rpmdrake.pm_.c:220
msgid "United States"
msgstr "¬ü°ê"
-#: ../rpmdrake.pm_.c:230
+#: ../rpmdrake.pm_.c:228
msgid ""
"I need to contact MandrakeSoft website to get the mirrors list.\n"
"Please check that your network is currently running.\n"
@@ -355,15 +387,15 @@ msgstr ""
"\n"
"±z­nÄ~Äò¶Ü¡H"
-#: ../rpmdrake.pm_.c:234
+#: ../rpmdrake.pm_.c:232
msgid "Please wait, downloading mirrors addresses from MandrakeSoft website."
msgstr "½Ðµy«á¡A¥¿¦b¥Ñ MandrakeSoft Á`³¡¨ú¦^¬M®g¯¸¥x²M³æ¡C"
-#: ../rpmdrake.pm_.c:240
+#: ../rpmdrake.pm_.c:238
msgid "Error during download"
msgstr "¤U¸üµo¥Í¿ù»~"
-#: ../rpmdrake.pm_.c:241
+#: ../rpmdrake.pm_.c:239
#, c-format
msgid ""
"There was an error downloading the mirrors list:\n"
@@ -378,11 +410,11 @@ msgstr ""
"¤]³\¬Oºô¸ô³s½u¥¢±Ñ¡A©ÎªÌ¬O MandrakeSoft ¯¸¥x¼È®ÉµLªkÁpô¤W¡A\n"
"½Ðµy«á¦A¸Õ¡C"
-#: ../rpmdrake.pm_.c:249
+#: ../rpmdrake.pm_.c:247
msgid "No mirror"
msgstr "µL¬M®g¯¸¥x"
-#: ../rpmdrake.pm_.c:250
+#: ../rpmdrake.pm_.c:248
msgid ""
"I can't find any suitable mirror.\n"
"\n"
@@ -395,7 +427,7 @@ msgstr ""
"·|µo¥Í³o­Ó°ÝÃDªº±¡ªp¬Û·í¦h¡A¤ñ¤è Mandrake Linux\n"
"§ó·s¯¸¥x¥Ø«e©|¤£¤ä´©±z¥Ø«e¥Îªº¾÷¾¹¥­¥x¡C"
-#: ../rpmdrake.pm_.c:264
+#: ../rpmdrake.pm_.c:262
msgid "Please choose the desired mirror."
msgstr "½Ð¿ï¾Ü§ó·sªº¦a§}¶µ¥Ø"
@@ -403,75 +435,75 @@ msgstr "½Ð¿ï¾Ü§ó·sªº¦a§}¶µ¥Ø"
msgid "Other"
msgstr ""
-#: ../rpmdrake_.c:135 ../rpmdrake_.c:425 ../rpmdrake_.c:426
+#: ../rpmdrake_.c:131 ../rpmdrake_.c:421 ../rpmdrake_.c:422
msgid "(Non available)"
msgstr "(µLªk¨Ï¥Î)"
-#: ../rpmdrake_.c:143 ../rpmdrake_.c:194
+#: ../rpmdrake_.c:139 ../rpmdrake_.c:190
msgid "Search results"
msgstr "·j´Mµ²ªG"
-#: ../rpmdrake_.c:143
+#: ../rpmdrake_.c:139
msgid "Search results (none)"
msgstr "·j´Mµ²ªG (µL¥ô¦ó²Å¦Xªº¶µ¥Ø)"
-#: ../rpmdrake_.c:158
+#: ../rpmdrake_.c:154
msgid "Please wait, searching..."
msgstr "½Ðµy­Ô¡A·j´M¤¤..."
-#: ../rpmdrake_.c:161
+#: ../rpmdrake_.c:157
msgid "Stop"
msgstr "°±¤î"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Addable"
msgstr "¥i¨Ñ¥[¤J"
-#: ../rpmdrake_.c:195 ../rpmdrake_.c:295
+#: ../rpmdrake_.c:191 ../rpmdrake_.c:291
msgid "Upgradable"
msgstr "¥i¨Ñ§ó·s"
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Not selected"
msgstr ""
"¥þ³¡\n"
"¤£¿ï "
-#: ../rpmdrake_.c:197
+#: ../rpmdrake_.c:193
#, fuzzy
msgid "Selected"
msgstr "¥þ¿ï"
-#: ../rpmdrake_.c:232
+#: ../rpmdrake_.c:228
msgid "More information on package..."
msgstr ""
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "One of the following packages is needed:"
msgstr "±N»Ý­n¤U¦Cªº¨ä¤¤¤§¤@®M¥ó¡G"
-#: ../rpmdrake_.c:234
+#: ../rpmdrake_.c:230
msgid "Please choose"
msgstr "½Ð¿ï¾Ü"
-#: ../rpmdrake_.c:250
+#: ../rpmdrake_.c:246
msgid "unknown package "
msgstr "¤£©úªº®M¥ó"
-#: ../rpmdrake_.c:260
+#: ../rpmdrake_.c:256
msgid "Please wait, listing packages..."
msgstr "½Ðµy­Ô¡A¥¿¦b¦C¥X®M¥ó..."
-#: ../rpmdrake_.c:274
+#: ../rpmdrake_.c:270
msgid "(none)"
msgstr "(µL)"
-#: ../rpmdrake_.c:276
+#: ../rpmdrake_.c:272
msgid "No update"
msgstr "µL§ó·s"
-#: ../rpmdrake_.c:277
+#: ../rpmdrake_.c:273
msgid ""
"The list of updates is void. This means that either there is\n"
"no available update for the packages installed on your computer,\n"
@@ -480,11 +512,11 @@ msgstr ""
"§ó·sªº²M³æ¶µ¥Ø¬OªÅªº¡A¤]³\¬O±z©|¥¼·s¼W¥ô¦ó§ó·sªº´C¤¶¶µ¥Ø¡A\n"
"©ÎªÌ¬O±zªº¨t²Î¥Ø«e³£¤w¸g¦w¸Ë¤W³Ì·sªº®M¥ó¤F¡C"
-#: ../rpmdrake_.c:328
+#: ../rpmdrake_.c:324
msgid "Some additional packages need to be removed"
msgstr "¬°¤F¥i¥H¥þ­±¹B§@¥¿±`³o¨ÇÃB¥~ªº®M¥ó¥²¶·¤@¦P¦w¸Ë"
-#: ../rpmdrake_.c:329
+#: ../rpmdrake_.c:325
msgid ""
"Because of their dependencies, the following package(s) also need to be\n"
"removed:\n"
@@ -493,11 +525,11 @@ msgstr ""
"¬°¤F­nº¡¨¬¬Û¨Ì©Ê»Ý¨D¡A³o¨Ç®M¥ó»Ý­n³Q²¾°£¡G\n"
"\n"
-#: ../rpmdrake_.c:335
+#: ../rpmdrake_.c:331
msgid "Some packages can't be removed"
msgstr "¬Y¨Ç®M¥óµLªk³Q²¾°£"
-#: ../rpmdrake_.c:336 ../rpmdrake_.c:394
+#: ../rpmdrake_.c:332 ../rpmdrake_.c:390
msgid ""
"Because of their dependencies, the following package(s) must be\n"
"unselected now:\n"
@@ -506,11 +538,11 @@ msgstr ""
"¥Ñ©ó¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó±N·|¨ú®ø¿ï¨ú¥H«K©ó¯à°÷Ä~Äò¶i¦æ¤U¥h¡G\n"
"\n"
-#: ../rpmdrake_.c:364
+#: ../rpmdrake_.c:360
msgid "Additional packages needed"
msgstr "»Ý­nÃB¥~ªº®M¥ó¶µ¥Ø"
-#: ../rpmdrake_.c:365
+#: ../rpmdrake_.c:361
msgid ""
"To satisfy dependencies, the following package(s) also need\n"
"to be installed:\n"
@@ -519,11 +551,11 @@ msgstr ""
"¬°¤F¯à°÷º¡¨¬¬Û¨Ì©Êªº­n¨D¡A¤U­±ªº®M¥ó¤]¥²¶·¤@¦P¦w¸Ë¤W¡G\n"
"\n"
-#: ../rpmdrake_.c:378
+#: ../rpmdrake_.c:374
msgid "Some packages can't be installed"
msgstr "¬Y¨Ç®M¥óµLªk¦w¸Ë¤W"
-#: ../rpmdrake_.c:379
+#: ../rpmdrake_.c:375
msgid ""
"Sorry, the following package(s) can't be selected:\n"
"\n"
@@ -531,21 +563,21 @@ msgstr ""
"©êºp¡A¤U­±ªº®M¥ó¶µ¥Ø±N¤£¯à°÷³Q¿ï¨ú¡G\n"
"\n"
-#: ../rpmdrake_.c:393 ../rpmdrake_.c:564
+#: ../rpmdrake_.c:389 ../rpmdrake_.c:560
msgid "Some packages need to be removed"
msgstr "¬Y¨Ç®M¥ó»Ý­n¶¶«K²¾°£"
-#: ../rpmdrake_.c:415
+#: ../rpmdrake_.c:411
#, c-format
msgid "Selected: %d MB / Free disk space: %d MB"
msgstr "¤w¿ï¾Ü¡G%d MB / ¥i¥ÎºÏºÐªÅ¶¡¡G%d MB"
-#: ../rpmdrake_.c:417
+#: ../rpmdrake_.c:413
#, c-format
msgid "Selected size: %d MB"
msgstr "¿ï¨úªº¤j¤p¡G%d MB"
-#: ../rpmdrake_.c:423
+#: ../rpmdrake_.c:419
#, c-format
msgid ""
"%sFiles:\n"
@@ -555,12 +587,12 @@ msgid ""
"%s"
msgstr ""
-#: ../rpmdrake_.c:424
+#: ../rpmdrake_.c:420
#, fuzzy, c-format
msgid "Source: %s\n"
msgstr "¨Ó·½"
-#: ../rpmdrake_.c:429
+#: ../rpmdrake_.c:425
#, c-format
msgid ""
"Name: %s\n"
@@ -581,7 +613,7 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:433
+#: ../rpmdrake_.c:429
#, c-format
msgid ""
"Name: %s\n"
@@ -600,68 +632,68 @@ msgstr ""
"\n"
"%s\n"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Bugfixes updates"
msgstr "¯äÂΧó·s"
-#: ../rpmdrake_.c:465
+#: ../rpmdrake_.c:461
msgid "Normal updates"
msgstr "¤@¯ë§ó·s"
-#: ../rpmdrake_.c:484
+#: ../rpmdrake_.c:480
msgid "Mandrake choices"
msgstr "Mandrake ¿ï¾Ü"
-#: ../rpmdrake_.c:485
+#: ../rpmdrake_.c:481
msgid "All packages, alphabetical"
msgstr "©Ò¦³®M¥ó¡A¨Ì·Ó¦r¥À¶¶§Ç¤ÀÃþ"
-#: ../rpmdrake_.c:486
+#: ../rpmdrake_.c:482
msgid "All packages,"
msgstr "©Ò¦³®M¥ó¡A"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by group"
msgstr "¨Ì¸s²Õ¤ÀÃþ"
-#: ../rpmdrake_.c:509
+#: ../rpmdrake_.c:505
msgid "by size"
msgstr "¨Ì¤j¤p¤ÀÃþ"
-#: ../rpmdrake_.c:510
+#: ../rpmdrake_.c:506
msgid "by selection state"
msgstr "¨Ì¿ï¾Üª¬ºA¤ÀÃþ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by source repository"
msgstr "¨Ì¨Ó·½­ÜÀx¤ÀÃþ"
-#: ../rpmdrake_.c:511
+#: ../rpmdrake_.c:507
msgid "by update availability"
msgstr "¨Ì¥i¨Ñ§ó·s¤ÀÃþ"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in descriptions"
msgstr "¨Ì·Ó´y­z"
-#: ../rpmdrake_.c:532
+#: ../rpmdrake_.c:528
msgid "in names"
msgstr "¨Ì·Ó¦WºÙ"
-#: ../rpmdrake_.c:533
+#: ../rpmdrake_.c:529
msgid "in files"
msgstr "¨Ì·ÓÀÉ®×"
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
msgid "Maximum information"
msgstr ""
-#: ../rpmdrake_.c:544
+#: ../rpmdrake_.c:540
#, fuzzy
msgid "Normal information"
msgstr "¤@¯ë§ó·s"
-#: ../rpmdrake_.c:565
+#: ../rpmdrake_.c:561
#, c-format
msgid ""
"The following packages have to be removed for others to be upgraded:\n"
@@ -676,35 +708,35 @@ msgstr ""
"\n"
"±z½T©w­nÄ~Äò¶Ü¡H"
-#: ../rpmdrake_.c:585
+#: ../rpmdrake_.c:582
msgid "Find:"
msgstr "´M§ä¡G"
-#: ../rpmdrake_.c:590
+#: ../rpmdrake_.c:587
msgid "Search"
msgstr "´M§ä"
-#: ../rpmdrake_.c:602
+#: ../rpmdrake_.c:599
msgid "Install"
msgstr "¦w¸Ë"
-#: ../rpmdrake_.c:613
+#: ../rpmdrake_.c:610
msgid "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Mandrake Update"
msgstr "Mandrake §ó·s"
-#: ../rpmdrake_.c:614
+#: ../rpmdrake_.c:611
msgid "Software Packages Removal"
msgstr "²¾°£®M¥óµ{¦¡"
-#: ../rpmdrake_.c:615
+#: ../rpmdrake_.c:612
msgid "Software Packages Installation"
msgstr "¦w¸Ë®M¥óµ{¦¡"
-#: ../rpmdrake_.c:647
+#: ../rpmdrake_.c:644
msgid ""
"I need to contact the mirror to get latest update packages.\n"
"Please check that your network is currently running.\n"
@@ -716,23 +748,23 @@ msgstr ""
"\n"
"±z²{¦b­nÄ~Äò¶Ü¡H"
-#: ../rpmdrake_.c:651
+#: ../rpmdrake_.c:648
msgid "Please wait, contacting mirror to update packages information."
msgstr "½Ðµy«á¡A¥¿¦b¨ú±o¥i¨Ñ§ó·sªº®M¥ó²M³æ¸ê°T"
-#: ../rpmdrake_.c:653
+#: ../rpmdrake_.c:650
msgid "Error updating medium"
msgstr "§ó·s´C¤¶®Éµo¥Í¿ù»~"
-#: ../rpmdrake_.c:654
+#: ../rpmdrake_.c:651
msgid "There was an unrecoverable error while updating packages information."
msgstr "¦b§ó·s®M¥ó¸ê°T®Éµo¥Í¤FµLªk§ó¥¿ªº¿ù»~±¡ªp¡C"
-#: ../rpmdrake_.c:660
+#: ../rpmdrake_.c:657
msgid "How to choose manually your mirror"
msgstr "¦p¦ó¤â°Ê¿ï¾Ü±z»Ý­nªº¬M®g¯¸¥x"
-#: ../rpmdrake_.c:661
+#: ../rpmdrake_.c:658
msgid ""
"You may also choose your desired mirror manually: to do so,\n"
"launch the Software Sources Manager, and then add a `Security\n"
@@ -745,15 +777,15 @@ msgstr ""
"\n"
"§¹¦¨«á¡A½Ð­«·s±Ò°Ê MandrakeUpdate µ{¦¡¡C"
-#: ../rpmdrake_.c:667
+#: ../rpmdrake_.c:664
msgid "Please wait, contacting mirror to initialize updates packages."
msgstr "½Ðµy«á¡A¥¿³s½u¨ì¬M®g¯¸¥xªì©lµe´£¨Ñ§ó·sªº®M¥ó¶µ¥Ø¡C"
-#: ../rpmdrake_.c:671
+#: ../rpmdrake_.c:668
msgid "Error adding update medium"
msgstr "·s¼W§ó·s´C¤¶®Éµo¥Í¿ù»~"
-#: ../rpmdrake_.c:672
+#: ../rpmdrake_.c:669
#, c-format
msgid ""
"There was an error while adding the update medium via urpmi.\n"
@@ -772,48 +804,52 @@ msgstr ""
"\n"
"±z­n¥t¥~¹Á¸Õ¨Ï¥Î¨ä¥L§ó·s¯¸¥x¶Ü¡H"
-#: ../rpmdrake_.c:701
+#: ../rpmdrake_.c:698
msgid "Please wait, finding available packages..."
msgstr "½Ðµy«á¡A¥¿¦b´M§ä¥i¥Îªº®M¥ó²M³æ..."
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "All requested packages were installed successfully."
msgstr "¤w¸g¦¨¥\¦a¦w¸Ë±z»Ý­nªº®M¥ó¡C"
-#: ../rpmdrake_.c:724
+#: ../rpmdrake_.c:721
msgid "Everything installed successfully"
msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
-#: ../rpmdrake_.c:727
+#: ../rpmdrake_.c:724
#, fuzzy
msgid "Installation finished"
msgstr "¦w¸Ë¥¢±Ñ"
-#: ../rpmdrake_.c:730
+#: ../rpmdrake_.c:727
#, c-format
msgid "Inspecting %s"
msgstr ""
-#: ../rpmdrake_.c:746
+#: ../rpmdrake_.c:743
#, fuzzy, c-format
msgid "Remove .%s"
msgstr "²¾°£"
-#: ../rpmdrake_.c:748
+#: ../rpmdrake_.c:745
#, c-format
msgid "Use .%s as main file"
msgstr ""
-#: ../rpmdrake_.c:750
+#: ../rpmdrake_.c:747
msgid "Do nothing"
msgstr ""
-#: ../rpmdrake_.c:753
+#: ../rpmdrake_.c:750
#, fuzzy
msgid "-misc-fixed-medium-r-normal--12-*-*-100--*-*-*-*-*,*"
msgstr "-adobe-times-bold-r-normal--25-*-100-100-p-*-iso8859-*,*-r-*"
-#: ../rpmdrake_.c:760
+#: ../rpmdrake_.c:759
+msgid "Inspect..."
+msgstr ""
+
+#: ../rpmdrake_.c:772
#, c-format
msgid ""
"The installation is finished; %s.\n"
@@ -822,44 +858,40 @@ msgid ""
"you may now inspect some in order to take actions:"
msgstr ""
-#: ../rpmdrake_.c:761
+#: ../rpmdrake_.c:773
#, fuzzy
msgid ""
"some packages failed to install\n"
"correctly"
msgstr "¬Y¨Ç®M¥óµLªk¦w¸Ë¤W"
-#: ../rpmdrake_.c:762
+#: ../rpmdrake_.c:774
#, fuzzy
msgid "everything was installed correctly"
msgstr "©Ò¦³¶µ¥Ø¤w¸g³£¦w¸Ë¦¨¥\¤F¡C"
-#: ../rpmdrake_.c:767
-msgid "Inspect..."
-msgstr ""
-
-#: ../rpmdrake_.c:795
+#: ../rpmdrake_.c:793
msgid "Unable to get source packages."
msgstr "¤j¥ó¨Æ¡AµLªk¨ú±o­ì©l®M¥ó"
-#: ../rpmdrake_.c:796
+#: ../rpmdrake_.c:794
msgid "Unable to get source packages, sorry."
msgstr "¯u©êºp¡AµLªk¨ú±o­ì©l®M¥ó"
-#: ../rpmdrake_.c:803
+#: ../rpmdrake_.c:801
msgid "Change medium"
msgstr "Åܧó´C¤¶"
-#: ../rpmdrake_.c:804
+#: ../rpmdrake_.c:802
#, c-format
msgid "Please insert the medium named \"%s\" on device [%s]"
msgstr "½Ð¸m¤J´C¤¶¦WºÙ¬° \"%s\" ªº¶µ¥Ø©ñ¸m©ó %s ¸Ë¸m"
-#: ../rpmdrake_.c:812
+#: ../rpmdrake_.c:810
msgid "Installation failed"
msgstr "¦w¸Ë¥¢±Ñ"
-#: ../rpmdrake_.c:813
+#: ../rpmdrake_.c:811
msgid ""
"Installation failed, some files are missing.\n"
"You may want to update your sources database."
@@ -867,35 +899,35 @@ msgstr ""
"¦w¸Ë¥¢±Ñ¡A¦w¸Ëµ{¦¡§ä¤£¨ì¤@¨Ç­n¦w¸Ë¤Wªºµ{¦¡®M¥ó¡C\n"
"¤]³\¬O¨t²Î¸ê®Æ®w¤Ó¤F¡A½Ð¥ý§ó·s¸ê®Æ®w«á¦AÄ~Äò¡C"
-#: ../rpmdrake_.c:816
+#: ../rpmdrake_.c:814
msgid "Please wait, removing packages to allow others to be upgraded..."
msgstr "½Ðµy«á¡A²¾°£¤@¨Ç®M¥ó¶µ¥Ø¡A¥H«K©ó¯à°÷¶i¦æ¨ä¥L®M¥óªº§ó·s..."
-#: ../rpmdrake_.c:825
+#: ../rpmdrake_.c:823
msgid "Program missing"
msgstr "§ä¤£¨ì©Ò»Ý­nªºµ{¦¡"
-#: ../rpmdrake_.c:826
+#: ../rpmdrake_.c:824
msgid "A required program is missing (grpmi). Check your installation."
msgstr "µLªk©I¥s grpmi µ{¦¡¡A¤]³\µ{¦¡¿ò¥¢©ÎªÌ¬O¤£¥¿½T¡C"
-#: ../rpmdrake_.c:844
+#: ../rpmdrake_.c:842
msgid "Everything already installed."
msgstr "©Ò¦³®M¥ó¤w¸g¦w¸Ë¤W¡C"
-#: ../rpmdrake_.c:845
+#: ../rpmdrake_.c:843
msgid "Everything already installed (is this supposed to happen at all?)."
msgstr "©Ò¦³®M¥ó¤w¸g¦w¸Ë¤W¡C"
-#: ../rpmdrake_.c:855
+#: ../rpmdrake_.c:853
msgid "Please wait, reading packages database..."
msgstr "½Ðµy«á¡AŪ¨ú®M¥ó¸ê®Æ®w¸ê°T¤¤..."
-#: ../rpmdrake_.c:893
+#: ../rpmdrake_.c:891
msgid "Please wait, removing packages..."
msgstr "½Ðµy­Ô¡A¥¿¦b²¾°£®M¥ó..."
-#: ../rpmdrake_.c:908
+#: ../rpmdrake_.c:906
msgid ""
"Welcome to the software removal tool!\n"
"\n"
@@ -906,7 +938,7 @@ msgstr ""
"\n"
"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨²¾°£±z»{¬°¤£»Ý­nªº®M¥ó¶µ¥Ø¡C"
-#: ../rpmdrake_.c:913
+#: ../rpmdrake_.c:911
msgid ""
"Welcome to MandrakeUpdate!\n"
"\n"
@@ -916,7 +948,7 @@ msgstr ""
"Åwªï¨Ó¨ì®M¥ó§ó·sµ{¦¡!\n"
"±µ¤U¨Óµ{¦¡±N·|¤Þ¾É§A§¹¦¨®M¥ó§ó·s»P¦w¸Ë¡C"
-#: ../rpmdrake_.c:918
+#: ../rpmdrake_.c:916
msgid ""
"Welcome to the software installation tool!\n"
"\n"
@@ -1162,9 +1194,6 @@ msgstr "¦w¸Ë³nÅé"
#~ msgid "Force"
#~ msgstr "±j­¢"
-#~ msgid "Error..."
-#~ msgstr "¿ù»~..."
-
#~ msgid "Problems occured during installation"
#~ msgstr "¦w¸Ë®Éµo¥Í°ÝÃD"
@@ -1465,9 +1494,6 @@ msgstr "¦w¸Ë³nÅé"
#~ msgid "Ftp Proxy:"
#~ msgstr "FTP ¥N²z¦øªA¾¹¡G"
-#~ msgid "Proxy username:"
-#~ msgstr "¨Ï¥ÎªÌ¦WºÙ (¥N²z¦øªA¾¹)¡G"
-
#~ msgid "Proxy password:"
#~ msgstr "±K½X (¥N²z¦øªA¾¹)¡G"
@@ -1507,9 +1533,6 @@ msgstr "¦w¸Ë³nÅé"
#~ msgid "Choose Packages"
#~ msgstr "¿ï¾Ü®M¥ó"
-#~ msgid "Username:"
-#~ msgstr "¨Ï¥ÎªÌ¦WºÙ¡G"
-
#~ msgid "Security"
#~ msgstr "«O¦w"
diff --git a/rpmdrake.pm b/rpmdrake.pm
index 58a7edbd..cdb03254 100644
--- a/rpmdrake.pm
+++ b/rpmdrake.pm
@@ -207,9 +207,7 @@ sub mirrors {
my ($cachedir, $class) = @_;
my $mirrorslist = "$cachedir/mirrorsfull.list";
unlink $mirrorslist;
- my $proxy;
- /http_proxy = (http:[^:]+:\d+)/ and $proxy = $1 foreach cat_("$ENV{HOME}/.wgetrc");
- my $res = curl_download::download('http://www.linux-mandrake.com/mirrorsfull.list', $cachedir, $proxy, sub {});
+ my $res = curl_download::download('http://www.linux-mandrake.com/mirrorsfull.list', $cachedir, sub {});
$res and die $res;
require timezone;
my $tz = ${timezone::read()}{timezone};
diff --git a/rpmdrake.spec b/rpmdrake.spec
index cc410afb..3894e034 100644
--- a/rpmdrake.spec
+++ b/rpmdrake.spec
@@ -8,7 +8,7 @@
%define name rpmdrake
%define version 2.0
-%define release 16mdk
+%define release 17mdk
Name: %{name}
Version: %{version}
@@ -113,6 +113,12 @@ rm -rf $RPM_BUILD_ROOT
%{perl_vendorarch}/*.pm
%changelog
+* Fri Aug 30 2002 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-17mdk
+- rpmdrake:
+ - support proxies using /etc/urpmi/proxy.cfg
+- edit-urpm-sources:
+ - add a proxy configuration editor
+
* Fri Aug 30 2002 Guillaume Cottenceau <gc@mandrakesoft.com> 2.0-16mdk
- when a small amount of .rpmnew, don't have a scrolledwindow; when a
very large amount, don't create a window higher than the screen